diff --git a/buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/ci/ContinuousIntegrationPlugin.java b/buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/ci/ContinuousIntegrationPlugin.java
index 9ced8db2a87..97198e6c7c4 100644
--- a/buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/ci/ContinuousIntegrationPlugin.java
+++ b/buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/ci/ContinuousIntegrationPlugin.java
@@ -39,7 +39,7 @@ public void apply(Project project) {
           Task connectedCheckDependents = sub.task("connectedCheckDependents");
           Task deviceCheckDependents = sub.task("deviceCheckDependents");
 
-          project
+          sub
               .getConfigurations()
               .all(
                   cfg -> {
diff --git a/buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java b/buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java
index a91b5099ead..49126c747a1 100644
--- a/buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java
+++ b/buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java
@@ -46,7 +46,7 @@ public void uploadApks(String variantName, File testApk, File testedApk) {
     // test lab requires an "app" apk, so we give an empty apk to it.
     String testedApkPath =
         testedApk != null
-            ? testApk.toString()
+            ? testedApk.toString()
             : project.getRootDir() + "/buildSrc/resources/dummy.apk";
     project
         .getLogger()
diff --git a/firebase-inappmessaging-display/ktx/src/test/kotlin/com/google/firebase/inappmessaging/display/ktx/InAppMessagingDisplayTests.kt b/firebase-inappmessaging-display/ktx/src/test/kotlin/com/google/firebase/inappmessaging/display/ktx/InAppMessagingDisplayTests.kt
index 0f408a262d7..ef19ffc1b3a 100644
--- a/firebase-inappmessaging-display/ktx/src/test/kotlin/com/google/firebase/inappmessaging/display/ktx/InAppMessagingDisplayTests.kt
+++ b/firebase-inappmessaging-display/ktx/src/test/kotlin/com/google/firebase/inappmessaging/display/ktx/InAppMessagingDisplayTests.kt
@@ -28,9 +28,10 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
+import java.util.UUID
 
-const val APP_ID = "APP_ID"
-const val API_KEY = "API_KEY"
+internal const val APP_ID = "APP:ID"
+internal val API_KEY = "ABC" + UUID.randomUUID().toString()
 
 const val EXISTING_APP = "existing"
 
diff --git a/firebase-inappmessaging/ktx/src/test/kotlin/com/google/firebase/inappmessagging/ktx/InAppMessaggingTests.kt b/firebase-inappmessaging/ktx/src/test/kotlin/com/google/firebase/inappmessagging/ktx/InAppMessaggingTests.kt
index 8d8799ad972..35879b56a0d 100644
--- a/firebase-inappmessaging/ktx/src/test/kotlin/com/google/firebase/inappmessagging/ktx/InAppMessaggingTests.kt
+++ b/firebase-inappmessaging/ktx/src/test/kotlin/com/google/firebase/inappmessagging/ktx/InAppMessaggingTests.kt
@@ -28,9 +28,10 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
+import java.util.UUID
 
-const val APP_ID = "APP_ID"
-const val API_KEY = "API_KEY"
+internal const val APP_ID = "APP:ID"
+internal val API_KEY = "ABC" + UUID.randomUUID().toString()
 
 const val EXISTING_APP = "existing"