diff --git a/src/test/regress/expected/gs_db_privilege.out b/src/test/regress/expected/gs_db_privilege.out
index bcf46bbec..ca1f81082 100644
--- a/src/test/regress/expected/gs_db_privilege.out
+++ b/src/test/regress/expected/gs_db_privilege.out
@@ -242,7 +242,7 @@ DETAIL:  Permission denied to revoke update any table.
 --function has_any_privilege
 RESET ROLE;
 GRANT UPDATE ANY TABLE TO db_priv_user1 WITH ADMIN OPTION;
-SELECT * FROM gs_db_privileges ORDER BY rolename;
+SELECT * FROM gs_db_privileges ORDER BY rolename, admin_option;
    rolename    |  privilege_type  | admin_option 
 ---------------+------------------+--------------
  db_priv_user1 | delete any table | no
diff --git a/src/test/regress/jdbc_test/bypass_pbe/BypassPbe.class b/src/test/regress/jdbc_test/bypass_pbe/BypassPbe.class
index fcd961a0c..6ec99403e 100644
Binary files a/src/test/regress/jdbc_test/bypass_pbe/BypassPbe.class and b/src/test/regress/jdbc_test/bypass_pbe/BypassPbe.class differ
diff --git a/src/test/regress/parallel_schedule0 b/src/test/regress/parallel_schedule0
index d333c6b34..a8ece0061 100644
--- a/src/test/regress/parallel_schedule0
+++ b/src/test/regress/parallel_schedule0
@@ -836,7 +836,7 @@ test: pg_compatibility
 # autonomous transaction Test
 
 #test jdbc pbe for bypass
-#test: bypass_pbe
+test: bypass_pbe
 #test: partition for hash list
 test: pbe_hash_list_partition 
 test: hw_partition_list_insert
diff --git a/src/test/regress/sql/gs_db_privilege.sql b/src/test/regress/sql/gs_db_privilege.sql
index 83ce71e84..aa5c925f1 100644
--- a/src/test/regress/sql/gs_db_privilege.sql
+++ b/src/test/regress/sql/gs_db_privilege.sql
@@ -136,7 +136,7 @@ REVOKE UPDATE ANY TABLE FROM db_priv_user1,db_priv_user2,db_priv_user3,db_priv_u
 --function has_any_privilege
 RESET ROLE;
 GRANT UPDATE ANY TABLE TO db_priv_user1 WITH ADMIN OPTION;
-SELECT * FROM gs_db_privileges ORDER BY rolename;
+SELECT * FROM gs_db_privileges ORDER BY rolename, admin_option;
 
 SELECT has_any_privilege('db_priv_user','SELECT ANY TABLE'); --error
 SELECT has_any_privilege('db_priv_user1','SELECT ANY   TABLE'); --error