diff --git a/build-logic/src/main/kotlin/polaris-java.gradle.kts b/build-logic/src/main/kotlin/polaris-java.gradle.kts
index e5ff7cc58..858c303c2 100644
--- a/build-logic/src/main/kotlin/polaris-java.gradle.kts
+++ b/build-logic/src/main/kotlin/polaris-java.gradle.kts
@@ -98,24 +98,14 @@ testing {
           }
         )
       }
-    }
-  }
-}
 
-// Special handling for test-suites with type `manual-test`, which are intended to be run on demand
-// rather than implicitly via `check`.
-afterEvaluate {
-  testing {
-    suites {
-      withType<JvmTestSuite> {
-        // Need to do this check in an afterEvaluate, because the `withType` above gets called
-        // before the configure() of a registered test suite runs.
-        if (testType.get() != "manual-test") {
-          targets.all {
-            if (testTask.name != "test") {
-              testTask.configure { shouldRunAfter("test") }
-              tasks.named("check").configure { dependsOn(testTask) }
-            }
+      // Special handling for test-suites with names containing `manualtest`, which are intended to
+      // be run on demand rather than implicitly via `check`.
+      if (!name.lowercase().contains("manualtest")) {
+        targets.all {
+          if (testTask.name != "test") {
+            testTask.configure { shouldRunAfter("test") }
+            tasks.named("check").configure { dependsOn(testTask) }
           }
         }
       }
diff --git a/build-logic/src/main/kotlin/polaris-quarkus.gradle.kts b/build-logic/src/main/kotlin/polaris-quarkus.gradle.kts
index 21abf3641..17d446d28 100644
--- a/build-logic/src/main/kotlin/polaris-quarkus.gradle.kts
+++ b/build-logic/src/main/kotlin/polaris-quarkus.gradle.kts
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import org.gradle.api.attributes.TestSuiteType
 import org.gradle.api.plugins.jvm.JvmTestSuite
 import org.gradle.kotlin.dsl.register
 import org.gradle.kotlin.dsl.withType
@@ -41,7 +40,6 @@ testing {
       }
     }
     register<JvmTestSuite>("intTest") {
-      testType = TestSuiteType.INTEGRATION_TEST
       targets.all {
         tasks.named("compileIntTestJava").configure {
           dependsOn(tasks.named("compileQuarkusTestGeneratedSourcesJava"))