diff --git a/test/jdk/java/sql/junit/test/sql/BatchUpdateExceptionTests.java b/test/jdk/java/sql/junit/test/sql/BatchUpdateExceptionTests.java
index 15875384084..9cc3af9c2ad 100644
--- a/test/jdk/java/sql/junit/test/sql/BatchUpdateExceptionTests.java
+++ b/test/jdk/java/sql/junit/test/sql/BatchUpdateExceptionTests.java
@@ -31,12 +31,10 @@ import java.util.Arrays;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.SerializedBatchUpdateException;
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class BatchUpdateExceptionTests extends BaseTest {
 
     private final int[] uc = {1, 2, 3};
diff --git a/test/jdk/java/sql/junit/test/sql/CallableStatementTests.java b/test/jdk/java/sql/junit/test/sql/CallableStatementTests.java
index 4f219f3e7b2..9295fd01cc9 100644
--- a/test/jdk/java/sql/junit/test/sql/CallableStatementTests.java
+++ b/test/jdk/java/sql/junit/test/sql/CallableStatementTests.java
@@ -34,11 +34,9 @@ import org.junit.jupiter.api.Assertions;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class CallableStatementTests extends BaseTest {
     private CallableStatement cstmt;
 
diff --git a/test/jdk/java/sql/junit/test/sql/ConnectionTests.java b/test/jdk/java/sql/junit/test/sql/ConnectionTests.java
index a1e9655220a..a318794634f 100644
--- a/test/jdk/java/sql/junit/test/sql/ConnectionTests.java
+++ b/test/jdk/java/sql/junit/test/sql/ConnectionTests.java
@@ -32,11 +32,9 @@ import org.junit.jupiter.api.Assertions;
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class ConnectionTests extends BaseTest {
 
     protected StubConnection conn;
diff --git a/test/jdk/java/sql/junit/test/sql/DataTruncationTests.java b/test/jdk/java/sql/junit/test/sql/DataTruncationTests.java
index 560837cd403..1bf6d9dc83e 100644
--- a/test/jdk/java/sql/junit/test/sql/DataTruncationTests.java
+++ b/test/jdk/java/sql/junit/test/sql/DataTruncationTests.java
@@ -27,11 +27,9 @@ import java.sql.SQLException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class DataTruncationTests extends BaseTest {
 
     private final String READ_TRUNCATION = "01004";
diff --git a/test/jdk/java/sql/junit/test/sql/DateTests.java b/test/jdk/java/sql/junit/test/sql/DateTests.java
index 2c1fd3566a1..df48d699761 100644
--- a/test/jdk/java/sql/junit/test/sql/DateTests.java
+++ b/test/jdk/java/sql/junit/test/sql/DateTests.java
@@ -23,19 +23,16 @@
 package test.sql;
 
 import java.sql.Date;
-import java.time.Instant;
 import java.time.LocalDate;
 
 import org.junit.jupiter.api.Assertions;
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class DateTests extends BaseTest {
 
     /*
diff --git a/test/jdk/java/sql/junit/test/sql/PreparedStatementTests.java b/test/jdk/java/sql/junit/test/sql/PreparedStatementTests.java
index 156094a00fe..f1d8fe55dce 100644
--- a/test/jdk/java/sql/junit/test/sql/PreparedStatementTests.java
+++ b/test/jdk/java/sql/junit/test/sql/PreparedStatementTests.java
@@ -34,11 +34,9 @@ import org.junit.jupiter.api.Assertions;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class PreparedStatementTests extends BaseTest {
 
     private PreparedStatement pstmt;
diff --git a/test/jdk/java/sql/junit/test/sql/SQLClientInfoExceptionTests.java b/test/jdk/java/sql/junit/test/sql/SQLClientInfoExceptionTests.java
index 5a1a851b2b4..ead44150614 100644
--- a/test/jdk/java/sql/junit/test/sql/SQLClientInfoExceptionTests.java
+++ b/test/jdk/java/sql/junit/test/sql/SQLClientInfoExceptionTests.java
@@ -29,11 +29,9 @@ import java.util.HashMap;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLClientInfoExceptionTests extends BaseTest {
 
     private final HashMap<String, ClientInfoStatus> map = new HashMap<>();
diff --git a/test/jdk/java/sql/junit/test/sql/SQLDataExceptionTests.java b/test/jdk/java/sql/junit/test/sql/SQLDataExceptionTests.java
index 9e79e19eca4..902e961bc46 100644
--- a/test/jdk/java/sql/junit/test/sql/SQLDataExceptionTests.java
+++ b/test/jdk/java/sql/junit/test/sql/SQLDataExceptionTests.java
@@ -28,11 +28,9 @@ import java.sql.SQLNonTransientException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLDataExceptionTests extends BaseTest {
 
     /**
diff --git a/test/jdk/java/sql/junit/test/sql/SQLExceptionTests.java b/test/jdk/java/sql/junit/test/sql/SQLExceptionTests.java
index bb75fac9a3a..f3ae01ca12a 100644
--- a/test/jdk/java/sql/junit/test/sql/SQLExceptionTests.java
+++ b/test/jdk/java/sql/junit/test/sql/SQLExceptionTests.java
@@ -26,11 +26,9 @@ import java.sql.SQLException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLExceptionTests extends BaseTest {
 
     /**
diff --git a/test/jdk/java/sql/junit/test/sql/SQLFeatureNotSupportedExceptionTests.java b/test/jdk/java/sql/junit/test/sql/SQLFeatureNotSupportedExceptionTests.java
index 0a7f6b3b9fa..2e6bb1467ca 100644
--- a/test/jdk/java/sql/junit/test/sql/SQLFeatureNotSupportedExceptionTests.java
+++ b/test/jdk/java/sql/junit/test/sql/SQLFeatureNotSupportedExceptionTests.java
@@ -28,11 +28,9 @@ import java.sql.SQLNonTransientException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLFeatureNotSupportedExceptionTests extends BaseTest {
 
     /**
diff --git a/test/jdk/java/sql/junit/test/sql/SQLIntegrityConstraintViolationExceptionTests.java b/test/jdk/java/sql/junit/test/sql/SQLIntegrityConstraintViolationExceptionTests.java
index edddff2c488..3ef527967fb 100644
--- a/test/jdk/java/sql/junit/test/sql/SQLIntegrityConstraintViolationExceptionTests.java
+++ b/test/jdk/java/sql/junit/test/sql/SQLIntegrityConstraintViolationExceptionTests.java
@@ -28,11 +28,9 @@ import java.sql.SQLNonTransientException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLIntegrityConstraintViolationExceptionTests extends BaseTest {
 
     /**
diff --git a/test/jdk/java/sql/junit/test/sql/SQLInvalidAuthorizationSpecExceptionTests.java b/test/jdk/java/sql/junit/test/sql/SQLInvalidAuthorizationSpecExceptionTests.java
index 24ce2e81635..8f4c5d04e02 100644
--- a/test/jdk/java/sql/junit/test/sql/SQLInvalidAuthorizationSpecExceptionTests.java
+++ b/test/jdk/java/sql/junit/test/sql/SQLInvalidAuthorizationSpecExceptionTests.java
@@ -28,11 +28,9 @@ import java.sql.SQLNonTransientException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLInvalidAuthorizationSpecExceptionTests extends BaseTest {
 
     /**
diff --git a/test/jdk/java/sql/junit/test/sql/SQLNonTransientConnectionExceptionTests.java b/test/jdk/java/sql/junit/test/sql/SQLNonTransientConnectionExceptionTests.java
index 5eb30187ff1..22c40825cf5 100644
--- a/test/jdk/java/sql/junit/test/sql/SQLNonTransientConnectionExceptionTests.java
+++ b/test/jdk/java/sql/junit/test/sql/SQLNonTransientConnectionExceptionTests.java
@@ -28,11 +28,9 @@ import java.sql.SQLNonTransientException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLNonTransientConnectionExceptionTests extends BaseTest {
 
     /**
diff --git a/test/jdk/java/sql/junit/test/sql/SQLNonTransientExceptionTests.java b/test/jdk/java/sql/junit/test/sql/SQLNonTransientExceptionTests.java
index 3df0dda8895..c0bbb7838d5 100644
--- a/test/jdk/java/sql/junit/test/sql/SQLNonTransientExceptionTests.java
+++ b/test/jdk/java/sql/junit/test/sql/SQLNonTransientExceptionTests.java
@@ -27,11 +27,9 @@ import java.sql.SQLNonTransientException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLNonTransientExceptionTests extends BaseTest {
 
     /**
diff --git a/test/jdk/java/sql/junit/test/sql/SQLRecoverableExceptionTests.java b/test/jdk/java/sql/junit/test/sql/SQLRecoverableExceptionTests.java
index 7a44478c14f..115cab40818 100644
--- a/test/jdk/java/sql/junit/test/sql/SQLRecoverableExceptionTests.java
+++ b/test/jdk/java/sql/junit/test/sql/SQLRecoverableExceptionTests.java
@@ -27,11 +27,9 @@ import java.sql.SQLRecoverableException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLRecoverableExceptionTests extends BaseTest {
 
     /**
diff --git a/test/jdk/java/sql/junit/test/sql/SQLSyntaxErrorExceptionTests.java b/test/jdk/java/sql/junit/test/sql/SQLSyntaxErrorExceptionTests.java
index 231ad5bca76..e7575dd94d7 100644
--- a/test/jdk/java/sql/junit/test/sql/SQLSyntaxErrorExceptionTests.java
+++ b/test/jdk/java/sql/junit/test/sql/SQLSyntaxErrorExceptionTests.java
@@ -28,11 +28,9 @@ import java.sql.SQLSyntaxErrorException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLSyntaxErrorExceptionTests extends BaseTest {
 
     /**
diff --git a/test/jdk/java/sql/junit/test/sql/SQLTimeoutExceptionTests.java b/test/jdk/java/sql/junit/test/sql/SQLTimeoutExceptionTests.java
index 00c30399a29..d96e4b5c8f8 100644
--- a/test/jdk/java/sql/junit/test/sql/SQLTimeoutExceptionTests.java
+++ b/test/jdk/java/sql/junit/test/sql/SQLTimeoutExceptionTests.java
@@ -28,11 +28,9 @@ import java.sql.SQLTransientException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLTimeoutExceptionTests extends BaseTest {
 
     /**
diff --git a/test/jdk/java/sql/junit/test/sql/SQLTransactionRollbackExceptionTests.java b/test/jdk/java/sql/junit/test/sql/SQLTransactionRollbackExceptionTests.java
index fdbb440f0cb..cc2e4b3a023 100644
--- a/test/jdk/java/sql/junit/test/sql/SQLTransactionRollbackExceptionTests.java
+++ b/test/jdk/java/sql/junit/test/sql/SQLTransactionRollbackExceptionTests.java
@@ -28,11 +28,9 @@ import java.sql.SQLTransientException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLTransactionRollbackExceptionTests extends BaseTest {
 
     /**
diff --git a/test/jdk/java/sql/junit/test/sql/SQLTransientConnectionExceptionTests.java b/test/jdk/java/sql/junit/test/sql/SQLTransientConnectionExceptionTests.java
index 1d3efec44d2..0ae465e2725 100644
--- a/test/jdk/java/sql/junit/test/sql/SQLTransientConnectionExceptionTests.java
+++ b/test/jdk/java/sql/junit/test/sql/SQLTransientConnectionExceptionTests.java
@@ -28,11 +28,9 @@ import java.sql.SQLTransientException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLTransientConnectionExceptionTests extends BaseTest {
 
     /**
diff --git a/test/jdk/java/sql/junit/test/sql/SQLTransientExceptionTests.java b/test/jdk/java/sql/junit/test/sql/SQLTransientExceptionTests.java
index faac9dac9e3..91a17b6a2e5 100644
--- a/test/jdk/java/sql/junit/test/sql/SQLTransientExceptionTests.java
+++ b/test/jdk/java/sql/junit/test/sql/SQLTransientExceptionTests.java
@@ -27,11 +27,9 @@ import java.sql.SQLTransientException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLTransientExceptionTests extends BaseTest {
 
     /**
diff --git a/test/jdk/java/sql/junit/test/sql/SQLWarningTests.java b/test/jdk/java/sql/junit/test/sql/SQLWarningTests.java
index f06ae4522d7..ff7ea182f48 100644
--- a/test/jdk/java/sql/junit/test/sql/SQLWarningTests.java
+++ b/test/jdk/java/sql/junit/test/sql/SQLWarningTests.java
@@ -27,11 +27,9 @@ import java.sql.SQLWarning;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SQLWarningTests extends BaseTest {
 
     private final String[] warnings = {"Warning 1", "cause 1", "Warning 2",
diff --git a/test/jdk/java/sql/junit/test/sql/StatementTests.java b/test/jdk/java/sql/junit/test/sql/StatementTests.java
index f97bc29b7c3..1d7bfd2cf1a 100644
--- a/test/jdk/java/sql/junit/test/sql/StatementTests.java
+++ b/test/jdk/java/sql/junit/test/sql/StatementTests.java
@@ -30,7 +30,6 @@ import org.junit.jupiter.api.Assertions;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
@@ -38,7 +37,6 @@ import org.junit.jupiter.params.provider.ValueSource;
 import util.BaseTest;
 import util.StubConnection;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class StatementTests extends BaseTest {
 
     private Statement stmt;
diff --git a/test/jdk/java/sql/junit/test/sql/TimeTests.java b/test/jdk/java/sql/junit/test/sql/TimeTests.java
index e2ecf63bfa0..0bcab5b15fd 100644
--- a/test/jdk/java/sql/junit/test/sql/TimeTests.java
+++ b/test/jdk/java/sql/junit/test/sql/TimeTests.java
@@ -28,13 +28,11 @@ import java.time.LocalTime;
 import org.junit.jupiter.api.Assertions;
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TimeTests extends BaseTest {
 
     /*
diff --git a/test/jdk/java/sql/junit/test/sql/TimestampTests.java b/test/jdk/java/sql/junit/test/sql/TimestampTests.java
index d4656afd760..7a1989e6441 100644
--- a/test/jdk/java/sql/junit/test/sql/TimestampTests.java
+++ b/test/jdk/java/sql/junit/test/sql/TimestampTests.java
@@ -36,13 +36,11 @@ import org.junit.jupiter.api.Assertions;
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
 import util.BaseTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TimestampTests extends BaseTest {
 
     private static TimeZone defaultTimeZone = null;