diff --git a/build.gradle.kts b/build.gradle.kts
index 36f6b373affd..9aa0c10bf3ac 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -49,7 +49,7 @@ if (project.findProperty("skipTests") as String? == "true") {
   }
 }
 
-if (gradle.startParameter.taskNames.any { it.equals("listTestsInPartition") }) {
+if (gradle.startParameter.taskNames.contains("listTestsInPartition")) {
   tasks {
     val listTestsInPartition by registering {
       group = "Help"
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 6f6af9414458..99e34ace004d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -65,9 +65,11 @@ if (useScansGradleCom) {
         fileFingerprints = true
       }
 
-      buildScanPublished {
-        File("build-scan.txt").printWriter().use { writer ->
-          writer.println(buildScanUri)
+      if (!gradle.startParameter.taskNames.contains("listTestsInPartition")) {
+        buildScanPublished {
+          File("build-scan.txt").printWriter().use { writer ->
+            writer.println(buildScanUri)
+          }
         }
       }
     }
@@ -89,9 +91,11 @@ if (useScansGradleCom) {
         value("Smoke test suite", it)
       }
 
-      buildScanPublished {
-        File("build-scan.txt").printWriter().use { writer ->
-          writer.println(buildScanUri)
+      if (!gradle.startParameter.taskNames.contains("listTestsInPartition")) {
+        buildScanPublished {
+          File("build-scan.txt").printWriter().use { writer ->
+            writer.println(buildScanUri)
+          }
         }
       }
     }