diff --git a/test/jdk/javax/sql/junit/test/rowset/BaseRowSetTests.java b/test/jdk/javax/sql/junit/test/rowset/BaseRowSetTests.java
index 272ea9e7158..029930b896a 100644
--- a/test/jdk/javax/sql/junit/test/rowset/BaseRowSetTests.java
+++ b/test/jdk/javax/sql/junit/test/rowset/BaseRowSetTests.java
@@ -72,7 +72,7 @@ public class BaseRowSetTests extends CommonRowSetTests {
     /*
      * Create a RowSetListener and validate that notifyCursorMoved is called
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void baseRowSetTest0000(StubBaseRowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
@@ -84,7 +84,7 @@ public class BaseRowSetTests extends CommonRowSetTests {
     /*
      * Create a RowSetListener and validate that notifyRowChanged is called
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void baseRowSetTest0001(StubBaseRowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
@@ -96,7 +96,7 @@ public class BaseRowSetTests extends CommonRowSetTests {
     /*
      * Create a RowSetListener and validate that notifyRowSetChanged is called
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void baseRowSetTest0002(StubBaseRowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
@@ -109,7 +109,7 @@ public class BaseRowSetTests extends CommonRowSetTests {
      * Create multiple RowSetListeners and validate that notifyRowSetChanged
      * is called on all listeners
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void baseRowSetTest0003(StubBaseRowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
@@ -125,7 +125,7 @@ public class BaseRowSetTests extends CommonRowSetTests {
      * Create multiple RowSetListeners and validate that notifyRowChanged
      * is called on all listeners
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void baseRowSetTest0004(StubBaseRowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
@@ -141,7 +141,7 @@ public class BaseRowSetTests extends CommonRowSetTests {
      * Create multiple RowSetListeners and validate that notifyCursorMoved
      * is called on all listeners
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void baseRowSetTest0005(StubBaseRowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
@@ -157,7 +157,7 @@ public class BaseRowSetTests extends CommonRowSetTests {
      * Create a RowSetListener and validate that notifyRowSetChanged,
      * notifyRowChanged() and notifyCursorMoved are called
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void baseRowSetTest0006(StubBaseRowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
@@ -175,7 +175,7 @@ public class BaseRowSetTests extends CommonRowSetTests {
      * Create multiple RowSetListeners and validate that notifyRowSetChanged,
      * notifyRowChanged() and notifyCursorMoved are called on all listeners
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void baseRowSetTest0007(StubBaseRowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
@@ -198,7 +198,7 @@ public class BaseRowSetTests extends CommonRowSetTests {
      * remove the listener, invoke notifyRowSetChanged again and verify the
      * listner is not called
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void baseRowSetTest0008(StubBaseRowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
@@ -216,7 +216,7 @@ public class BaseRowSetTests extends CommonRowSetTests {
      * Set the base parameters and validate that the value set is
      * the correct type and value
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("testBaseParameters")
     public void baseRowSetTest0009(int pos, Object o) throws Exception {
         assertTrue(getParam(pos, o).getClass().isInstance(o));
@@ -227,7 +227,7 @@ public class BaseRowSetTests extends CommonRowSetTests {
      * Set the complex parameters and validate that the value set is
      * the correct type
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("testAdvancedParameters")
     public void baseRowSetTest0010(int pos, Object o) throws Exception {
         assertTrue(getParam(pos, o).getClass().isInstance(o));
@@ -236,7 +236,7 @@ public class BaseRowSetTests extends CommonRowSetTests {
     /*
      * Validate setNull specifying the supported type values
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("jdbcTypes")
     public void baseRowSetTest0011(Integer type) throws Exception {
         brs = new StubBaseRowSet();
@@ -248,7 +248,7 @@ public class BaseRowSetTests extends CommonRowSetTests {
      * Validate setNull specifying the supported type values and that
      * typeName is set internally
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("jdbcTypes")
     public void baseRowSetTest0012(Integer type) throws Exception {
         brs = new StubBaseRowSet();
@@ -292,7 +292,7 @@ public class BaseRowSetTests extends CommonRowSetTests {
     /*
      * Validate that initParams() initializes the parameters
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void baseRowSetTest0016(StubBaseRowSet rs) throws Exception {
         rs.setInt(1, 1);
diff --git a/test/jdk/javax/sql/junit/test/rowset/CommonRowSetTests.java b/test/jdk/javax/sql/junit/test/rowset/CommonRowSetTests.java
index e12bad251b9..a59cc2a00c7 100644
--- a/test/jdk/javax/sql/junit/test/rowset/CommonRowSetTests.java
+++ b/test/jdk/javax/sql/junit/test/rowset/CommonRowSetTests.java
@@ -501,7 +501,7 @@ public abstract class CommonRowSetTests extends BaseTest {
     /*
      * Validate that getCommand() returns null by default
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0000(RowSet rs) {
         assertNull(rs.getCommand());
@@ -510,7 +510,7 @@ public abstract class CommonRowSetTests extends BaseTest {
     /*
      * Validate that getCommand() returns command specified to setCommand
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0001(RowSet rs) throws Exception {
         rs.setCommand(query);
@@ -521,7 +521,7 @@ public abstract class CommonRowSetTests extends BaseTest {
     /*
      * Validate that getCurrency() returns the correct default value
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0002(RowSet rs) throws Exception {
         assertTrue(rs.getConcurrency() == ResultSet.CONCUR_UPDATABLE);
@@ -531,7 +531,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that getCurrency() returns the correct value
      * after a call to setConcurrency())
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetConcurrencyTypes")
     public void commonRowSetTest0003(RowSet rs, int concurType) throws Exception {
         rs.setConcurrency(concurType);
@@ -541,7 +541,7 @@ public abstract class CommonRowSetTests extends BaseTest {
     /*
      * Validate that getCurrency() throws a SQLException for an invalid value
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0004(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -552,7 +552,7 @@ public abstract class CommonRowSetTests extends BaseTest {
     /*
      * Validate that getDataSourceName() returns null by default
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0005(RowSet rs) throws Exception {
         assertTrue(rs.getDataSourceName() == null);
@@ -562,7 +562,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that getDataSourceName() returns the value specified
      * by setDataSourceName() and getUrl() returns null
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0006(RowSet rs) throws Exception {
         rs.setUrl(url);
@@ -575,7 +575,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that setDataSourceName() throws a SQLException for an empty
      * String specified for the data source name
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0007(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -587,7 +587,7 @@ public abstract class CommonRowSetTests extends BaseTest {
     /*
      * Validate that getEscapeProcessing() returns false by default
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0008(RowSet rs) throws Exception {
         assertTrue(rs.getEscapeProcessing());
@@ -597,7 +597,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that getEscapeProcessing() returns value set by
      * setEscapeProcessing()
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetTrueFalse")
     public void commonRowSetTest0009(RowSet rs, boolean val) throws Exception {
         rs.setEscapeProcessing(val);
@@ -607,7 +607,7 @@ public abstract class CommonRowSetTests extends BaseTest {
     /*
      * Validate that getFetchDirection() returns the correct default value
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0010(RowSet rs) throws Exception {
         assertTrue(rs.getFetchDirection() == ResultSet.FETCH_FORWARD);
@@ -617,7 +617,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that getFetchDirection() returns the value set by
      * setFetchDirection()
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetFetchDirection")
     public void commonRowSetTest0011(RowSet rs, int direction) throws Exception {
         rs.setFetchDirection(direction);
@@ -627,7 +627,7 @@ public abstract class CommonRowSetTests extends BaseTest {
     /*
      * Validate that setFetchSize() throws a SQLException for an invalid value
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0013(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -639,7 +639,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that setFetchSize() throws a SQLException for a
      * value greater than getMaxRows()
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0014(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -652,7 +652,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that getFetchSize() returns the correct value after
      * setFetchSize() has been called
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0015(RowSet rs) throws Exception {
         int maxRows = 150;
@@ -668,7 +668,7 @@ public abstract class CommonRowSetTests extends BaseTest {
     /*
      * Validate that setMaxFieldSize() throws a SQLException for an invalid value
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0016(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -680,7 +680,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that getMaxFieldSize() returns the value set by
      * setMaxFieldSize()
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0017(RowSet rs) throws Exception {
         rs.setMaxFieldSize(0);
@@ -695,7 +695,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that isReadOnly() returns value set by
      * setReadOnly()
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetTrueFalse")
     public void commonRowSetTest0018(RowSet rs, boolean val) throws Exception {
         rs.setReadOnly(val);
@@ -706,7 +706,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that getTransactionIsolation() returns value set by
      * setTransactionIsolation()
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetIsolationTypes")
     public void commonRowSetTest0019(RowSet rs, int val) throws Exception {
         rs.setTransactionIsolation(val);
@@ -716,7 +716,7 @@ public abstract class CommonRowSetTests extends BaseTest {
     /*
      * Validate that getType() returns value set by setType()
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetScrollTypes")
     public void commonRowSetTest0020(RowSet rs, int val) throws Exception {
         rs.setType(val);
@@ -727,7 +727,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that getEscapeProcessing() returns value set by
      * setEscapeProcessing()
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetTrueFalse")
     public void commonRowSetTest0021(BaseRowSet rs, boolean val) throws Exception {
         rs.setShowDeleted(val);
@@ -738,7 +738,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that getTypeMap() returns same value set by
      * setTypeMap()
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0022(RowSet rs) throws Exception {
         Map<String, Class<?>> map = new HashMap<>();
@@ -751,7 +751,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that getUsername() returns same value set by
      * setUsername()
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0023(RowSet rs) throws Exception {
         rs.setUsername(user);
@@ -762,7 +762,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that getPassword() returns same password set by
      * setPassword()
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0024(RowSet rs) throws Exception {
         rs.setPassword(password);
@@ -773,7 +773,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that getQueryTimeout() returns same value set by
      * setQueryTimeout() and that 0 is a valid timeout value
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0025(RowSet rs) throws Exception {
         int timeout = 0;
@@ -785,7 +785,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that getQueryTimeout() returns same value set by
      * setQueryTimeout() and that 0 is a valid timeout value
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0026(RowSet rs) throws Exception {
         int timeout = 10000;
@@ -797,7 +797,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that setQueryTimeout() throws a SQLException for a timeout
      * value < 0
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0027(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -810,7 +810,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate addRowSetListener does not throw an Exception when null is
      * passed as the parameter
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0028(RowSet rs) throws Exception {
         rs.addRowSetListener(null);
@@ -820,7 +820,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate removeRowSetListener does not throw an Exception when null is
      * passed as the parameter
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0029(RowSet rs) throws Exception {
         rs.removeRowSetListener(null);
@@ -829,7 +829,7 @@ public abstract class CommonRowSetTests extends BaseTest {
     /*
      * Set two parameters and then validate clearParameters() will clear them
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0030(BaseRowSet rs) throws Exception {
         rs.setInt(1, 1);
@@ -843,7 +843,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that getURL() returns same value set by
      * setURL()
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0031(RowSet rs) throws Exception {
         rs.setUrl(url);
@@ -854,7 +854,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0100(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -867,7 +867,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0101(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -880,7 +880,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0102(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -893,7 +893,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0103(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -906,7 +906,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0104(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -919,7 +919,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0105(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -932,7 +932,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0106(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -944,7 +944,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0107(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -957,7 +957,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0108(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -970,7 +970,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0109(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -983,7 +983,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0110(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -995,7 +995,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0111(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1007,7 +1007,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0112(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1020,7 +1020,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0113(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1033,7 +1033,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0114(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1046,7 +1046,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0115(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1059,7 +1059,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0116(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1072,7 +1072,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0117(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1085,7 +1085,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0118(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1098,7 +1098,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0119(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1111,7 +1111,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0120(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1123,7 +1123,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0121(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1135,7 +1135,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0122(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1148,7 +1148,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0123(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1160,7 +1160,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0124(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1173,7 +1173,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0125(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1185,7 +1185,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0126(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1198,7 +1198,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0127(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1210,7 +1210,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0128(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1222,7 +1222,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0129(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1234,7 +1234,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0130(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1246,7 +1246,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0131(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1259,7 +1259,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0132(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1272,7 +1272,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0133(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1285,7 +1285,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0134(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1298,7 +1298,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0135(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1311,7 +1311,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0136(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1324,7 +1324,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0137(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1336,7 +1336,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0138(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1349,7 +1349,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0139(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1362,7 +1362,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0140(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1374,7 +1374,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0141(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1386,7 +1386,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0142(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1398,7 +1398,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0143(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1410,7 +1410,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0144(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1422,7 +1422,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0145(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1434,7 +1434,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0146(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1446,7 +1446,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0147(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1459,7 +1459,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0148(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1471,7 +1471,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0149(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1483,7 +1483,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0150(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1495,7 +1495,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0151(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
@@ -1507,7 +1507,7 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonRowSetTest0152(RowSet rs) throws Exception {
         Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> {
diff --git a/test/jdk/javax/sql/junit/test/rowset/RowSetFactoryTests.java b/test/jdk/javax/sql/junit/test/rowset/RowSetFactoryTests.java
index 578251c388f..89ab6b79d94 100644
--- a/test/jdk/javax/sql/junit/test/rowset/RowSetFactoryTests.java
+++ b/test/jdk/javax/sql/junit/test/rowset/RowSetFactoryTests.java
@@ -54,7 +54,7 @@ public class RowSetFactoryTests extends BaseTest {
      * Validate that the RowSetFactory returned by RowSetProvider.newFactory()
      * returns the correct RowSet implementations
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("RowSetValues")
     public void test(RowSetFactory rsf, String impl) throws SQLException {
         validateRowSetImpl(rsf, impl);
diff --git a/test/jdk/javax/sql/junit/test/rowset/RowSetMetaDataTests.java b/test/jdk/javax/sql/junit/test/rowset/RowSetMetaDataTests.java
index 8cadb6c1de4..0da326a1194 100644
--- a/test/jdk/javax/sql/junit/test/rowset/RowSetMetaDataTests.java
+++ b/test/jdk/javax/sql/junit/test/rowset/RowSetMetaDataTests.java
@@ -56,7 +56,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -67,7 +67,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test01(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -78,7 +78,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test02(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -89,7 +89,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test03(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -100,7 +100,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test04(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -111,7 +111,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test05(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -122,7 +122,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test06(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -133,7 +133,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test07(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -144,7 +144,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test08(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -155,7 +155,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test09(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -166,7 +166,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test10(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -177,7 +177,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test11(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -188,7 +188,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test12(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -199,7 +199,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test13(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -210,7 +210,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test14(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -221,7 +221,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test15(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -232,7 +232,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test16(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -243,7 +243,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test17(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -254,7 +254,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test18(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -265,7 +265,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test19(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -276,7 +276,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test20(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -287,7 +287,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test21(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -298,7 +298,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test22(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -309,7 +309,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test23(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -320,7 +320,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test24(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -331,7 +331,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test25(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -342,7 +342,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test26(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -353,7 +353,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test27(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -364,7 +364,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test28(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -375,7 +375,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test29(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -386,7 +386,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test30(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -397,7 +397,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test31(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -408,7 +408,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test32(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -419,7 +419,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test33(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -430,7 +430,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test34(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -441,7 +441,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("invalidColumnRanges")
     public void test35(Integer col) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -454,7 +454,7 @@ public class RowSetMetaDataTests extends BaseTest {
      * Note:  Once setColumnClassName is added to RowSetMetaData, this
      * method will need to change.
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("columnClassNames")
     public void test36(Integer type, String name) throws Exception {
         rsmd.setColumnType(1, type);
@@ -465,7 +465,7 @@ public class RowSetMetaDataTests extends BaseTest {
      * Validate that all of the methods are accessible and the correct value
      * is returned for each column
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("columnRanges")
     public void test37(Integer col) throws Exception {
         rsmd.setAutoIncrement(col, true);
@@ -510,7 +510,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate that the proper values are accepted by setNullable
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("validSetNullableValues")
     public void test38(Integer val) throws Exception {
         rsmd.setNullable(1, val);
@@ -519,7 +519,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate that the correct type is returned for the column
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("jdbcTypes")
     public void test39(Integer type) throws Exception {
         rsmd.setColumnType(1, type);
@@ -529,7 +529,7 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate that the correct value is returned from the isXXX methods
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @ValueSource(booleans = {true, false})
     public void test40(Boolean b) throws Exception {
         rsmd.setAutoIncrement(1, b);
diff --git a/test/jdk/javax/sql/junit/test/rowset/RowSetProviderTests.java b/test/jdk/javax/sql/junit/test/rowset/RowSetProviderTests.java
index 904431f75a0..25ac405b2ec 100644
--- a/test/jdk/javax/sql/junit/test/rowset/RowSetProviderTests.java
+++ b/test/jdk/javax/sql/junit/test/rowset/RowSetProviderTests.java
@@ -95,7 +95,7 @@ public class RowSetProviderTests extends BaseTest {
     /*
      * Validate that the correct RowSetFactory is returned by newFactory().
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("RowSetFactoryValues")
     public void test(RowSetFactory rsf, String impl) throws SQLException {
         validateProvider(rsf, impl);
diff --git a/test/jdk/javax/sql/junit/test/rowset/cachedrowset/CommonCachedRowSetTests.java b/test/jdk/javax/sql/junit/test/rowset/cachedrowset/CommonCachedRowSetTests.java
index e50b7d0ee7a..684cef42e98 100644
--- a/test/jdk/javax/sql/junit/test/rowset/cachedrowset/CommonCachedRowSetTests.java
+++ b/test/jdk/javax/sql/junit/test/rowset/cachedrowset/CommonCachedRowSetTests.java
@@ -359,7 +359,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate SyncProviderException is thrown when acceptChanges is called
      * but there is not a way to make a connection to the datasource
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonCachedRowSetTest0000(CachedRowSet rs) throws Exception {
         Assertions.assertThrows(SyncProviderException.class, () -> {
@@ -372,7 +372,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate SyncProviderException is thrown when acceptChanges is called
      * when null is passed as the datasource
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonCachedRowSetTest0001(CachedRowSet rs) throws Exception {
         Assertions.assertThrows(SyncProviderException.class, () -> {
@@ -384,7 +384,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
     /*
      * Validate that that RIOPtimsticProvider is the default SyncProvider
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonCachedRowSetTest0002(CachedRowSet rs) throws SQLException {
         SyncProvider sp = rs.getSyncProvider();
@@ -395,7 +395,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
     /*
      * Validate that you can specify a SyncProvider
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonCachedRowSetTest0003(CachedRowSet rs) throws SQLException {
 
@@ -411,7 +411,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
     /*
      * Create a RowSetListener and validate that notifyRowSetChanged is called
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonCachedRowSetTest0004(CachedRowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
@@ -424,7 +424,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
     /*
      * Create a RowSetListener and validate that notifyRowSetChanged is called
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonCachedRowSetTest0005(CachedRowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
@@ -437,7 +437,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
     /*
      * Create a RowSetListener and validate that notifyRowChanged is called
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0006(RowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
@@ -457,7 +457,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Create a multiple RowSetListeners and validate that notifyRowChanged,
      * notifiyMoved is called on all listners
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0007(RowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
@@ -482,7 +482,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Create a RowSetListener and validate that notifyRowChanged  and
      * notifyCursorMoved are  called
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0008(CachedRowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
@@ -503,7 +503,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
     /*
      * Create a RowSetListener and validate that notifyCursorMoved is called
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonCachedRowSetTest0009(RowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
@@ -516,7 +516,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
     /*
      * Validate that getTableName() returns the proper values
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonCachedRowSetTest0010(CachedRowSet rs) throws Exception {
         assertNull(rs.getTableName());
@@ -528,7 +528,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
     /*
      * Validate that getKeyColumns() returns the proper values
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonCachedRowSetTest0011(CachedRowSet rs) throws Exception {
         int[] pkeys = {1, 3};
@@ -542,7 +542,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate that setMatchColumn throws a SQLException if the column
      * index specified is out of range
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0012(CachedRowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -555,7 +555,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate that setMatchColumn throws a SQLException if the column
      * index specified is out of range
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0013(CachedRowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -569,7 +569,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate that setMatchColumn throws a SQLException if the column
      * index specified is out of range
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0014(CachedRowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -582,7 +582,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate that setMatchColumn throws a SQLException if the column
      * index specified is out of range
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0015(CachedRowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -596,7 +596,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * setMatchColumn
      */
     @Disabled
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0016(CachedRowSet rs) throws Exception {
         int[] expectedCols = {1};
@@ -617,7 +617,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * setMatchColumn
      */
     @Disabled
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0017(CachedRowSet rs) throws Exception {
         int[] expectedCols = {1};
@@ -635,7 +635,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * setMatchColumn
      */
     @Disabled
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0018(CachedRowSet rs) throws Exception {
         int[] expectedCols = {1, 3};
@@ -654,7 +654,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * setMatchColumn
      */
     @Disabled
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0019(CachedRowSet rs) throws Exception {
         int[] expectedCols = {1, 3};
@@ -671,7 +671,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate that getMatchColumnIndexes throws a SQLException if
      * unsetMatchColumn has been called
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0020(CachedRowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -688,7 +688,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate that getMatchColumnNames throws a SQLException if
      * unsetMatchColumn has been called
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0021(CachedRowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -706,7 +706,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate that getMatchColumnIndexes throws a SQLException if
      * unsetMatchColumn has been called
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0022(CachedRowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -724,7 +724,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate that getMatchColumnNames throws a SQLException if
      * unsetMatchColumn has been called
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0023(CachedRowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -741,7 +741,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
     /*
      * Validate size() returns the correct number of rows
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0024(CachedRowSet rs) throws Exception {
         assertTrue(rs.size() == COFFEE_HOUSES_ROWS);
@@ -752,7 +752,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate that the correct rows are returned comparing the primary
      * keys
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0025(RowSet rs) throws SQLException {
         Assertions.assertArrayEquals(COFFEE_HOUSES_PRIMARY_KEYS, getPrimaryKeys(rs));
@@ -764,7 +764,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate the visibility of the row depending on the value of
      * setShowdelete
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0026(CachedRowSet rs) throws Exception {
         Object[] afterDelete = {
@@ -790,7 +790,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
     /*
      * Validate that there is no page size by default
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonCachedRowSetTest0027(CachedRowSet rs) throws Exception {
         assertTrue(rs.getPageSize() == 0);
@@ -801,7 +801,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate the value you set via setPageSize is returned by getPageSize
      * then reset to having no limit
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonCachedRowSetTest0028(CachedRowSet rs) throws Exception {
         int rows = 100;
@@ -816,7 +816,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate SQLException is thrown when an invalid value is specified
      * for setPageSize
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonCachedRowSetTest0029(CachedRowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -829,7 +829,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate SQLException is thrown when nextPage is called without a
      * call to populate or execute
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonCachedRowSetTest0030(CachedRowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -842,7 +842,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate SQLException is thrown when previousPage is called without a
      * call to populate or execute
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonCachedRowSetTest0031(CachedRowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -856,7 +856,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate SQLException is thrown when execute is called
      * but there is not a way to make a connection to the datasource
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonCachedRowSetTest0032(CachedRowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -869,7 +869,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate SQLException is thrown when execute is called
      * but there is not a way to make a connection to the datasource
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonCachedRowSetTest0033(CachedRowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -881,7 +881,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
     /*
      * Validate that toCollection(<column>) returns the proper values
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0034(CachedRowSet rs) throws Exception {
         Object[] cities = {"Mendocino", "Seattle", "SF", "Portland", "SF",
@@ -896,7 +896,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
     /*
      * Validate that toCollection() returns the proper values
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0035(CachedRowSet rs) throws Exception {
         Collection<?> col = rs.toCollection();
@@ -915,7 +915,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
     /*
      * Validate that createCopy() returns the proper values
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0036(CachedRowSet rs) throws Exception {
         try (CachedRowSet crs1 = rs.createCopy()) {
@@ -927,7 +927,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
     /*
      * Validate that createCopySchema() returns the proper values
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0037(CachedRowSet rs) throws Exception {
         try (CachedRowSet crs1 = rs.createCopySchema()) {
@@ -942,7 +942,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * and getMatchColumnIndexes should throw a SQLException. This test
      * specifies setMatchColumn(int)
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0038(CachedRowSet rs) throws Exception {
         rs.setMatchColumn(1);
@@ -972,7 +972,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * and getMatchColumnIndexes should throw a SQLException. This test
      * specifies setMatchColumn(String)
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0039(CachedRowSet rs) throws Exception {
         rs.setMatchColumn("ID");
@@ -1001,7 +1001,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate that columnUpdated works with the various datatypes specifying
      * the column index
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingDataTypes")
     public void commonCachedRowSetTest0040(CachedRowSet rs, JDBCType type) throws Exception {
         rs.beforeFirst();
@@ -1099,7 +1099,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate that columnUpdated works with the various datatypes specifying
      * the column name
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingDataTypes")
     public void commonCachedRowSetTest0041(CachedRowSet rs, JDBCType type) throws Exception {
         rs.beforeFirst();
@@ -1198,7 +1198,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate isBeforeFirst(), isFirst() and first() return the correct
      * results
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0042(RowSet rs) throws Exception {
         assertFalse(rs.isBeforeFirst());
@@ -1222,7 +1222,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate isAfterLast(), isLast() and last() return the correct
      * results
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0043(RowSet rs) throws Exception {
         assertFalse(rs.isAfterLast());
@@ -1246,7 +1246,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate a SQLException is thrown when undoDelete is called on the
      * insertRow
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0044(CachedRowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -1260,7 +1260,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate a SQLException is thrown when undoDelete is called when
      * cursor is before the first row
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0045(CachedRowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -1275,7 +1275,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate a SQLException is thrown when undoDelete is called when
      * cursor is after the last row
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0046(CachedRowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -1290,7 +1290,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate a SQLException is thrown when undoUpdate is called on the
      * insertRow
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0047(CachedRowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -1304,7 +1304,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate a SQLException is thrown when undoUpdate is called when
      * cursor is before the first row
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0048(CachedRowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -1319,7 +1319,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate a SQLException is thrown when undoUpdate is called when
      * cursor is after the last row
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0049(CachedRowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -1334,7 +1334,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate a SQLException is thrown when undoInsert is called on the
      * insertRow
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0050(CachedRowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -1348,7 +1348,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate a SQLException is thrown when undoInsert is called when
      * cursor is before the first row
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0051(CachedRowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -1363,7 +1363,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate a SQLException is thrown when undoInsert is called when
      * cursor is after the last row
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0052(CachedRowSet rs) throws Exception {
         Assertions.assertThrows(SQLException.class, () -> {
@@ -1378,7 +1378,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Insert a row, then call undoInsert to roll back the insert and validate
      * the row is not there
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0053(CachedRowSet rs) throws Exception {
         int rowToInsert = 1961;
@@ -1406,7 +1406,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Insert a row, delete the row and then call undoDelete to make sure it
      * is comes back
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0054(CachedRowSet rs) throws Exception {
         int rowToDelete = 1961;
@@ -1441,7 +1441,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Insert a row, modify a field and then call undoUpdate to revert the
      * insert
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0055(CachedRowSet rs) throws Exception {
         int rowToInsert = 1961;
@@ -1479,7 +1479,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate getOriginal returns a ResultSet which is a copy of the original
      * RowSet
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffees")
     public void commonCachedRowSetTest0056(CachedRowSet rs) throws Exception {
         String coffee = "Hazelnut";
@@ -1523,7 +1523,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate getOriginalRow returns a ResultSet which is a copy of the
      * original row that was modified
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffees")
     public void commonCachedRowSetTest0057(CachedRowSet rs) throws Exception {
         String coffee = "Hazelnut";
@@ -1568,7 +1568,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate that restoreOrginal will restore the RowSet to its
      * state prior to the insert of a row
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0058(CachedRowSet rs) throws Exception {
         int rowToInsert = 1961;
@@ -1606,7 +1606,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate that restoreOrginal will restore the RowSet to its
      * state prior to deleting a row
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffees")
     public void commonCachedRowSetTest0059(CachedRowSet rs) throws Exception {
         int rowToDelete = 2;
@@ -1638,7 +1638,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate that restoreOrginal will restore the RowSet to its
      * state prior to updating a row
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffees")
     public void commonCachedRowSetTest0060(CachedRowSet rs) throws Exception {
         int rowToUpdate = 2;
@@ -1677,7 +1677,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Initialize a RowSet via the populate method. Validate it matches
      * the original ResultSet
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0061(CachedRowSet rs) throws Exception {
         try (CachedRowSet crs1 = rsf.createCachedRowSet()) {
@@ -1693,7 +1693,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate it matches the original ResultSet starting for the specofied
      * offset
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0062(CachedRowSet rs) throws Exception {
         Object[] expectedRows = {
diff --git a/test/jdk/javax/sql/junit/test/rowset/filteredrowset/FilteredRowSetTests.java b/test/jdk/javax/sql/junit/test/rowset/filteredrowset/FilteredRowSetTests.java
index f4e527c9e79..15527f58ae2 100644
--- a/test/jdk/javax/sql/junit/test/rowset/filteredrowset/FilteredRowSetTests.java
+++ b/test/jdk/javax/sql/junit/test/rowset/filteredrowset/FilteredRowSetTests.java
@@ -141,7 +141,7 @@ public class FilteredRowSetTests extends CommonWebRowSetTests {
 
 
     @Disabled
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonCachedRowSetTest0043(RowSet rs) throws Exception {
         // Need to fix bug in FilteredRowSets
diff --git a/test/jdk/javax/sql/junit/test/rowset/joinrowset/JoinRowSetTests.java b/test/jdk/javax/sql/junit/test/rowset/joinrowset/JoinRowSetTests.java
index a3bd6ca2658..d1b355cd07c 100644
--- a/test/jdk/javax/sql/junit/test/rowset/joinrowset/JoinRowSetTests.java
+++ b/test/jdk/javax/sql/junit/test/rowset/joinrowset/JoinRowSetTests.java
@@ -189,7 +189,7 @@ public class JoinRowSetTests extends CommonWebRowSetTests {
     /*
      * Join two CachedRowSets specifying a column name to join against
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("createCachedRowSetsToUse")
     public void joinRowSetTests0000(CachedRowSet crs, CachedRowSet crs1)
             throws Exception {
@@ -206,7 +206,7 @@ public class JoinRowSetTests extends CommonWebRowSetTests {
     /*
      * Join two CachedRowSets specifying a column index to join against
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("createCachedRowSetsToUse")
     public void joinRowSetTests0001(CachedRowSet crs, CachedRowSet crs1)
             throws Exception {
@@ -223,7 +223,7 @@ public class JoinRowSetTests extends CommonWebRowSetTests {
     /*
      * Join two CachedRowSets specifying a column name to join against
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("createCachedRowSetsToUse")
     public void joinRowSetTests0002(CachedRowSet crs, CachedRowSet crs1)
             throws Exception {
@@ -241,7 +241,7 @@ public class JoinRowSetTests extends CommonWebRowSetTests {
     /*
      * Join two CachedRowSets specifying a column index to join against
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("createCachedRowSetsToUse")
     public void joinRowSetTests0003(CachedRowSet crs, CachedRowSet crs1)
             throws Exception {
@@ -260,7 +260,7 @@ public class JoinRowSetTests extends CommonWebRowSetTests {
     /*
      * Join two CachedRowSets specifying a column name to join against
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("createCachedRowSetsToUse")
     public void joinRowSetTests0005(CachedRowSet crs, CachedRowSet crs1)
             throws Exception {
@@ -279,7 +279,7 @@ public class JoinRowSetTests extends CommonWebRowSetTests {
     /*
      * Join two CachedRowSets specifying a column index to join against
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("createCachedRowSetsToUse")
     public void joinRowSetTests0006(CachedRowSet crs, CachedRowSet crs1)
             throws Exception {
@@ -298,54 +298,54 @@ public class JoinRowSetTests extends CommonWebRowSetTests {
 
     // Disabled tests due to bugs in JoinRowSet
     @Disabled
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonCachedRowSetTest0004(CachedRowSet rs) throws Exception {
     }
 
     @Disabled
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonCachedRowSetTest0005(CachedRowSet rs) throws Exception {
     }
 
     @Disabled
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonCachedRowSetTest0008(CachedRowSet rs) throws Exception {
     }
 
     @Disabled
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonCachedRowSetTest0026(CachedRowSet rs) throws Exception {
     }
 
     @Disabled
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonCachedRowSetTest0027(CachedRowSet rs) throws Exception {
     }
 
     @Disabled
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonCachedRowSetTest0053(CachedRowSet rs) throws Exception {
     }
 
     @Disabled
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonCachedRowSetTest0054(CachedRowSet rs) throws Exception {
     }
 
     @Disabled
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void commonCachedRowSetTest0055(CachedRowSet rs) throws Exception {
     }
 
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void WebRowSetTest0009(WebRowSet wrs1) throws Exception {
     }
diff --git a/test/jdk/javax/sql/junit/test/rowset/webrowset/CommonWebRowSetTests.java b/test/jdk/javax/sql/junit/test/rowset/webrowset/CommonWebRowSetTests.java
index 8a6367ed1ca..791ad6106c8 100644
--- a/test/jdk/javax/sql/junit/test/rowset/webrowset/CommonWebRowSetTests.java
+++ b/test/jdk/javax/sql/junit/test/rowset/webrowset/CommonWebRowSetTests.java
@@ -137,7 +137,7 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
     /*
      * Validate the expected Rows are contained within the RowSet
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffees")
     public void WebRowSetTest0000(WebRowSet wrs) throws Exception {
         Assertions.assertArrayEquals(COFFEES_PRIMARY_KEYS, getPrimaryKeys(wrs));
@@ -149,7 +149,7 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
      * Validate the expected Rows are contained within the RowSet
      * populated by readXML(Reader)
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void WebRowSetTest0001(WebRowSet wrs1) throws Exception {
 
@@ -166,7 +166,7 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
      * Validate the expected Rows are contained within the RowSet
      * populated by readXML(InputStream)
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void WebRowSetTest0002(WebRowSet wrs1) throws Exception {
         try (FileInputStream fis = new FileInputStream(COFFEE_ROWS_XML)) {
@@ -182,7 +182,7 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
      * back via readXML(InputStream) and validate the primary  keys
      * are the same
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffees")
     public void WebRowSetTest0003(WebRowSet wrs) throws Exception {
         ByteArrayOutputStream baos = writeWebRowSetWithOutputStream(wrs);
@@ -197,7 +197,7 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
      * back via readXML(InputStream) and validate the primary  keys
      * are the same
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffees")
     public void WebRowSetTest0004(WebRowSet wrs) throws Exception {
         ResultSet rs = wrs;
@@ -214,7 +214,7 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
      * back via readXML(Reader) and validate the primary  keys
      * are the same
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffees")
     public void WebRowSetTest0005(WebRowSet wrs) throws Exception {
         ByteArrayOutputStream baos = writeWebRowSetWithOutputStreamWithWriter(wrs);
@@ -229,7 +229,7 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
      * back via readXML(Reader) and validate the primary  keys
      * are the same
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffees")
     public void WebRowSetTest0006(WebRowSet wrs) throws Exception {
         ResultSet rs = wrs;
@@ -246,7 +246,7 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
      * after deleting the specified rows
      */
     @Disabled
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowsetUsingCoffees")
     public void WebRowSetTest0007(WebRowSet wrs) throws Exception {
         Assertions.assertArrayEquals(COFFEES_PRIMARY_KEYS, getPrimaryKeys(wrs));
@@ -277,7 +277,7 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
      * that was populated by reading an xml file with all rows
      * marked as a currentRow
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void WebRowSetTest0008(WebRowSet wrs1) throws Exception {
         FileInputStream fis = new FileInputStream(COFFEE_ROWS_XML);
@@ -300,7 +300,7 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
      * Also validate that they are or are not visible based on the
      * setShowDeleted value
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void WebRowSetTest0009(WebRowSet wrs1) throws Exception {
         int[] rowsToDelete = {2, 4};
@@ -328,7 +328,7 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
      * Validate that the correct row in the WebRowSet that had been created
      * from an xml file is marked as updated and contains the correct values
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void WebRowSetTest0010(WebRowSet wrs1) throws Exception {
         FileInputStream fis = new FileInputStream(UPDATED_COFFEE_ROWS_XML);
@@ -355,7 +355,7 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
      * Validate the correct row is marked as inserted in a WebRowSet
      * that is read from an xml file
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void WebRowSetTest0011(WebRowSet wrs1) throws Exception {
         int expectedSize = COFFEES_ROWS + 2;
@@ -389,7 +389,7 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
     /*
      * Read an xml file which contains a row that was inserted and updated
      */
-    @ParameterizedTest
+    @ParameterizedTest(autoCloseArguments = false)
     @MethodSource("rowSetType")
     public void WebRowSetTest0012(WebRowSet wrs1) throws Exception {
         int expectedSize = COFFEES_ROWS + 1;