diff --git a/README.md b/README.md
index 7939fbe3..28739a32 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,11 @@ on how to do that, including how to develop and test locally and the versioning
 
 ## Release Notes
 
+### TBD
+*Released*: TBD
+(Earliest compatible LabKey version: 26.6.0)
+- Pass all command-line 'webtest' and 'webdriver' properties to tests (fix to work off of TeamCity)
+
 ### 9.2.0
 *Released*: 27 July 2026
 (Earliest compatible LabKey version: 26.6.0)
diff --git a/src/main/groovy/org/labkey/gradle/task/RunTestSuite.groovy b/src/main/groovy/org/labkey/gradle/task/RunTestSuite.groovy
index 712ea492..9816165d 100644
--- a/src/main/groovy/org/labkey/gradle/task/RunTestSuite.groovy
+++ b/src/main/groovy/org/labkey/gradle/task/RunTestSuite.groovy
@@ -78,13 +78,6 @@ abstract class RunTestSuite extends RunUiTest
                     systemProperty key, project.teamcity[key]
                 }
             }
-            // Include all 'webtest' and 'webdriver' properties, whether they are in test.properties or not
-            for (String key : project.ext.properties.keySet())
-            {
-                if (key.startsWith("webtest.") || key.startsWith("webdriver.")) {
-                    systemProperty key, project.ext[key]
-                }
-            }
         }
     }
 }
diff --git a/src/main/groovy/org/labkey/gradle/task/RunUiTest.groovy b/src/main/groovy/org/labkey/gradle/task/RunUiTest.groovy
index 9ae635a5..219692bd 100644
--- a/src/main/groovy/org/labkey/gradle/task/RunUiTest.groovy
+++ b/src/main/groovy/org/labkey/gradle/task/RunUiTest.groovy
@@ -18,7 +18,6 @@ package org.labkey.gradle.task
 import org.apache.commons.lang3.StringUtils
 import org.gradle.api.tasks.UntrackedTask
 import org.gradle.api.tasks.testing.Test
-import org.gradle.work.DisableCachingByDefault
 import org.labkey.gradle.plugin.extension.LabKeyExtension
 import org.labkey.gradle.plugin.extension.TomcatExtension
 import org.labkey.gradle.plugin.extension.UiTestExtension
@@ -85,6 +84,13 @@ abstract class RunUiTest extends Test
             if (!StringUtils.isEmpty((String) testConfig.get(key)))
                 systemProperty key, testConfig.get(key)
         }
+        // Include all 'webtest' and 'webdriver' properties, whether they are in test.properties or not
+        for (String key : project.ext.properties.keySet())
+        {
+            if (key.startsWith("webtest.") || key.startsWith("webdriver.")) {
+                systemProperty key, project.ext[key]
+            }
+        }
         systemProperty "devMode", LabKeyExtension.isDevMode(project)
         systemProperty "failure.output.dir", "${BuildUtils.getBuildDirPath(project)}/${LOG_DIR}"
         systemProperty "labkey.root", project.rootProject.projectDir