diff --git a/test/JDBC/expected/securityadmin_role-vu-prepare.out b/test/JDBC/expected/securityadmin_role-vu-prepare.out
index 925c01678f..87e8a679bf 100644
--- a/test/JDBC/expected/securityadmin_role-vu-prepare.out
+++ b/test/JDBC/expected/securityadmin_role-vu-prepare.out
@@ -93,3 +93,7 @@ go
 
 use master
 go
+
+-- psql
+CREATE EXTENSION IF NOT EXISTS tds_fdw;
+GO
diff --git a/test/JDBC/expected/securityadmin_role-vu-verify.out b/test/JDBC/expected/securityadmin_role-vu-verify.out
index 97c6c10cc1..bafab42ef8 100644
--- a/test/JDBC/expected/securityadmin_role-vu-verify.out
+++ b/test/JDBC/expected/securityadmin_role-vu-verify.out
@@ -411,9 +411,6 @@ int
 -- terminate-tsql-conn user=securityadmin_login1 password=123
 
 -- psql
-CREATE EXTENSION IF NOT EXISTS tds_fdw;
-GO
-
 -- securityadmin should not have membership in database guest role
 SELECT roleid::regrole, member::regrole FROM pg_auth_members WHERE member = 'securityadmin'::regrole;
 go
@@ -615,7 +612,6 @@ GO
 -- sp_helpsrvrolemember
 INSERT INTO sadm_sp_helpsrvrolemember_tbl (ServerRole, MemberName, MemberSID) EXEC sp_helpsrvrolemember 'securityadmin'
 GO
-~~ROW COUNT: 1~~
 
 
 SELECT ServerRole, MemberName, (CASE WHEN MemberSID IS NULL THEN 0 ELSE 1 END) FROM sadm_sp_helpsrvrolemember_tbl where MemberName like '%securityadmin%'
diff --git a/test/JDBC/input/securityadmin_role-vu-prepare.mix b/test/JDBC/input/securityadmin_role-vu-prepare.mix
index 01b88bc0ab..a32966e179 100644
--- a/test/JDBC/input/securityadmin_role-vu-prepare.mix
+++ b/test/JDBC/input/securityadmin_role-vu-prepare.mix
@@ -92,4 +92,8 @@ create user no_securityadmin_user1 for login no_securityadmin_login1
 go
 
 use master
-go
\ No newline at end of file
+go
+
+-- psql
+CREATE EXTENSION IF NOT EXISTS tds_fdw;
+GO
\ No newline at end of file
diff --git a/test/JDBC/input/securityadmin_role-vu-verify.mix b/test/JDBC/input/securityadmin_role-vu-verify.mix
index 60c56562b8..1a0995a44a 100644
--- a/test/JDBC/input/securityadmin_role-vu-verify.mix
+++ b/test/JDBC/input/securityadmin_role-vu-verify.mix
@@ -243,9 +243,6 @@ go
 -- terminate-tsql-conn user=securityadmin_login1 password=123
 
 -- psql
-CREATE EXTENSION IF NOT EXISTS tds_fdw;
-GO
-
 -- securityadmin should not have membership in database guest role
 SELECT roleid::regrole, member::regrole FROM pg_auth_members WHERE member = 'securityadmin'::regrole;
 go