diff --git a/test/JDBC/input/BABEL-3952-vu-verify.sql b/test/JDBC/input/BABEL-3952-vu-verify.sql
index b60101ef34..448054ea1a 100644
--- a/test/JDBC/input/BABEL-3952-vu-verify.sql
+++ b/test/JDBC/input/BABEL-3952-vu-verify.sql
@@ -261,4 +261,7 @@ Create table dbucket(a time)
 insert into dbucket (a) values(date_bucket(minute,12, CAST('12:32:23.23' as time)))
 Select * from dbucket
 Select date_bucket(second,10, a) from dbucket
-GO
\ No newline at end of file
+GO
+
+DROP TABLE IF EXISTS dbucket
+GO
diff --git a/test/JDBC/input/Test-Identity-vu-cleanup.sql b/test/JDBC/input/Test-Identity-vu-cleanup.sql
index 75afc12aa6..e4520c8120 100644
--- a/test/JDBC/input/Test-Identity-vu-cleanup.sql
+++ b/test/JDBC/input/Test-Identity-vu-cleanup.sql
@@ -28,6 +28,9 @@ GO
 DROP PROCEDURE test_identity_vu_prepare_p5
 GO
 
+DROP VIEW scope_identity_view
+GO
+
 DROP TABLE test_identity_vu_prepare_t1
 GO
 
diff --git a/test/JDBC/input/babel_ddl.sql b/test/JDBC/input/babel_ddl.sql
index 72015f2b77..d5367fdd35 100644
--- a/test/JDBC/input/babel_ddl.sql
+++ b/test/JDBC/input/babel_ddl.sql
@@ -253,4 +253,6 @@ GO
 drop table computed_column_t1;
 GO
 drop table computed_column_t2;
-GO
\ No newline at end of file
+GO
+drop table computed_column_error;
+GO
diff --git a/test/JDBC/input/babel_unicode_charset.sql b/test/JDBC/input/babel_unicode_charset.sql
index 8cc45cbfdd..ff56f55eff 100644
--- a/test/JDBC/input/babel_unicode_charset.sql
+++ b/test/JDBC/input/babel_unicode_charset.sql
@@ -18,3 +18,5 @@ select "你好世界" from unicode_test with(nolock);
 go
 select 中文列名 from unicode_test with(nolock);
 go
+drop table if exists unicode_test;
+go
diff --git a/test/JDBC/input/functions/BABEL-3953-datetrunc-vu-verify.sql b/test/JDBC/input/functions/BABEL-3953-datetrunc-vu-verify.sql
index ebefb27462..224197178f 100644
--- a/test/JDBC/input/functions/BABEL-3953-datetrunc-vu-verify.sql
+++ b/test/JDBC/input/functions/BABEL-3953-datetrunc-vu-verify.sql
@@ -168,6 +168,9 @@ Select * from dtrunc
 Select datetrunc(second, a) from dtrunc
 GO
 
+DROP TABLE IF EXISTS dtrunc
+GO
+
 SET DATEFIRST 1
 SELECT DATETRUNC(ISO_WEEK, CAST('2020-09-13 21:32:32.23' as datetime2)) 
 SELECT DATETRUNC(WEEK, CAST('2020-09-13 21:32:32.23' as datetime2))
diff --git a/test/JDBC/input/functions/sys-eomonth-vu-cleanup.sql b/test/JDBC/input/functions/sys-eomonth-vu-cleanup.sql
index 0a998c56df..41a60d99ce 100644
--- a/test/JDBC/input/functions/sys-eomonth-vu-cleanup.sql
+++ b/test/JDBC/input/functions/sys-eomonth-vu-cleanup.sql
@@ -9,3 +9,6 @@ GO
 
 DROP PROCEDURE IF EXISTS GetEndOfNextMonthDate_EOMONTH;
 GO
+
+DROP Table eomonth_datestable
+GO
diff --git a/test/JDBC/input/table_variables/table_variable_xact_errors.sql b/test/JDBC/input/table_variables/table_variable_xact_errors.sql
index e5abf4577b..19ce8c0871 100644
--- a/test/JDBC/input/table_variables/table_variable_xact_errors.sql
+++ b/test/JDBC/input/table_variables/table_variable_xact_errors.sql
@@ -484,6 +484,9 @@ GO
 EXECUTE myproc2
 GO
 
+DROP TABLE mytab
+GO
+
 DROP PROCEDURE myproc
 GO
 
diff --git a/test/JDBC/input/todatetimeoffset.sql b/test/JDBC/input/todatetimeoffset.sql
index cd0ccffa38..5ab1db217f 100644
--- a/test/JDBC/input/todatetimeoffset.sql
+++ b/test/JDBC/input/todatetimeoffset.sql
@@ -241,3 +241,5 @@ GO
 Select todatetimeoffset('10000-12-31 23:12:00.123 +00:00',743)
 GO
 
+drop table tem
+GO
diff --git a/test/JDBC/input/views/sys-index_columns-vu-cleanup.sql b/test/JDBC/input/views/sys-index_columns-vu-cleanup.sql
index 388239e528..3e56be98ec 100644
--- a/test/JDBC/input/views/sys-index_columns-vu-cleanup.sql
+++ b/test/JDBC/input/views/sys-index_columns-vu-cleanup.sql
@@ -7,6 +7,9 @@ GO
 USE master
 GO
 
+DROP table sys_index_columns_vu_prepare_t1
+GO
+
 DROP TABLE sys_index_columns_vu_prepare_t3;
 GO
 
diff --git a/test/JDBC/parallel_query_jdbc_schedule b/test/JDBC/parallel_query_jdbc_schedule
index 2a5f9ba88d..84997b3888 100644
--- a/test/JDBC/parallel_query_jdbc_schedule
+++ b/test/JDBC/parallel_query_jdbc_schedule
@@ -28,6 +28,4 @@ ignore#!#BABEL-3013
 ignore#!#BABEL-SP_TABLE_PRIVILEGES
 ignore#!#ISC-Columns-vu-verify
 ignore#!#four-part-names-vu-verify
-#TODO: BABEL-5472
-ignore#!#sp_columns_100