diff --git a/test/JDBC/expected/sys-table_types-dep-vu-cleanup.out b/test/JDBC/expected/sys-table_types-dep-vu-cleanup.out
index 85748d61de..ef0a545b3c 100644
--- a/test/JDBC/expected/sys-table_types-dep-vu-cleanup.out
+++ b/test/JDBC/expected/sys-table_types-dep-vu-cleanup.out
@@ -1,6 +1,6 @@
 drop procedure sys_table_types_dep_vu_prepare_p1
 drop function sys_table_types_dep_vu_prepare_f1
 drop view sys_table_types_dep_vu_prepare_v1
-drop view sys_table_types_dep_vu_prepare_v2
+drop procedure sys_table_types_dep_vu_prepare_p2
 drop type sys_table_types_dep_vu_prepare_tt
 GO
diff --git a/test/JDBC/expected/sys-table_types-dep-vu-prepare.out b/test/JDBC/expected/sys-table_types-dep-vu-prepare.out
index 455735cb76..8a8350d4b4 100644
--- a/test/JDBC/expected/sys-table_types-dep-vu-prepare.out
+++ b/test/JDBC/expected/sys-table_types-dep-vu-prepare.out
@@ -18,6 +18,6 @@ create view sys_table_types_dep_vu_prepare_v1 as
     select count(*) from sys.table_types where name = 'sys_table_types_dep_vu_prepare_tt'
 GO
 
-create view sys_table_types_dep_vu_prepare_v2 as
+create procedure sys_table_types_dep_vu_prepare_p2 as
     select is_nullable from sys.table_types where name = 'sys_table_types_dep_vu_prepare_tt'
 GO
diff --git a/test/JDBC/expected/sys-table_types-dep-vu-verify.out b/test/JDBC/expected/sys-table_types-dep-vu-verify.out
index 09bfe2aeec..540b2f3c40 100644
--- a/test/JDBC/expected/sys-table_types-dep-vu-verify.out
+++ b/test/JDBC/expected/sys-table_types-dep-vu-verify.out
@@ -23,7 +23,7 @@ int
 ~~END~~
 
 
-select * from sys_table_types_dep_vu_prepare_v2
+exec sys_table_types_dep_vu_prepare_p2
 GO
 ~~START~~
 bit
diff --git a/test/JDBC/expected/sys-types-dep-vu-prepare.out b/test/JDBC/expected/sys-types-dep-vu-prepare.out
index 15c810fcf0..cd3fe10e2e 100644
--- a/test/JDBC/expected/sys-types-dep-vu-prepare.out
+++ b/test/JDBC/expected/sys-types-dep-vu-prepare.out
@@ -23,6 +23,6 @@ CREATE VIEW sys_types_dep_vu_prepare_v1 AS
     SELECT count(*) FROM sys.types WHERE name = 'sys_types_dep_vu_prepare_ty1'
 GO
 
-CREATE VIEW sys_types_dep_vu_prepare_v2 AS
+CREATE PROCEDURE sys_types_dep_vu_prepare_p2 AS
     SELECT is_nullable FROM sys.types WHERE name = 'sys_types_dep_vu_prepare_ty1'
 GO
diff --git a/test/JDBC/expected/sys-types-dep-vu-verify.out b/test/JDBC/expected/sys-types-dep-vu-verify.out
index 77a89e2263..2f8aa20564 100644
--- a/test/JDBC/expected/sys-types-dep-vu-verify.out
+++ b/test/JDBC/expected/sys-types-dep-vu-verify.out
@@ -25,7 +25,7 @@ int
 ~~END~~
 
 
-SELECT * FROM sys_types_dep_vu_prepare_v2
+EXEC sys_types_dep_vu_prepare_p2
 GO
 ~~START~~
 bit
diff --git a/test/JDBC/input/views/sys-table_types-dep-vu-cleanup.mix b/test/JDBC/input/views/sys-table_types-dep-vu-cleanup.mix
index 69f4311226..780e1287c8 100644
--- a/test/JDBC/input/views/sys-table_types-dep-vu-cleanup.mix
+++ b/test/JDBC/input/views/sys-table_types-dep-vu-cleanup.mix
@@ -1,6 +1,6 @@
 drop procedure sys_table_types_dep_vu_prepare_p1
 drop function sys_table_types_dep_vu_prepare_f1
 drop view sys_table_types_dep_vu_prepare_v1
-drop view sys_table_types_dep_vu_prepare_v2
+drop procedure sys_table_types_dep_vu_prepare_p2
 drop type sys_table_types_dep_vu_prepare_tt
 GO
\ No newline at end of file
diff --git a/test/JDBC/input/views/sys-table_types-dep-vu-prepare.mix b/test/JDBC/input/views/sys-table_types-dep-vu-prepare.mix
index 042cad1086..168830df85 100644
--- a/test/JDBC/input/views/sys-table_types-dep-vu-prepare.mix
+++ b/test/JDBC/input/views/sys-table_types-dep-vu-prepare.mix
@@ -18,6 +18,6 @@ create view sys_table_types_dep_vu_prepare_v1 as
     select count(*) from sys.table_types where name = 'sys_table_types_dep_vu_prepare_tt'
 GO
 
-create view sys_table_types_dep_vu_prepare_v2 as
+create procedure sys_table_types_dep_vu_prepare_p2 as
     select is_nullable from sys.table_types where name = 'sys_table_types_dep_vu_prepare_tt'
 GO
\ No newline at end of file
diff --git a/test/JDBC/input/views/sys-table_types-dep-vu-verify.mix b/test/JDBC/input/views/sys-table_types-dep-vu-verify.mix
index fae666481b..57d35c2f76 100644
--- a/test/JDBC/input/views/sys-table_types-dep-vu-verify.mix
+++ b/test/JDBC/input/views/sys-table_types-dep-vu-verify.mix
@@ -8,5 +8,5 @@ GO
 select * from sys_table_types_dep_vu_prepare_v1
 GO
 
-select * from sys_table_types_dep_vu_prepare_v2
+exec sys_table_types_dep_vu_prepare_p2
 GO
\ No newline at end of file
diff --git a/test/JDBC/input/views/sys-types-dep-vu-prepare.sql b/test/JDBC/input/views/sys-types-dep-vu-prepare.sql
index b383ca3ef7..0cd42a26e1 100644
--- a/test/JDBC/input/views/sys-types-dep-vu-prepare.sql
+++ b/test/JDBC/input/views/sys-types-dep-vu-prepare.sql
@@ -23,6 +23,6 @@ CREATE VIEW sys_types_dep_vu_prepare_v1 AS
     SELECT count(*) FROM sys.types WHERE name = 'sys_types_dep_vu_prepare_ty1'
 GO
 
-CREATE VIEW sys_types_dep_vu_prepare_v2 AS
+CREATE PROCEDURE sys_types_dep_vu_prepare_p2 AS
     SELECT is_nullable FROM sys.types WHERE name = 'sys_types_dep_vu_prepare_ty1'
 GO
\ No newline at end of file
diff --git a/test/JDBC/input/views/sys-types-dep-vu-verify.sql b/test/JDBC/input/views/sys-types-dep-vu-verify.sql
index 7493093776..8e955e75da 100644
--- a/test/JDBC/input/views/sys-types-dep-vu-verify.sql
+++ b/test/JDBC/input/views/sys-types-dep-vu-verify.sql
@@ -10,5 +10,5 @@ GO
 SELECT * FROM sys_types_dep_vu_prepare_v1
 GO
 
-SELECT * FROM sys_types_dep_vu_prepare_v2
+EXEC sys_types_dep_vu_prepare_p2
 GO