diff --git a/src/test/regress/expected/create_role.out b/src/test/regress/expected/create_role.out
index bed3749888..cd49feabb3 100644
--- a/src/test/regress/expected/create_role.out
+++ b/src/test/regress/expected/create_role.out
@@ -174,18 +174,23 @@ DROP ROLE regress_password_null;
 DROP ROLE regress_noiseword;
 DROP ROLE regress_inroles;
 DROP ROLE regress_adminroles;
--- fail, cannot drop ourself nor superusers
+-- fail, cannot drop ourself, nor superusers or roles we lack ADMIN for
 DROP ROLE regress_role_super;
 ERROR:  must be superuser to drop superusers
 DROP ROLE regress_role_admin;
 ERROR:  current user cannot be dropped
+DROP ROLE regress_rolecreator;
+ERROR:  must have admin option on role "regress_rolecreator"
 -- ok
 RESET SESSION AUTHORIZATION;
 REVOKE CREATE ON DATABASE regression FROM regress_role_admin CASCADE;
 DROP INDEX tenant_idx;
 DROP TABLE tenant_table;
 DROP VIEW tenant_view;
+DROP SCHEMA regress_tenant2_schema;
 DROP ROLE regress_tenant;
+DROP ROLE regress_tenant2;
+DROP ROLE regress_rolecreator;
 DROP ROLE regress_role_admin;
 DROP ROLE regress_role_super;
 DROP ROLE regress_role_normal;
diff --git a/src/test/regress/sql/create_role.sql b/src/test/regress/sql/create_role.sql
index edaed43588..6b90336da2 100644
--- a/src/test/regress/sql/create_role.sql
+++ b/src/test/regress/sql/create_role.sql
@@ -161,9 +161,10 @@ DROP ROLE regress_noiseword;
 DROP ROLE regress_inroles;
 DROP ROLE regress_adminroles;
 
--- fail, cannot drop ourself nor superusers
+-- fail, cannot drop ourself, nor superusers or roles we lack ADMIN for
 DROP ROLE regress_role_super;
 DROP ROLE regress_role_admin;
+DROP ROLE regress_rolecreator;
 
 -- ok
 RESET SESSION AUTHORIZATION;
@@ -171,7 +172,10 @@ REVOKE CREATE ON DATABASE regression FROM regress_role_admin CASCADE;
 DROP INDEX tenant_idx;
 DROP TABLE tenant_table;
 DROP VIEW tenant_view;
+DROP SCHEMA regress_tenant2_schema;
 DROP ROLE regress_tenant;
+DROP ROLE regress_tenant2;
+DROP ROLE regress_rolecreator;
 DROP ROLE regress_role_admin;
 DROP ROLE regress_role_super;
 DROP ROLE regress_role_normal;