diff --git a/modules/simpletest/module.properties b/modules/simpletest/module.properties
index 1cbcc2392f..37790e7e68 100644
--- a/modules/simpletest/module.properties
+++ b/modules/simpletest/module.properties
@@ -1,4 +1,4 @@
 Name: simpletest
-SchemaVersion: 25.001
+SchemaVersion: 25.002
 SupportedDatabases: mssql, pgsql
 ManageVersion: true
diff --git a/modules/simpletest/resources/schemas/dbscripts/postgresql/vehicle-25.001-25.002.sql b/modules/simpletest/resources/schemas/dbscripts/postgresql/vehicle-25.001-25.002.sql
new file mode 100644
index 0000000000..b0be9f386b
--- /dev/null
+++ b/modules/simpletest/resources/schemas/dbscripts/postgresql/vehicle-25.001-25.002.sql
@@ -0,0 +1,19 @@
+DROP TABLE IF EXISTS vehicle.OwnedVehicles;
+DROP TABLE IF EXISTS vehicle.Owners;
+
+CREATE TABLE vehicle.Owners
+(
+    RowId BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 2147483648 INCREMENT BY 1),
+    Name VARCHAR(100) NOT NULL,
+
+    CONSTRAINT PK_Owners PRIMARY KEY (RowId)
+);
+
+CREATE TABLE vehicle.OwnedVehicles
+(
+    RowId BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 4294967296 INCREMENT BY 1),
+    Owner BIGINT NOT NULL,
+    Vehicle INT NOT NULL,
+
+    CONSTRAINT PK_OwnedVehicles PRIMARY KEY (RowId)
+);
\ No newline at end of file
diff --git a/modules/simpletest/resources/schemas/dbscripts/sqlserver/vehicle-25.001-25.002.sql b/modules/simpletest/resources/schemas/dbscripts/sqlserver/vehicle-25.001-25.002.sql
new file mode 100644
index 0000000000..d42a2010c6
--- /dev/null
+++ b/modules/simpletest/resources/schemas/dbscripts/sqlserver/vehicle-25.001-25.002.sql
@@ -0,0 +1,19 @@
+DROP TABLE IF EXISTS vehicle.OwnedVehicles;
+DROP TABLE IF EXISTS vehicle.Owners;
+
+CREATE TABLE vehicle.Owners
+(
+    RowId BIGINT IDENTITY(2147483648,1) NOT NULL,
+    Name VARCHAR(100) NOT NULL,
+
+    CONSTRAINT PK_Owners PRIMARY KEY (RowId)
+);
+
+CREATE TABLE vehicle.OwnedVehicles
+(
+    RowId BIGINT IDENTITY(4294967296,1) NOT NULL,
+    Owner BIGINT NOT NULL,
+    Vehicle INT NOT NULL,
+
+    CONSTRAINT PK_OwnedVehicles PRIMARY KEY (RowId)
+);
\ No newline at end of file
diff --git a/modules/simpletest/resources/schemas/vehicle.xml b/modules/simpletest/resources/schemas/vehicle.xml
index f0317fa661..f5717a2f3e 100644
--- a/modules/simpletest/resources/schemas/vehicle.xml
+++ b/modules/simpletest/resources/schemas/vehicle.xml
@@ -339,4 +339,32 @@
       </column>
     </columns>
   </table>
+
+  <table tableName="Owners" tableDbType="TABLE">
+    <columns>
+      <column columnName="RowId"/>
+      <column columnName="Name"/>
+    </columns>
+  </table>
+
+  <table tableName="OwnedVehicles" tableDbType="TABLE">
+    <columns>
+      <column columnName="RowId"/>
+      <column columnName="Owner">
+        <fk>
+          <fkColumnName>RowId</fkColumnName>
+          <fkTable>Owners</fkTable>
+          <fkDbSchema>vehicle</fkDbSchema>
+        </fk>
+      </column>
+      <column columnName="Vehicle">
+        <fk>
+          <fkColumnName>RowId</fkColumnName>
+          <fkTable>Vehicles</fkTable>
+          <fkDbSchema>vehicle</fkDbSchema>
+        </fk>
+      </column>
+    </columns>
+  </table>
+
 </tables>
diff --git a/src/org/labkey/test/pages/query/UpdateQueryRowPage.java b/src/org/labkey/test/pages/query/UpdateQueryRowPage.java
index 11c5512490..75db019cc3 100644
--- a/src/org/labkey/test/pages/query/UpdateQueryRowPage.java
+++ b/src/org/labkey/test/pages/query/UpdateQueryRowPage.java
@@ -71,6 +71,10 @@ else if (value instanceof Integer i)
             {
                 setField(entry.getKey(), i);
             }
+            else if (value instanceof Long l)
+            {
+                setField(entry.getKey(), l);
+            }
             else if (value instanceof File f)
             {
                 setField(entry.getKey(), f);
@@ -107,6 +111,11 @@ public UpdateQueryRowPage setField(String fieldName, Integer value)
         return setField(fieldName, String.valueOf(value));
     }
 
+    public UpdateQueryRowPage setField(String fieldName, Long value)
+    {
+        return setField(fieldName, String.valueOf(value));
+    }
+
     public UpdateQueryRowPage setField(String fieldName, File file)
     {
         setFormElement(elementCache().findField(fieldName), file);