diff --git a/modules/simpletest/resources/queries/vehicle/Manufacturers.js b/modules/simpletest/resources/queries/vehicle/Manufacturers.js
new file mode 100644
index 0000000000..38fd153c28
--- /dev/null
+++ b/modules/simpletest/resources/queries/vehicle/Manufacturers.js
@@ -0,0 +1,9 @@
+var console = require("console");
+
+function beforeInsert(row, errors) {
+    // This is intended to force a timeout exception:
+    if (this.extraContext.scriptTimeout && !!this.extraContext.simulateScriptTimeout) {
+        console.log("Simulating script timeout!")
+        java.lang.Thread.sleep(100 + (this.extraContext.scriptTimeout * 1000))
+    }
+}
\ No newline at end of file
diff --git a/src/org/labkey/test/tests/SimpleModuleTest.java b/src/org/labkey/test/tests/SimpleModuleTest.java
index 42766be2a4..6d9bc49018 100644
--- a/src/org/labkey/test/tests/SimpleModuleTest.java
+++ b/src/org/labkey/test/tests/SimpleModuleTest.java
@@ -288,6 +288,7 @@ protected void doVerifySteps() throws Exception
         doTestCustomLogin();
         doTestFkLookupFilter();
         doTestMetadataOverrideForCustomQuery();
+        doTestScriptTimeout();
     }
 
     @LogMethod
@@ -346,6 +347,19 @@ private void doTestMetadataOverrideForCustomQuery()
 
     }
 
+    @LogMethod
+    public void doTestScriptTimeout() throws Exception
+    {
+        InsertRowsCommand insertCmdM = new InsertRowsCommand("vehicle", "Manufacturers");
+        Map<String, Object> rowMapM = new HashMap<>();
+        rowMapM.put("Name", "I_Should_Not_Succeed");
+        insertCmdM.addRow(rowMapM);
+        insertCmdM.setExtraContext(Map.of("scriptTimeout", 3, "simulateScriptTimeout", true));
+        Assert.assertThrows(CommandException.class, () -> {
+                insertCmdM.execute(createDefaultConnection(), getProjectName());
+        });
+    }
+
     private int getRowCount(String schemaName, String tableName)
     {
         pushLocation();