diff --git a/src/test/org/firebirdsql/jdbc/FBResultSetTest.java b/src/test/org/firebirdsql/jdbc/FBResultSetTest.java
index 0c2538c74..9639374c2 100644
--- a/src/test/org/firebirdsql/jdbc/FBResultSetTest.java
+++ b/src/test/org/firebirdsql/jdbc/FBResultSetTest.java
@@ -1475,26 +1475,17 @@ static Stream<Arguments> testIsBeforeFirst_isAfterLast_emptyResultSet_bug807() {
     @MethodSource
     void wasNull_onInsertRow(int resultSetType, String scrollableCursorPropertyValue) throws Exception {
         try (Connection connection = createConnection(scrollableCursorPropertyValue)) {
-            executeCreateTable(connection, "create table t1 (i int primary key, v varchar(10))");
-
-            try (PreparedStatement pstmt = connection.prepareStatement("insert into t1 values(?, ?)")) {
-                for (int i = 1; i <= 10; i++) {
-                    pstmt.setInt(1, i);
-                    pstmt.setString(2, i + " s");
-                    pstmt.addBatch();
-                }
-                pstmt.executeBatch();
-            }
+            executeCreateTable(connection, CREATE_TABLE_STATEMENT);
 
             try (Statement stmt = connection.createStatement(resultSetType, CONCUR_UPDATABLE);
-                 ResultSet rs = stmt.executeQuery("select i, v from t1")) {
+                 ResultSet rs = stmt.executeQuery(SELECT_TEST_TABLE)) {
                 rs.moveToInsertRow();
                 rs.updateNull(1);
-                rs.updateString(2, "11 s");
+                rs.updateString(2, "1 s");
 
                 assertNull(rs.getObject(1), "column 1");
                 assertTrue(rs.wasNull(), "column 1");
-                assertEquals("11 s", rs.getObject(2), "column 2");
+                assertEquals("1 s", rs.getObject(2), "column 2");
                 assertFalse(rs.wasNull(), "column 2");
             }
         }