diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0ec30109..0e72fd6a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -45,7 +45,7 @@ jobs:
       run: ./gradlew build jacocoTestReport -x :maps-app:generateDebugScreenshotTestConfig -x :maps-app:testDebugScreenshotTest -x :maps-app:generateReleaseScreenshotTestConfig -x :maps-app:testReleaseScreenshotTest --stacktrace
 
     - name: Run Screenshot Tests
-      run: ./gradlew validateDebugScreenshotTest
+      run: ./gradlew :maps-app:validateDebugScreenshotTest
 
     - name: Upload build reports
       uses: actions/upload-artifact@v4
diff --git a/maps-app/build.gradle.kts b/maps-app/build.gradle.kts
index 4d875f61..e437f95a 100644
--- a/maps-app/build.gradle.kts
+++ b/maps-app/build.gradle.kts
@@ -84,7 +84,7 @@ dependencies {
     implementation(libs.material)
     implementation(libs.androidx.compose.material.icons.extended.android)
 
-    implementation(libs.screenshot.validation.api)
+    screenshotTestImplementation(libs.screenshot.validation.api)
     debugImplementation(libs.androidx.compose.ui.tooling)
     debugImplementation(libs.leakcanary.android)
 
diff --git a/maps-app/src/main/java/com/google/maps/android/compose/BasicMapActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/BasicMapActivity.kt
index 7fa10979..43b74a19 100644
--- a/maps-app/src/main/java/com/google/maps/android/compose/BasicMapActivity.kt
+++ b/maps-app/src/main/java/com/google/maps/android/compose/BasicMapActivity.kt
@@ -59,7 +59,6 @@ import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import com.android.tools.screenshot.PreviewTest
 import com.google.android.gms.maps.CameraUpdateFactory
 import com.google.android.gms.maps.model.BitmapDescriptorFactory
 import com.google.android.gms.maps.model.CameraPosition
@@ -433,7 +432,6 @@ private fun DebugView(
 }
 
 
-@PreviewTest
 @Composable
 fun GoogleMapViewPreview() {
     MapsComposeSampleTheme {
diff --git a/maps-app/src/main/java/com/google/maps/android/compose/ScaleBarActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/ScaleBarActivity.kt
index b06ff28b..2f35fb7d 100644
--- a/maps-app/src/main/java/com/google/maps/android/compose/ScaleBarActivity.kt
+++ b/maps-app/src/main/java/com/google/maps/android/compose/ScaleBarActivity.kt
@@ -39,7 +39,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.android.tools.screenshot.PreviewTest
 import com.google.android.gms.maps.model.CameraPosition
 import com.google.android.gms.maps.model.LatLng
 import com.google.maps.android.compose.theme.MapsComposeSampleTheme
@@ -131,26 +130,4 @@ class ScaleBarActivity : ComponentActivity() {
             }
         }
     }
-}
-
-@PreviewTest
-@Composable
-fun PreviewScaleBar() {
-    val cameraPositionState = remember {
-        CameraPositionState(
-            position = CameraPosition(
-                LatLng(48.137154, 11.576124), // Example coordinates: Munich, Germany
-                12f,
-                0f,
-                0f
-            )
-        )
-    }
-
-    MapsComposeSampleTheme {
-        ScaleBar(
-            modifier = Modifier.padding(end = 4.dp),
-            cameraPositionState = cameraPositionState
-        )
-    }
 }
\ No newline at end of file
diff --git a/maps-app/src/screenshotTest/java/com/google/maps/android/compose/ScaleBarTest.kt b/maps-app/src/screenshotTest/java/com/google/maps/android/compose/ScaleBarTest.kt
index e29ddef2..f00644cd 100644
--- a/maps-app/src/screenshotTest/java/com/google/maps/android/compose/ScaleBarTest.kt
+++ b/maps-app/src/screenshotTest/java/com/google/maps/android/compose/ScaleBarTest.kt
@@ -14,50 +14,48 @@ import com.google.maps.android.compose.widgets.DisappearingScaleBar
 import com.google.maps.android.compose.widgets.ScaleBar
 
 
-class ScaleBarTest() {
-    @PreviewTest
-    @Preview(showBackground = true)
-    @Composable
-    fun PreviewScaleBar() {
-        val cameraPositionState = remember {
-            CameraPositionState(
-                position = CameraPosition(
-                    LatLng(48.137154, 11.576124), // Example coordinates: Munich, Germany
-                    12f,
-                    0f,
-                    0f
-                )
+@PreviewTest
+@Preview(showBackground = true)
+@Composable
+fun PreviewScaleBar() {
+    val cameraPositionState = remember {
+        CameraPositionState(
+            position = CameraPosition(
+                LatLng(48.137154, 11.576124), // Example coordinates: Munich, Germany
+                12f,
+                0f,
+                0f
             )
-        }
+        )
+    }
 
-        MapsComposeSampleTheme {
-            ScaleBar(
-                modifier = Modifier.padding(end = 4.dp),
-                cameraPositionState = cameraPositionState
-            )
-        }
+    MapsComposeSampleTheme {
+        ScaleBar(
+            modifier = Modifier.padding(end = 4.dp),
+            cameraPositionState = cameraPositionState
+        )
     }
+}
 
-    @PreviewTest
-    @Preview(showBackground = true)
-    @Composable
-    fun PreviewDisappearingScaleBar() {
-        val cameraPositionState = remember {
-            CameraPositionState(
-                position = CameraPosition(
-                    LatLng(48.137154, 11.576124), // Example coordinates: Munich, Germany
-                    12f,
-                    0f,
-                    0f
-                )
+@PreviewTest
+@Preview(showBackground = true)
+@Composable
+fun PreviewDisappearingScaleBar() {
+    val cameraPositionState = remember {
+        CameraPositionState(
+            position = CameraPosition(
+                LatLng(48.137154, 11.576124), // Example coordinates: Munich, Germany
+                12f,
+                0f,
+                0f
             )
-        }
+        )
+    }
 
-        MapsComposeSampleTheme {
-            DisappearingScaleBar(
-                modifier = Modifier.padding(end = 4.dp),
-                cameraPositionState = cameraPositionState
-            )
-        }
+    MapsComposeSampleTheme {
+        DisappearingScaleBar(
+            modifier = Modifier.padding(end = 4.dp),
+            cameraPositionState = cameraPositionState
+        )
     }
 }
\ No newline at end of file
diff --git a/maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/ScaleBarTest/PreviewDisappearingScaleBar_748aa731_0.png b/maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/ScaleBarTest/PreviewDisappearingScaleBar_748aa731_0.png
deleted file mode 100644
index ba725732..00000000
Binary files a/maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/ScaleBarTest/PreviewDisappearingScaleBar_748aa731_0.png and /dev/null differ
diff --git a/maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/ScaleBarTestKt/PreviewDisappearingScaleBar_748aa731_0.png b/maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/ScaleBarTestKt/PreviewDisappearingScaleBar_748aa731_0.png
new file mode 100644
index 00000000..91a1d413
Binary files /dev/null and b/maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/ScaleBarTestKt/PreviewDisappearingScaleBar_748aa731_0.png differ
diff --git a/maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/ScaleBarTest/PreviewScaleBar_748aa731_0.png b/maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/ScaleBarTestKt/PreviewScaleBar_748aa731_0.png
similarity index 100%
rename from maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/ScaleBarTest/PreviewScaleBar_748aa731_0.png
rename to maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/ScaleBarTestKt/PreviewScaleBar_748aa731_0.png