diff --git a/build.gradle b/build.gradle
index ec5f085f53..8b110bd5cb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,6 +5,7 @@ plugins {
     id 'maven-publish'
 }
 
+import org.labkey.gradle.task.RunTestSuite
 import org.labkey.gradle.util.BuildUtils
 import org.labkey.gradle.util.GroupNames
 import org.labkey.gradle.util.PomFileHelper
@@ -170,8 +171,15 @@ project.tasks.register("convertHarToStressXml", JavaExec) {
         }
 }
 
-project.tasks.uiTests.dependsOn(initPropertiesTask)
-project.parent.parent.tasks.ijConfigure.dependsOn(initPropertiesTask)
+project.tasks.named("uiTests").configure {
+    dependsOn(initPropertiesTask)
+}
+project.parent.parent.tasks.named("ijConfigure").configure {
+    dependsOn(initPropertiesTask)
+}
+project.tasks.withType(RunTestSuite).configureEach { it ->
+    scanForTestClasses = true // Required for Gradle 9.3
+}
 
 if (project.hasProperty('doPublishing'))
 {
diff --git a/src/org/labkey/test/Runner.java b/src/org/labkey/test/Runner.java
index 204970c00a..bacc2d7a6b 100644
--- a/src/org/labkey/test/Runner.java
+++ b/src/org/labkey/test/Runner.java
@@ -41,9 +41,11 @@
 import org.jetbrains.annotations.NotNull;
 import org.junit.Ignore;
 import org.junit.runner.Description;
+import org.junit.runner.RunWith;
 import org.junit.runner.manipulation.Filter;
 import org.junit.runner.manipulation.Filterable;
 import org.junit.runner.manipulation.NoTestsRemainException;
+import org.junit.runners.AllTests;
 import org.labkey.junit.runner.WebTestProperties;
 import org.labkey.serverapi.reader.Readers;
 import org.labkey.serverapi.writer.PrintWriters;
@@ -92,6 +94,7 @@
 
 import static org.labkey.test.WebTestHelper.logToServer;
 
+@RunWith(AllTests.class)
 public class Runner extends TestSuite
 {
     static