diff --git a/paparazzi-gradle-plugin/src/test/java/app/cash/paparazzi/gradle/PaparazziPluginTest.kt b/paparazzi-gradle-plugin/src/test/java/app/cash/paparazzi/gradle/PaparazziPluginTest.kt
index 676adb722f..5e404a063c 100644
--- a/paparazzi-gradle-plugin/src/test/java/app/cash/paparazzi/gradle/PaparazziPluginTest.kt
+++ b/paparazzi-gradle-plugin/src/test/java/app/cash/paparazzi/gradle/PaparazziPluginTest.kt
@@ -1,7 +1,6 @@
 package app.cash.paparazzi.gradle
 
 import app.cash.paparazzi.gradle.ImageSubject.Companion.assertThat
-import app.cash.paparazzi.gradle.ImageSubject.ImageAssert.Companion.DEFAULT_PERCENT_DIFFERENCE_THRESHOLD
 import app.cash.paparazzi.gradle.PrepareResourcesTask.Config
 import com.google.common.truth.Correspondence
 import com.google.common.truth.Truth.assertThat
@@ -40,23 +39,11 @@ class PaparazziPluginTest {
     val fixtureRoot = File("src/test/projects/supports-application-modules")
 
     val result = gradleRunner
-      .withArguments("testDebug", "--stacktrace")
+      .withArguments("verifyPaparazziDebug", "--stacktrace")
       .runFixture(fixtureRoot) { build() }
 
     assertThat(result.task(":preparePaparazziDebugResources")).isNotNull()
     assertThat(result.task(":testDebugUnitTest")).isNotNull()
-    assertThat(result.output).doesNotContain(
-      "Currently, Paparazzi only works in Android library -- not application -- modules. " +
-        "See https://github.com/cashapp/paparazzi/issues/107"
-    )
-
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFiles()
-    assertThat(snapshots!!).hasLength(1)
-
-    val snapshotImage = snapshots[0]
-    val goldenImage = File(fixtureRoot, "src/test/resources/launch.png")
-    assertThat(snapshotImage).isSimilarTo(goldenImage).withDefaultThreshold()
   }
 
   @Test
@@ -64,19 +51,11 @@ class PaparazziPluginTest {
     val fixtureRoot = File("src/test/projects/supports-dynamic-feature-modules")
 
     val result = gradleRunner
-      .withArguments(":dynamic_feature:testDebug", "--stacktrace")
+      .withArguments(":dynamic_feature:verifyPaparazziDebug", "--stacktrace")
       .runFixture(fixtureRoot) { build() }
 
     assertThat(result.task(":dynamic_feature:preparePaparazziDebugResources")).isNotNull()
     assertThat(result.task(":dynamic_feature:testDebugUnitTest")).isNotNull()
-
-    val snapshotsDir = File(fixtureRoot, "dynamic_feature/build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFiles()
-    assertThat(snapshots!!).hasLength(1)
-
-    val snapshotImage = snapshots[0]
-    val goldenImage = File(fixtureRoot, "dynamic_feature/src/test/resources/launch.png")
-    assertThat(snapshotImage).isSimilarTo(goldenImage).withDefaultThreshold()
   }
 
   @Test
@@ -674,24 +653,8 @@ class PaparazziPluginTest {
     val fixtureRoot = File("src/test/projects/verify-rendering-modes")
 
     gradleRunner
-      .withArguments("testDebug", "--stacktrace")
+      .withArguments("verifyPaparazziDebug", "--stacktrace")
       .runFixture(fixtureRoot) { build() }
-
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFilesSorted()
-    assertThat(snapshots!!).hasSize(4)
-
-    val normal = File(fixtureRoot, "src/test/resources/normal.png")
-    val horizontalScroll = File(fixtureRoot, "src/test/resources/horizontal_scroll.png")
-    val verticalScroll = File(fixtureRoot, "src/test/resources/vertical_scroll.png")
-    val shrink = File(fixtureRoot, "src/test/resources/shrink.png")
-
-    assertThat(snapshots[0]).isSimilarTo(normal).withDefaultThreshold()
-    assertThat(snapshots[1]).isSimilarTo(horizontalScroll).withDefaultThreshold()
-    assertThat(snapshots[2]).isSimilarTo(verticalScroll).withDefaultThreshold()
-    // TODO: is this an issue with layoutlib or related to https://github.com/cashapp/paparazzi/issues/482?
-    assertThat(snapshots[3]).isSimilarTo(shrink)
-      .withThreshold(DEFAULT_PERCENT_DIFFERENCE_THRESHOLD + 0.007)
   }
 
   @Test
@@ -756,17 +719,8 @@ class PaparazziPluginTest {
     val fixtureRoot = File("src/test/projects/widgets")
 
     gradleRunner
-      .withArguments("testDebug", "--stacktrace")
+      .withArguments("verifyPaparazziDebug", "--stacktrace")
       .runFixture(fixtureRoot) { build() }
-
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFilesSorted()
-    assertThat(snapshots!!).hasSize(2)
-
-    val widgetImage = File(fixtureRoot, "src/test/resources/widget.png")
-    val fullScreenImage = File(fixtureRoot, "src/test/resources/full_screen.png")
-    assertThat(snapshots[0]).isSimilarTo(widgetImage).withDefaultThreshold()
-    assertThat(snapshots[1]).isSimilarTo(fullScreenImage).withDefaultThreshold()
   }
 
   @Test
@@ -1218,19 +1172,11 @@ class PaparazziPluginTest {
     val fixtureRoot = File("src/test/projects/verify-snapshot")
 
     val result = gradleRunner
-      .withArguments("testDebug", "--stacktrace")
+      .withArguments("verifyPaparazziDebug", "--stacktrace")
       .runFixture(fixtureRoot) { build() }
 
     assertThat(result.task(":preparePaparazziDebugResources")).isNotNull()
     assertThat(result.task(":testDebugUnitTest")).isNotNull()
-
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFiles()
-    assertThat(snapshots!!).hasLength(1)
-
-    val snapshotImage = snapshots[0]
-    val goldenImage = File(fixtureRoot, "src/test/resources/launch.png")
-    assertThat(snapshotImage).isSimilarTo(goldenImage).withDefaultThreshold()
   }
 
   @Test
@@ -1238,15 +1184,11 @@ class PaparazziPluginTest {
     val fixtureRoot = File("src/test/projects/verify-gif")
 
     val result = gradleRunner
-      .withArguments("testDebug", "--stacktrace")
+      .withArguments("verifyPaparazziDebug", "--stacktrace")
       .runFixture(fixtureRoot) { build() }
 
     assertThat(result.task(":preparePaparazziDebugResources")).isNotNull()
     assertThat(result.task(":testDebugUnitTest")).isNotNull()
-
-    val videoDir = File(fixtureRoot, "build/reports/paparazzi/debug/videos")
-    val videos = videoDir.listFiles()
-    assertThat(videos!!).hasLength(1)
   }
 
   @Test
@@ -1254,16 +1196,8 @@ class PaparazziPluginTest {
     val fixtureRoot = File("src/test/projects/verify-svgs")
 
     gradleRunner
-      .withArguments("testDebug", "--stacktrace")
+      .withArguments("verifyPaparazziDebug", "--stacktrace")
       .runFixture(fixtureRoot) { build() }
-
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFiles()
-    assertThat(snapshots!!).hasLength(1)
-
-    val snapshotImage = snapshots[0]
-    val goldenImage = File(fixtureRoot, "src/test/resources/arrow_up.png")
-    assertThat(snapshotImage).isSimilarTo(goldenImage).withDefaultThreshold()
   }
 
   @Test
@@ -1271,16 +1205,8 @@ class PaparazziPluginTest {
     val fixtureRoot = File("src/test/projects/verify-recyclerview")
 
     gradleRunner
-      .withArguments("testDebug", "--stacktrace")
+      .withArguments("verifyPaparazziDebug", "--stacktrace")
       .runFixture(fixtureRoot) { build() }
-
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFiles()
-    assertThat(snapshots!!).hasLength(1)
-
-    val snapshotImage = snapshots[0]
-    val goldenImage = File(fixtureRoot, "src/test/resources/recycler_view.png")
-    assertThat(snapshotImage).isSimilarTo(goldenImage).withDefaultThreshold()
   }
 
   @Test
@@ -1288,15 +1214,8 @@ class PaparazziPluginTest {
     val fixtureRoot = File("src/test/projects/appcompat-missing")
 
     gradleRunner
-      .withArguments("testDebug", "--stacktrace")
+      .withArguments("verifyPaparazziDebug", "--stacktrace")
       .runFixture(fixtureRoot) { build() }
-
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshotFile = File(snapshotsDir, "a2095a4d9f78335277b48a4bda336c1437d44295.png")
-    assertThat(snapshotFile.exists()).isTrue()
-
-    val goldenImage = File(fixtureRoot, "src/test/resources/arrow_missing.png")
-    assertThat(goldenImage).isSimilarTo(snapshotFile).withDefaultThreshold()
   }
 
   @Test
@@ -1304,16 +1223,8 @@ class PaparazziPluginTest {
     val fixtureRoot = File("src/test/projects/appcompat-present")
 
     gradleRunner
-      .withArguments("testDebug", "--stacktrace")
+      .withArguments("verifyPaparazziDebug", "--stacktrace")
       .runFixture(fixtureRoot) { build() }
-
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFiles()
-    assertThat(snapshots!!).hasLength(1)
-
-    val snapshotImage = snapshots[0]
-    val goldenImage = File(fixtureRoot, "src/test/resources/arrow_present.png")
-    assertThat(snapshotImage).isSimilarTo(goldenImage).withDefaultThreshold()
   }
 
   @Test
@@ -1322,139 +1233,35 @@ class PaparazziPluginTest {
     val fixtureRoot = File("src/test/projects/material-components-present")
 
     gradleRunner
-      .withArguments("testDebug", "--stacktrace")
-      .runFixture(fixtureRoot) { build() }
-
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFiles()
-    assertThat(snapshots!!).hasLength(1)
-
-    val snapshotImage = snapshots[0]
-    val goldenImage = File(fixtureRoot, "src/test/resources/button.png")
-    assertThat(snapshotImage).isSimilarTo(goldenImage).withDefaultThreshold()
-  }
-
-  @Test
-  fun customFontsInXml() {
-    val fixtureRoot = File("src/test/projects/custom-fonts-xml")
-
-    gradleRunner
-      .withArguments("testDebug", "--stacktrace")
-      .runFixture(fixtureRoot) { build() }
-
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFiles()
-    assertThat(snapshots!!).hasLength(1)
-
-    val snapshotImage = snapshots[0]
-    val goldenImage = File(fixtureRoot, "src/test/resources/textviews.png")
-    assertThat(snapshotImage).isSimilarTo(goldenImage).withDefaultThreshold()
-  }
-
-  @Test
-  fun customFontsInCode() {
-    val fixtureRoot = File("src/test/projects/custom-fonts-code")
-
-    gradleRunner
-      .withArguments("testDebug", "--stacktrace")
-      .runFixture(fixtureRoot) { build() }
-
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFiles()?.sortedBy { it.lastModified() }
-    assertThat(snapshots!!).hasSize(2)
-
-    var snapshotImage = snapshots[0]
-    var goldenImage = File(fixtureRoot, "src/test/resources/singleLine.png")
-    assertThat(snapshotImage).isSimilarTo(goldenImage).withDefaultThreshold()
-
-    snapshotImage = snapshots[1]
-    goldenImage = File(fixtureRoot, "src/test/resources/textviews.png")
-    assertThat(snapshotImage).isSimilarTo(goldenImage).withDefaultThreshold()
-  }
-
-  @Test
-  fun textAppearancesInCode() {
-    val fixtureRoot = File("src/test/projects/text-appearances-code")
-
-    gradleRunner
-      .withArguments("testDebug", "--stacktrace")
-      .runFixture(fixtureRoot) { build() }
-
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFiles()
-    assertThat(snapshots!!).hasLength(1)
-
-    val snapshotImage = snapshots[0]
-    val goldenImage = File(fixtureRoot, "src/test/resources/textappearances.png")
-    assertThat(snapshotImage).isSimilarTo(goldenImage).withDefaultThreshold()
-  }
-
-  @Test
-  fun textAppearancesInXml() {
-    val fixtureRoot = File("src/test/projects/text-appearances-xml")
-
-    gradleRunner
-      .withArguments("testDebug", "--stacktrace")
+      .withArguments("verifyPaparazziDebug", "--stacktrace")
       .runFixture(fixtureRoot) { build() }
-
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFiles()
-    assertThat(snapshots!!).hasLength(1)
-
-    val snapshotImage = snapshots[0]
-    val goldenImage = File(fixtureRoot, "src/test/resources/textappearances.png")
-    assertThat(snapshotImage).isSimilarTo(goldenImage).withDefaultThreshold()
   }
 
   @Test
-  fun verifyAaptAttrResourceParsingInCode() {
-    val fixtureRoot = File("src/test/projects/verify-aapt-code")
+  fun customFonts() {
+    val fixtureRoot = File("src/test/projects/custom-fonts")
 
     gradleRunner
-      .withArguments("testDebug", "--stacktrace")
+      .withArguments("verifyPaparazziDebug", "--stacktrace")
       .runFixture(fixtureRoot) { build() }
-
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFiles()
-    assertThat(snapshots!!).hasLength(1)
-
-    val snapshotImage = snapshots[0]
-    val goldenImage = File(fixtureRoot, "src/test/resources/card_chip.png")
-    assertThat(snapshotImage).isSimilarTo(goldenImage).withDefaultThreshold()
   }
 
   @Test
-  fun verifyAaptAttrResourceParsingInXml() {
-    val fixtureRoot = File("src/test/projects/verify-aapt-xml")
+  fun textAppearances() {
+    val fixtureRoot = File("src/test/projects/text-appearances")
 
     gradleRunner
-      .withArguments("testDebug", "--stacktrace")
+      .withArguments("verifyPaparazziDebug", "--stacktrace")
       .runFixture(fixtureRoot) { build() }
-
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFiles()
-    assertThat(snapshots!!).hasLength(1)
-
-    val snapshotImage = snapshots[0]
-    val goldenImage = File(fixtureRoot, "src/test/resources/card_chip.png")
-    assertThat(snapshotImage).isSimilarTo(goldenImage).withDefaultThreshold()
   }
 
   @Test
-  fun verifyAaptAttrResourceParsingInCompose() {
-    val fixtureRoot = File("src/test/projects/verify-aapt-compose")
+  fun verifyAaptAttrResourceParsing() {
+    val fixtureRoot = File("src/test/projects/verify-aapt")
 
     gradleRunner
-      .withArguments("testDebug", "--stacktrace")
+      .withArguments("verifyPaparazziDebug", "--stacktrace")
       .runFixture(fixtureRoot) { build() }
-
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFiles()
-    assertThat(snapshots!!).hasLength(1)
-
-    val snapshotImage = snapshots[0]
-    val goldenImage = File(fixtureRoot, "src/test/resources/compose_card_chip.png")
-    assertThat(snapshotImage).isSimilarTo(goldenImage).withDefaultThreshold()
   }
 
   @Test
@@ -1462,50 +1269,34 @@ class PaparazziPluginTest {
     val fixtureRoot = File("src/test/projects/nine-patch")
 
     gradleRunner
-      .withArguments("testDebug", "--stacktrace")
+      .withArguments("verifyPaparazziDebug", "--stacktrace")
       .runFixture(fixtureRoot) { build() }
-
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFiles()
-    assertThat(snapshots!!).hasLength(1)
-
-    val snapshotImage = snapshots[0]
-    val goldenImage = File(fixtureRoot, "src/test/resources/nine_patch.png")
-    assertThat(snapshotImage).isSimilarTo(goldenImage).withDefaultThreshold()
   }
 
   @Test
   fun transitiveResources() {
     val fixtureRoot = File("src/test/projects/transitive-resources")
-    val moduleRoot = File(fixtureRoot, "module")
 
     gradleRunner
-      .withArguments("module:testDebug", "--stacktrace")
+      .withArguments("module:verifyPaparazziDebug", "--stacktrace")
       .runFixture(fixtureRoot) { build() }
-
-    val snapshotsDir = File(moduleRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFiles()
-    assertThat(snapshots!!).hasLength(1)
-
-    val snapshotImage = snapshots[0]
-    val goldenImage = File(moduleRoot, "src/test/resources/five_bucks.png")
-    assertThat(snapshotImage).isSimilarTo(goldenImage).withDefaultThreshold()
   }
 
   @Test
   fun compose() {
     val fixtureRoot = File("src/test/projects/compose")
     gradleRunner
-      .withArguments("testDebug", "--stacktrace")
+      .withArguments("verifyPaparazziDebug", "--stacktrace")
       .runFixture(fixtureRoot) { build() }
+  }
 
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFiles()
-    assertThat(snapshots!!).hasLength(1)
+  @Test
+  fun composeLeaks() {
+    val fixtureRoot = File("src/test/projects/compose-leaks")
 
-    val snapshotImage = snapshots[0]
-    val goldenImage = File(fixtureRoot, "src/test/resources/compose_fonts.png")
-    assertThat(snapshotImage).isSimilarTo(goldenImage).withDefaultThreshold()
+    gradleRunner
+      .withArguments("testDebug", "--stacktrace")
+      .runFixture(fixtureRoot) { build() }
   }
 
   @Test
@@ -1533,37 +1324,16 @@ class PaparazziPluginTest {
   fun composeWear() {
     val fixtureRoot = File("src/test/projects/compose-wear")
     gradleRunner
-      .withArguments("testDebug", "--stacktrace")
+      .withArguments("verifyPaparazziDebug", "--stacktrace")
       .runFixture(fixtureRoot) { build() }
-
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFiles()
-    assertThat(snapshots!!).hasLength(1)
-
-    val snapshotImage = snapshots[0]
-    val goldenImage = File(fixtureRoot, "src/test/resources/compose_wear.png")
-    assertThat(snapshotImage).isSimilarTo(goldenImage).withDefaultThreshold()
   }
 
   @Test
   fun composeA11y() {
     val fixtureRoot = File("src/test/projects/compose-a11y")
     gradleRunner
-      .withArguments("testDebug", "--stacktrace")
+      .withArguments("verifyPaparazziDebug", "--stacktrace")
       .runFixture(fixtureRoot) { build() }
-
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFilesSorted()
-    assertThat(snapshots!!).hasSize(2)
-
-    var snapshotImage = snapshots[0]
-    var goldenImage = File(fixtureRoot, "src/test/resources/compose_a11y_clear_and_set_semantics.png")
-    assertThat(snapshotImage).isSimilarTo(goldenImage).withDefaultThreshold()
-    snapshotImage = snapshots[1]
-    goldenImage = File(fixtureRoot, "src/test/resources/compose_a11y.png")
-    assertThat(snapshotImage).isSimilarTo(goldenImage).withDefaultThreshold()
-    goldenImage = File(fixtureRoot, "src/test/resources/compose_a11y_change_hierarchy_order.png")
-    assertThat(snapshotImage).isSimilarTo(goldenImage).withDefaultThreshold()
   }
 
   @Test
@@ -1579,19 +1349,8 @@ class PaparazziPluginTest {
     val fixtureRoot = File("src/test/projects/update-paparazzi-config")
 
     gradleRunner
-      .withArguments("testDebug", "--stacktrace")
+      .withArguments("verifyPaparazziDebug", "--stacktrace")
       .runFixture(fixtureRoot) { build() }
-
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFilesSorted()
-    assertThat(snapshots!!).hasSize(2)
-
-    val pixel3SnapshotImage = snapshots[0]
-    val nexus7SnapshotImage = snapshots[1]
-    val pixel3GoldenImage = File(fixtureRoot, "src/test/resources/pixel_3_launch.png")
-    val nexus7GoldenImage = File(fixtureRoot, "src/test/resources/nexus_7_launch.png")
-    assertThat(pixel3SnapshotImage).isSimilarTo(pixel3GoldenImage).withDefaultThreshold()
-    assertThat(nexus7SnapshotImage).isSimilarTo(nexus7GoldenImage).withDefaultThreshold()
   }
 
   @Test
@@ -1599,23 +1358,8 @@ class PaparazziPluginTest {
     val fixtureRoot = File("src/test/projects/device-resolution")
 
     gradleRunner
-      .withArguments("testDebug", "--stacktrace")
+      .withArguments("verifyPaparazziDebug", "--stacktrace")
       .runFixture(fixtureRoot) { build() }
-
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFiles()?.sortedBy { it.lastModified() }
-    assertThat(snapshots!!).hasSize(2)
-
-    val defaultSnapshotImage = snapshots[0]
-    val deviceResolutionSnapshotImage = snapshots[1]
-    val defaultGoldenImage =
-      File(fixtureRoot, "src/test/resources/default_resolution.png")
-    val deviceResolutionGoldenImage =
-      File(fixtureRoot, "src/test/resources/full_resolution.png")
-    assertThat(defaultSnapshotImage).isSimilarTo(defaultGoldenImage)
-      .withDefaultThreshold()
-    assertThat(deviceResolutionSnapshotImage).isSimilarTo(deviceResolutionGoldenImage)
-      .withDefaultThreshold()
   }
 
   @Test
@@ -1623,19 +1367,8 @@ class PaparazziPluginTest {
     val fixtureRoot = File("src/test/projects/locale-qualifier")
 
     gradleRunner
-      .withArguments("testDebug", "--stacktrace")
+      .withArguments("verifyPaparazziDebug", "--stacktrace")
       .runFixture(fixtureRoot) { build() }
-
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFilesSorted()
-    assertThat(snapshots!!).hasSize(2)
-
-    val localeDefaultSnapshotImage = snapshots[0]
-    val localeEnGBSnapshotImage = snapshots[1]
-    val localeDefaultGoldenImage = File(fixtureRoot, "src/test/resources/locale_default.png")
-    val localeEnGBGoldenImage = File(fixtureRoot, "src/test/resources/locale_en_gb.png")
-    assertThat(localeDefaultSnapshotImage).isSimilarTo(localeDefaultGoldenImage).withDefaultThreshold()
-    assertThat(localeEnGBSnapshotImage).isSimilarTo(localeEnGBGoldenImage).withDefaultThreshold()
   }
 
   @Test
@@ -1643,59 +1376,17 @@ class PaparazziPluginTest {
     val fixtureRoot = File("src/test/projects/layout-direction")
 
     gradleRunner
-      .withArguments("testDebug", "--stacktrace")
-      .runFixture(fixtureRoot) { build() }
-
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFilesSorted()
-    assertThat(snapshots!!).hasSize(2)
-
-    val localeDefaultRtlSnapshotImage = snapshots[0]
-    val localeArSnapshotImage = snapshots[1]
-    val localeDefaultRtlGoldenImage = File(fixtureRoot, "src/test/resources/locale_default_rtl.png")
-    val localeArGoldenImage = File(fixtureRoot, "src/test/resources/locale_ar.png")
-    assertThat(localeDefaultRtlSnapshotImage).isSimilarTo(localeDefaultRtlGoldenImage).withDefaultThreshold()
-    assertThat(localeArSnapshotImage).isSimilarTo(localeArGoldenImage).withDefaultThreshold()
-  }
-
-  @Test
-  fun nightModeCompose() {
-    val fixtureRoot = File("src/test/projects/night-mode-compose")
-
-    gradleRunner
-      .withArguments("testDebug", "--stacktrace")
+      .withArguments("verifyPaparazziDebug", "--stacktrace")
       .runFixture(fixtureRoot) { build() }
-
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFilesSorted()
-    assertThat(snapshots!!).hasSize(2)
-
-    val lightModeSnapshotImage = snapshots[0]
-    val darkModeSnapshotImage = snapshots[1]
-    val lightModeGoldenImage = File(fixtureRoot, "src/test/resources/light_mode.png")
-    val darkModeGoldenImage = File(fixtureRoot, "src/test/resources/dark_mode.png")
-    assertThat(lightModeSnapshotImage).isSimilarTo(lightModeGoldenImage).withDefaultThreshold()
-    assertThat(darkModeSnapshotImage).isSimilarTo(darkModeGoldenImage).withDefaultThreshold()
   }
 
   @Test
-  fun nightModeXml() {
-    val fixtureRoot = File("src/test/projects/night-mode-xml")
+  fun nightMode() {
+    val fixtureRoot = File("src/test/projects/night-mode")
 
     gradleRunner
-      .withArguments("testDebug", "--stacktrace")
+      .withArguments("verifyPaparazziDebug", "--stacktrace")
       .runFixture(fixtureRoot) { build() }
-
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFilesSorted()
-    assertThat(snapshots!!).hasSize(2)
-
-    val lightModeSnapshotImage = snapshots[0]
-    val darkModeSnapshotImage = snapshots[1]
-    val lightModeGoldenImage = File(fixtureRoot, "src/test/resources/light_mode.png")
-    val darkModeGoldenImage = File(fixtureRoot, "src/test/resources/dark_mode.png")
-    assertThat(lightModeSnapshotImage).isSimilarTo(lightModeGoldenImage).withDefaultThreshold()
-    assertThat(darkModeSnapshotImage).isSimilarTo(darkModeGoldenImage).withDefaultThreshold()
   }
 
   @Test
@@ -1752,20 +1443,8 @@ class PaparazziPluginTest {
     val fixtureRoot = File("src/test/projects/verify-orientation")
 
     gradleRunner
-      .withArguments("testDebug", "--stacktrace")
+      .withArguments("verifyPaparazziDebug", "--stacktrace")
       .runFixture(fixtureRoot) { build() }
-
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFilesSorted()
-    assertThat(snapshots!!).hasSize(2)
-
-    val portraitSnapshotImage = snapshots[0]
-    val portraitGoldenImage = File(fixtureRoot, "src/test/resources/portrait_orientation.png")
-    assertThat(portraitSnapshotImage).isSimilarTo(portraitGoldenImage).withDefaultThreshold()
-
-    val landscapeSnapshotImage = snapshots[1]
-    val landscapeGoldenImage = File(fixtureRoot, "src/test/resources/landscape_orientation.png")
-    assertThat(landscapeSnapshotImage).isSimilarTo(landscapeGoldenImage).withDefaultThreshold()
   }
 
   @Test
@@ -1773,20 +1452,8 @@ class PaparazziPluginTest {
     val fixtureRoot = File("src/test/projects/verify-screen-round")
 
     gradleRunner
-      .withArguments("testDebug", "--stacktrace")
+      .withArguments("verifyPaparazziDebug", "--stacktrace")
       .runFixture(fixtureRoot) { build() }
-
-    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/debug/images")
-    val snapshots = snapshotsDir.listFilesSorted()
-    assertThat(snapshots!!).hasSize(2)
-
-    val roundSnapshot = snapshots[0]
-    val roundGoldenImage = File(fixtureRoot, "src/test/resources/round.png")
-    assertThat(roundSnapshot).isSimilarTo(roundGoldenImage).withDefaultThreshold()
-
-    val notRoundSnapshot = snapshots[1]
-    val notRoundGoldenImage = File(fixtureRoot, "src/test/resources/not_round.png")
-    assertThat(notRoundSnapshot).isSimilarTo(notRoundGoldenImage).withDefaultThreshold()
   }
 
   private fun File.loadConfig() = source().buffer().use { CONFIG_ADAPTER.fromJson(it)!! }
diff --git a/paparazzi-gradle-plugin/src/test/projects/appcompat-missing/src/test/java/app/cash/paparazzi/plugin/test/LaunchViewTest.kt b/paparazzi-gradle-plugin/src/test/projects/appcompat-missing/src/test/java/app/cash/paparazzi/plugin/test/LaunchViewTest.kt
index 407a87ec32..6b96dda64d 100644
--- a/paparazzi-gradle-plugin/src/test/projects/appcompat-missing/src/test/java/app/cash/paparazzi/plugin/test/LaunchViewTest.kt
+++ b/paparazzi-gradle-plugin/src/test/projects/appcompat-missing/src/test/java/app/cash/paparazzi/plugin/test/LaunchViewTest.kt
@@ -25,8 +25,8 @@ class LaunchViewTest {
   val paparazzi = Paparazzi()
 
   @Test
-  fun testViews() {
+  fun test() {
     val launch = paparazzi.inflate<LinearLayout>(R.layout.launch)
-    paparazzi.snapshot(launch, "launch")
+    paparazzi.snapshot(launch, "arrow_missing")
   }
 }
diff --git a/paparazzi-gradle-plugin/src/test/projects/appcompat-missing/src/test/resources/arrow_missing.png b/paparazzi-gradle-plugin/src/test/projects/appcompat-missing/src/test/snapshots/images/app.cash.paparazzi.plugin.test_LaunchViewTest_test_arrow_missing.png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/appcompat-missing/src/test/resources/arrow_missing.png
rename to paparazzi-gradle-plugin/src/test/projects/appcompat-missing/src/test/snapshots/images/app.cash.paparazzi.plugin.test_LaunchViewTest_test_arrow_missing.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/appcompat-present/src/test/java/app/cash/paparazzi/plugin/test/LaunchViewTest.kt b/paparazzi-gradle-plugin/src/test/projects/appcompat-present/src/test/java/app/cash/paparazzi/plugin/test/LaunchViewTest.kt
index 407a87ec32..6bd69ffc61 100644
--- a/paparazzi-gradle-plugin/src/test/projects/appcompat-present/src/test/java/app/cash/paparazzi/plugin/test/LaunchViewTest.kt
+++ b/paparazzi-gradle-plugin/src/test/projects/appcompat-present/src/test/java/app/cash/paparazzi/plugin/test/LaunchViewTest.kt
@@ -25,8 +25,8 @@ class LaunchViewTest {
   val paparazzi = Paparazzi()
 
   @Test
-  fun testViews() {
+  fun test() {
     val launch = paparazzi.inflate<LinearLayout>(R.layout.launch)
-    paparazzi.snapshot(launch, "launch")
+    paparazzi.snapshot(launch, "arrow_present")
   }
 }
diff --git a/paparazzi-gradle-plugin/src/test/projects/appcompat-present/src/test/resources/arrow_present.png b/paparazzi-gradle-plugin/src/test/projects/appcompat-present/src/test/snapshots/images/app.cash.paparazzi.plugin.test_LaunchViewTest_test_arrow_present.png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/appcompat-present/src/test/resources/arrow_present.png
rename to paparazzi-gradle-plugin/src/test/projects/appcompat-present/src/test/snapshots/images/app.cash.paparazzi.plugin.test_LaunchViewTest_test_arrow_present.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/compose-a11y/src/test/resources/compose_a11y.png b/paparazzi-gradle-plugin/src/test/projects/compose-a11y/src/test/snapshots/images/app.cash.paparazzi.plugin.test_ComposeA11yTest_mixed compose usage.png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/compose-a11y/src/test/resources/compose_a11y.png
rename to paparazzi-gradle-plugin/src/test/projects/compose-a11y/src/test/snapshots/images/app.cash.paparazzi.plugin.test_ComposeA11yTest_mixed compose usage.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/compose-a11y/src/test/resources/compose_a11y_change_hierarchy_order.png b/paparazzi-gradle-plugin/src/test/projects/compose-a11y/src/test/snapshots/images/app.cash.paparazzi.plugin.test_ComposeA11yTest_verify changing view hierarchy order doesn't change accessibility colors.png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/compose-a11y/src/test/resources/compose_a11y_change_hierarchy_order.png
rename to paparazzi-gradle-plugin/src/test/projects/compose-a11y/src/test/snapshots/images/app.cash.paparazzi.plugin.test_ComposeA11yTest_verify changing view hierarchy order doesn't change accessibility colors.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/compose-a11y/src/test/resources/compose_a11y_clear_and_set_semantics.png b/paparazzi-gradle-plugin/src/test/projects/compose-a11y/src/test/snapshots/images/app.cash.paparazzi.plugin.test_ComposeA11yTest_verify clear and set semantics.png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/compose-a11y/src/test/resources/compose_a11y_clear_and_set_semantics.png
rename to paparazzi-gradle-plugin/src/test/projects/compose-a11y/src/test/snapshots/images/app.cash.paparazzi.plugin.test_ComposeA11yTest_verify clear and set semantics.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-aapt-compose/build.gradle b/paparazzi-gradle-plugin/src/test/projects/compose-leaks/build.gradle
similarity index 99%
rename from paparazzi-gradle-plugin/src/test/projects/verify-aapt-compose/build.gradle
rename to paparazzi-gradle-plugin/src/test/projects/compose-leaks/build.gradle
index c6f1ab3e72..1b31a0e543 100644
--- a/paparazzi-gradle-plugin/src/test/projects/verify-aapt-compose/build.gradle
+++ b/paparazzi-gradle-plugin/src/test/projects/compose-leaks/build.gradle
@@ -27,4 +27,3 @@ dependencies {
   implementation libs.composeUi.material
 }
 
-
diff --git a/paparazzi-gradle-plugin/src/test/projects/compose-leaks/src/main/java/app/cash/paparazzi/plugin/test/HelloPaparazzi.kt b/paparazzi-gradle-plugin/src/test/projects/compose-leaks/src/main/java/app/cash/paparazzi/plugin/test/HelloPaparazzi.kt
new file mode 100644
index 0000000000..44044b8a42
--- /dev/null
+++ b/paparazzi-gradle-plugin/src/test/projects/compose-leaks/src/main/java/app/cash/paparazzi/plugin/test/HelloPaparazzi.kt
@@ -0,0 +1,48 @@
+package app.cash.paparazzi.plugin.test
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextDecoration
+
+@Composable
+fun HelloPaparazzi() {
+  val text = "Hello, Paparazzi"
+  Column(
+    Modifier
+      .background(Color.White)
+      .fillMaxSize()
+      .wrapContentSize()
+  ) {
+    Text(text)
+    Text(text, style = TextStyle(fontFamily = FontFamily.Cursive))
+    Text(
+      text = text,
+      style = TextStyle(textDecoration = TextDecoration.LineThrough)
+    )
+    Text(
+      text = text,
+      style = TextStyle(textDecoration = TextDecoration.Underline)
+    )
+    Text(
+      text = text,
+      style = TextStyle(
+        textDecoration = TextDecoration.combine(
+          listOf(
+            TextDecoration.Underline,
+            TextDecoration.LineThrough
+          )
+        ),
+        fontWeight = FontWeight.Bold
+      )
+    )
+  }
+}
diff --git a/paparazzi-gradle-plugin/src/test/projects/compose/src/test/java/app/cash/paparazzi/plugin/test/ComposeReferenceLeakTest.kt b/paparazzi-gradle-plugin/src/test/projects/compose-leaks/src/test/java/app/cash/paparazzi/plugin/test/ComposeReferenceLeakTest.kt
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/compose/src/test/java/app/cash/paparazzi/plugin/test/ComposeReferenceLeakTest.kt
rename to paparazzi-gradle-plugin/src/test/projects/compose-leaks/src/test/java/app/cash/paparazzi/plugin/test/ComposeReferenceLeakTest.kt
diff --git a/paparazzi-gradle-plugin/src/test/projects/compose/src/test/java/app/cash/paparazzi/plugin/test/LoggerLeakTest.kt b/paparazzi-gradle-plugin/src/test/projects/compose-leaks/src/test/java/app/cash/paparazzi/plugin/test/LoggerLeakTest.kt
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/compose/src/test/java/app/cash/paparazzi/plugin/test/LoggerLeakTest.kt
rename to paparazzi-gradle-plugin/src/test/projects/compose-leaks/src/test/java/app/cash/paparazzi/plugin/test/LoggerLeakTest.kt
diff --git a/paparazzi-gradle-plugin/src/test/projects/compose-wear/src/test/resources/compose_wear.png b/paparazzi-gradle-plugin/src/test/projects/compose-wear/src/test/snapshots/images/app.cash.paparazzi.plugin.test_ComposeTest_compose.png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/compose-wear/src/test/resources/compose_wear.png
rename to paparazzi-gradle-plugin/src/test/projects/compose-wear/src/test/snapshots/images/app.cash.paparazzi.plugin.test_ComposeTest_compose.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/compose/src/test/resources/compose_fonts.png b/paparazzi-gradle-plugin/src/test/projects/compose/src/test/snapshots/images/app.cash.paparazzi.plugin.test_ComposeTest_compose.png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/compose/src/test/resources/compose_fonts.png
rename to paparazzi-gradle-plugin/src/test/projects/compose/src/test/snapshots/images/app.cash.paparazzi.plugin.test_ComposeTest_compose.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/custom-fonts-xml/build.gradle b/paparazzi-gradle-plugin/src/test/projects/custom-fonts-xml/build.gradle
deleted file mode 100644
index 4c9847cd79..0000000000
--- a/paparazzi-gradle-plugin/src/test/projects/custom-fonts-xml/build.gradle
+++ /dev/null
@@ -1,25 +0,0 @@
-plugins {
-  id 'com.android.library'
-  id 'kotlin-android'
-  id 'app.cash.paparazzi'
-}
-
-android {
-  namespace 'app.cash.paparazzi.plugin.test'
-  compileSdk libs.versions.compileSdk.get() as int
-  defaultConfig {
-    minSdk libs.versions.minSdk.get() as int
-  }
-  compileOptions {
-    sourceCompatibility = libs.versions.javaTarget.get()
-    targetCompatibility = libs.versions.javaTarget.get()
-  }
-  kotlinOptions {
-    jvmTarget = libs.versions.javaTarget.get()
-  }
-}
-
-dependencies {
-  implementation libs.androidx.appcompat
-}
-
diff --git a/paparazzi-gradle-plugin/src/test/projects/custom-fonts-xml/src/main/res/font/cashmarket_medium.xml b/paparazzi-gradle-plugin/src/test/projects/custom-fonts-xml/src/main/res/font/cashmarket_medium.xml
deleted file mode 100755
index 640db2cdfa..0000000000
--- a/paparazzi-gradle-plugin/src/test/projects/custom-fonts-xml/src/main/res/font/cashmarket_medium.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<font-family
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:ignore="UnusedAttribute,UnusedResources"
-    >
-  <font
-      android:font="@font/cashmarket_medium_normal"
-      android:fontStyle="normal"
-      app:font="@font/cashmarket_medium_normal"
-      app:fontStyle="normal"
-      />
-  <font
-      android:font="@font/cashmarket_medium_italic"
-      android:fontStyle="italic"
-      app:font="@font/cashmarket_medium_italic"
-      app:fontStyle="italic"
-      />
-</font-family>
diff --git a/paparazzi-gradle-plugin/src/test/projects/custom-fonts-xml/src/main/res/font/cashmarket_medium_italic.ttf b/paparazzi-gradle-plugin/src/test/projects/custom-fonts-xml/src/main/res/font/cashmarket_medium_italic.ttf
deleted file mode 100755
index e27adc0ba0..0000000000
Binary files a/paparazzi-gradle-plugin/src/test/projects/custom-fonts-xml/src/main/res/font/cashmarket_medium_italic.ttf and /dev/null differ
diff --git a/paparazzi-gradle-plugin/src/test/projects/custom-fonts-xml/src/main/res/font/cashmarket_medium_normal.otf b/paparazzi-gradle-plugin/src/test/projects/custom-fonts-xml/src/main/res/font/cashmarket_medium_normal.otf
deleted file mode 100644
index 72ce91686e..0000000000
Binary files a/paparazzi-gradle-plugin/src/test/projects/custom-fonts-xml/src/main/res/font/cashmarket_medium_normal.otf and /dev/null differ
diff --git a/paparazzi-gradle-plugin/src/test/projects/custom-fonts-xml/src/test/java/app/cash/paparazzi/plugin/test/CustomFontsTest.kt b/paparazzi-gradle-plugin/src/test/projects/custom-fonts-xml/src/test/java/app/cash/paparazzi/plugin/test/CustomFontsTest.kt
deleted file mode 100644
index 6f677754ba..0000000000
--- a/paparazzi-gradle-plugin/src/test/projects/custom-fonts-xml/src/test/java/app/cash/paparazzi/plugin/test/CustomFontsTest.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2019 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package app.cash.paparazzi.plugin.test
-
-import android.view.View
-import app.cash.paparazzi.Paparazzi
-import org.junit.Rule
-import org.junit.Test
-
-class CustomFontsTest {
-  @get:Rule
-  val paparazzi = Paparazzi()
-
-  @Test
-  fun customFontInTextViewInXml() {
-    val view = paparazzi.inflate<View>(R.layout.textviews)
-    paparazzi.snapshot(view, "text in xml")
-  }
-}
diff --git a/paparazzi-gradle-plugin/src/test/projects/custom-fonts-code/build.gradle b/paparazzi-gradle-plugin/src/test/projects/custom-fonts/build.gradle
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/custom-fonts-code/build.gradle
rename to paparazzi-gradle-plugin/src/test/projects/custom-fonts/build.gradle
diff --git a/paparazzi-gradle-plugin/src/test/projects/custom-fonts-code/src/main/res/font/cashmarket_medium.xml b/paparazzi-gradle-plugin/src/test/projects/custom-fonts/src/main/res/font/cashmarket_medium.xml
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/custom-fonts-code/src/main/res/font/cashmarket_medium.xml
rename to paparazzi-gradle-plugin/src/test/projects/custom-fonts/src/main/res/font/cashmarket_medium.xml
diff --git a/paparazzi-gradle-plugin/src/test/projects/custom-fonts-code/src/main/res/font/cashmarket_medium_italic.ttf b/paparazzi-gradle-plugin/src/test/projects/custom-fonts/src/main/res/font/cashmarket_medium_italic.ttf
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/custom-fonts-code/src/main/res/font/cashmarket_medium_italic.ttf
rename to paparazzi-gradle-plugin/src/test/projects/custom-fonts/src/main/res/font/cashmarket_medium_italic.ttf
diff --git a/paparazzi-gradle-plugin/src/test/projects/custom-fonts-code/src/main/res/font/cashmarket_medium_normal.otf b/paparazzi-gradle-plugin/src/test/projects/custom-fonts/src/main/res/font/cashmarket_medium_normal.otf
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/custom-fonts-code/src/main/res/font/cashmarket_medium_normal.otf
rename to paparazzi-gradle-plugin/src/test/projects/custom-fonts/src/main/res/font/cashmarket_medium_normal.otf
diff --git a/paparazzi-gradle-plugin/src/test/projects/custom-fonts-xml/src/main/res/layout/textviews.xml b/paparazzi-gradle-plugin/src/test/projects/custom-fonts/src/main/res/layout/textviews.xml
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/custom-fonts-xml/src/main/res/layout/textviews.xml
rename to paparazzi-gradle-plugin/src/test/projects/custom-fonts/src/main/res/layout/textviews.xml
diff --git a/paparazzi-gradle-plugin/src/test/projects/custom-fonts-code/src/test/java/app/cash/paparazzi/plugin/test/CustomFontsTest.kt b/paparazzi-gradle-plugin/src/test/projects/custom-fonts/src/test/java/app/cash/paparazzi/plugin/test/CustomFontsTest.kt
similarity index 93%
rename from paparazzi-gradle-plugin/src/test/projects/custom-fonts-code/src/test/java/app/cash/paparazzi/plugin/test/CustomFontsTest.kt
rename to paparazzi-gradle-plugin/src/test/projects/custom-fonts/src/test/java/app/cash/paparazzi/plugin/test/CustomFontsTest.kt
index 2768e46284..3faca3c00d 100644
--- a/paparazzi-gradle-plugin/src/test/projects/custom-fonts-code/src/test/java/app/cash/paparazzi/plugin/test/CustomFontsTest.kt
+++ b/paparazzi-gradle-plugin/src/test/projects/custom-fonts/src/test/java/app/cash/paparazzi/plugin/test/CustomFontsTest.kt
@@ -18,6 +18,7 @@ package app.cash.paparazzi.plugin.test
 import android.content.Context
 import android.graphics.Typeface
 import android.view.Gravity.CENTER
+import android.view.View
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.LinearLayout
@@ -35,7 +36,7 @@ class CustomFontsTest {
   val paparazzi = Paparazzi()
 
   @Test
-  fun customFontInTextViewInCode() {
+  fun inCode() {
     val context = paparazzi.context
 
     val root = LinearLayout(context).apply {
@@ -74,7 +75,13 @@ class CustomFontsTest {
       )
     }
 
-    paparazzi.snapshot(root, "text in code")
+    paparazzi.snapshot(root)
+  }
+
+  @Test
+  fun inXml() {
+    val view = paparazzi.inflate<View>(R.layout.textviews)
+    paparazzi.snapshot(view)
   }
 
   @Test
@@ -89,7 +96,7 @@ class CustomFontsTest {
         gravity = CENTER
       }
     }
-    paparazzi.snapshot(text, "singleLine")
+    paparazzi.snapshot(text)
   }
 
   private fun createTextView(context: Context) =
diff --git a/paparazzi-gradle-plugin/src/test/projects/custom-fonts-code/src/test/resources/textviews.png b/paparazzi-gradle-plugin/src/test/projects/custom-fonts/src/test/snapshots/images/app.cash.paparazzi.plugin.test_CustomFontsTest_inCode.png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/custom-fonts-code/src/test/resources/textviews.png
rename to paparazzi-gradle-plugin/src/test/projects/custom-fonts/src/test/snapshots/images/app.cash.paparazzi.plugin.test_CustomFontsTest_inCode.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/custom-fonts-xml/src/test/resources/textviews.png b/paparazzi-gradle-plugin/src/test/projects/custom-fonts/src/test/snapshots/images/app.cash.paparazzi.plugin.test_CustomFontsTest_inXml.png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/custom-fonts-xml/src/test/resources/textviews.png
rename to paparazzi-gradle-plugin/src/test/projects/custom-fonts/src/test/snapshots/images/app.cash.paparazzi.plugin.test_CustomFontsTest_inXml.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/custom-fonts-code/src/test/resources/singleLine.png b/paparazzi-gradle-plugin/src/test/projects/custom-fonts/src/test/snapshots/images/app.cash.paparazzi.plugin.test_CustomFontsTest_singleLine.png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/custom-fonts-code/src/test/resources/singleLine.png
rename to paparazzi-gradle-plugin/src/test/projects/custom-fonts/src/test/snapshots/images/app.cash.paparazzi.plugin.test_CustomFontsTest_singleLine.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/device-resolution/src/test/resources/default_resolution.png b/paparazzi-gradle-plugin/src/test/projects/device-resolution/src/test/snapshots/images/app.cash.paparazzi.plugin.test_DeviceResolutionTest_deviceResolution[false].png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/device-resolution/src/test/resources/default_resolution.png
rename to paparazzi-gradle-plugin/src/test/projects/device-resolution/src/test/snapshots/images/app.cash.paparazzi.plugin.test_DeviceResolutionTest_deviceResolution[false].png
diff --git a/paparazzi-gradle-plugin/src/test/projects/device-resolution/src/test/resources/full_resolution.png b/paparazzi-gradle-plugin/src/test/projects/device-resolution/src/test/snapshots/images/app.cash.paparazzi.plugin.test_DeviceResolutionTest_deviceResolution[true].png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/device-resolution/src/test/resources/full_resolution.png
rename to paparazzi-gradle-plugin/src/test/projects/device-resolution/src/test/snapshots/images/app.cash.paparazzi.plugin.test_DeviceResolutionTest_deviceResolution[true].png
diff --git a/paparazzi-gradle-plugin/src/test/projects/layout-direction/src/test/resources/locale_ar.png b/paparazzi-gradle-plugin/src/test/projects/layout-direction/src/test/snapshots/images/app.cash.paparazzi.plugin.test_LayoutDirectionTest_layoutDirection[AR].png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/layout-direction/src/test/resources/locale_ar.png
rename to paparazzi-gradle-plugin/src/test/projects/layout-direction/src/test/snapshots/images/app.cash.paparazzi.plugin.test_LayoutDirectionTest_layoutDirection[AR].png
diff --git a/paparazzi-gradle-plugin/src/test/projects/layout-direction/src/test/resources/locale_default_rtl.png b/paparazzi-gradle-plugin/src/test/projects/layout-direction/src/test/snapshots/images/app.cash.paparazzi.plugin.test_LayoutDirectionTest_layoutDirection[DefaultRtl].png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/layout-direction/src/test/resources/locale_default_rtl.png
rename to paparazzi-gradle-plugin/src/test/projects/layout-direction/src/test/snapshots/images/app.cash.paparazzi.plugin.test_LayoutDirectionTest_layoutDirection[DefaultRtl].png
diff --git a/paparazzi-gradle-plugin/src/test/projects/locale-qualifier/src/test/resources/locale_default.png b/paparazzi-gradle-plugin/src/test/projects/locale-qualifier/src/test/snapshots/images/app.cash.paparazzi.plugin.test_LocaleQualifierTest_locale[Default].png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/locale-qualifier/src/test/resources/locale_default.png
rename to paparazzi-gradle-plugin/src/test/projects/locale-qualifier/src/test/snapshots/images/app.cash.paparazzi.plugin.test_LocaleQualifierTest_locale[Default].png
diff --git a/paparazzi-gradle-plugin/src/test/projects/locale-qualifier/src/test/resources/locale_en_gb.png b/paparazzi-gradle-plugin/src/test/projects/locale-qualifier/src/test/snapshots/images/app.cash.paparazzi.plugin.test_LocaleQualifierTest_locale[GB].png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/locale-qualifier/src/test/resources/locale_en_gb.png
rename to paparazzi-gradle-plugin/src/test/projects/locale-qualifier/src/test/snapshots/images/app.cash.paparazzi.plugin.test_LocaleQualifierTest_locale[GB].png
diff --git a/paparazzi-gradle-plugin/src/test/projects/night-mode-compose/src/test/java/app/cash/paparazzi/plugin/test/NightModeTest.kt b/paparazzi-gradle-plugin/src/test/projects/night-mode-compose/src/test/java/app/cash/paparazzi/plugin/test/NightModeTest.kt
deleted file mode 100644
index 4e2776c445..0000000000
--- a/paparazzi-gradle-plugin/src/test/projects/night-mode-compose/src/test/java/app/cash/paparazzi/plugin/test/NightModeTest.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package app.cash.paparazzi.plugin.test
-
-import app.cash.paparazzi.DeviceConfig
-import app.cash.paparazzi.Paparazzi
-import com.android.resources.NightMode
-import com.google.testing.junit.testparameterinjector.TestParameter
-import com.google.testing.junit.testparameterinjector.TestParameterInjector
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(TestParameterInjector::class)
-class NightModeTest(
-  @TestParameter nightMode: NightMode
-) {
-  @get:Rule
-  val paparazzi = Paparazzi(
-    deviceConfig = DeviceConfig.NEXUS_5.copy(nightMode = nightMode)
-  )
-
-  @Test
-  fun compose() {
-    paparazzi.snapshot { LightDark() }
-  }
-}
diff --git a/paparazzi-gradle-plugin/src/test/projects/night-mode-xml/src/test/resources/dark_mode.png b/paparazzi-gradle-plugin/src/test/projects/night-mode-xml/src/test/resources/dark_mode.png
deleted file mode 100644
index fd3458c2d5..0000000000
Binary files a/paparazzi-gradle-plugin/src/test/projects/night-mode-xml/src/test/resources/dark_mode.png and /dev/null differ
diff --git a/paparazzi-gradle-plugin/src/test/projects/night-mode-xml/src/test/resources/light_mode.png b/paparazzi-gradle-plugin/src/test/projects/night-mode-xml/src/test/resources/light_mode.png
deleted file mode 100644
index 8f1ddca12d..0000000000
Binary files a/paparazzi-gradle-plugin/src/test/projects/night-mode-xml/src/test/resources/light_mode.png and /dev/null differ
diff --git a/paparazzi-gradle-plugin/src/test/projects/night-mode-compose/build.gradle b/paparazzi-gradle-plugin/src/test/projects/night-mode/build.gradle
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/night-mode-compose/build.gradle
rename to paparazzi-gradle-plugin/src/test/projects/night-mode/build.gradle
diff --git a/paparazzi-gradle-plugin/src/test/projects/night-mode-compose/src/main/java/app/cash/paparazzi/plugin/test/LightDark.kt b/paparazzi-gradle-plugin/src/test/projects/night-mode/src/main/java/app/cash/paparazzi/plugin/test/LightDark.kt
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/night-mode-compose/src/main/java/app/cash/paparazzi/plugin/test/LightDark.kt
rename to paparazzi-gradle-plugin/src/test/projects/night-mode/src/main/java/app/cash/paparazzi/plugin/test/LightDark.kt
diff --git a/paparazzi-gradle-plugin/src/test/projects/night-mode-xml/src/main/res/layout-night/layout.xml b/paparazzi-gradle-plugin/src/test/projects/night-mode/src/main/res/layout-night/layout.xml
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/night-mode-xml/src/main/res/layout-night/layout.xml
rename to paparazzi-gradle-plugin/src/test/projects/night-mode/src/main/res/layout-night/layout.xml
diff --git a/paparazzi-gradle-plugin/src/test/projects/night-mode-xml/src/main/res/layout/layout.xml b/paparazzi-gradle-plugin/src/test/projects/night-mode/src/main/res/layout/layout.xml
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/night-mode-xml/src/main/res/layout/layout.xml
rename to paparazzi-gradle-plugin/src/test/projects/night-mode/src/main/res/layout/layout.xml
diff --git a/paparazzi-gradle-plugin/src/test/projects/night-mode-xml/src/test/java/app/cash/paparazzi/plugin/test/NightModeTest.kt b/paparazzi-gradle-plugin/src/test/projects/night-mode/src/test/java/app/cash/paparazzi/plugin/test/NightModeTest.kt
similarity index 90%
rename from paparazzi-gradle-plugin/src/test/projects/night-mode-xml/src/test/java/app/cash/paparazzi/plugin/test/NightModeTest.kt
rename to paparazzi-gradle-plugin/src/test/projects/night-mode/src/test/java/app/cash/paparazzi/plugin/test/NightModeTest.kt
index 009481bacd..15ffc27bd3 100644
--- a/paparazzi-gradle-plugin/src/test/projects/night-mode-xml/src/test/java/app/cash/paparazzi/plugin/test/NightModeTest.kt
+++ b/paparazzi-gradle-plugin/src/test/projects/night-mode/src/test/java/app/cash/paparazzi/plugin/test/NightModeTest.kt
@@ -22,4 +22,9 @@ class NightModeTest(
   fun xml() {
     paparazzi.snapshot(paparazzi.inflate(R.layout.layout))
   }
+
+  @Test
+  fun compose() {
+    paparazzi.snapshot { LightDark() }
+  }
 }
diff --git a/paparazzi-gradle-plugin/src/test/projects/night-mode-compose/src/test/resources/dark_mode.png b/paparazzi-gradle-plugin/src/test/projects/night-mode/src/test/snapshots/images/app.cash.paparazzi.plugin.test_NightModeTest_compose[NIGHT].png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/night-mode-compose/src/test/resources/dark_mode.png
rename to paparazzi-gradle-plugin/src/test/projects/night-mode/src/test/snapshots/images/app.cash.paparazzi.plugin.test_NightModeTest_compose[NIGHT].png
diff --git a/paparazzi-gradle-plugin/src/test/projects/night-mode-compose/src/test/resources/light_mode.png b/paparazzi-gradle-plugin/src/test/projects/night-mode/src/test/snapshots/images/app.cash.paparazzi.plugin.test_NightModeTest_compose[NOTNIGHT].png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/night-mode-compose/src/test/resources/light_mode.png
rename to paparazzi-gradle-plugin/src/test/projects/night-mode/src/test/snapshots/images/app.cash.paparazzi.plugin.test_NightModeTest_compose[NOTNIGHT].png
diff --git a/paparazzi-gradle-plugin/src/test/projects/night-mode/src/test/snapshots/images/app.cash.paparazzi.plugin.test_NightModeTest_xml[NIGHT].png b/paparazzi-gradle-plugin/src/test/projects/night-mode/src/test/snapshots/images/app.cash.paparazzi.plugin.test_NightModeTest_xml[NIGHT].png
new file mode 100644
index 0000000000..033d521146
Binary files /dev/null and b/paparazzi-gradle-plugin/src/test/projects/night-mode/src/test/snapshots/images/app.cash.paparazzi.plugin.test_NightModeTest_xml[NIGHT].png differ
diff --git a/paparazzi-gradle-plugin/src/test/projects/night-mode/src/test/snapshots/images/app.cash.paparazzi.plugin.test_NightModeTest_xml[NOTNIGHT].png b/paparazzi-gradle-plugin/src/test/projects/night-mode/src/test/snapshots/images/app.cash.paparazzi.plugin.test_NightModeTest_xml[NOTNIGHT].png
new file mode 100644
index 0000000000..4d5b0a74fe
Binary files /dev/null and b/paparazzi-gradle-plugin/src/test/projects/night-mode/src/test/snapshots/images/app.cash.paparazzi.plugin.test_NightModeTest_xml[NOTNIGHT].png differ
diff --git a/paparazzi-gradle-plugin/src/test/projects/nine-patch/src/test/resources/nine_patch.png b/paparazzi-gradle-plugin/src/test/projects/nine-patch/src/test/snapshots/images/app.cash.paparazzi.plugin.test_NinePatchTest_ninePatch.png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/nine-patch/src/test/resources/nine_patch.png
rename to paparazzi-gradle-plugin/src/test/projects/nine-patch/src/test/snapshots/images/app.cash.paparazzi.plugin.test_NinePatchTest_ninePatch.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/supports-application-modules/src/test/resources/launch.png b/paparazzi-gradle-plugin/src/test/projects/supports-application-modules/src/test/snapshots/images/app.cash.paparazzi.plugin.test_LaunchViewTest_testViews_launch.png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/supports-application-modules/src/test/resources/launch.png
rename to paparazzi-gradle-plugin/src/test/projects/supports-application-modules/src/test/snapshots/images/app.cash.paparazzi.plugin.test_LaunchViewTest_testViews_launch.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/supports-dynamic-feature-modules/dynamic_feature/src/test/resources/launch.png b/paparazzi-gradle-plugin/src/test/projects/supports-dynamic-feature-modules/dynamic_feature/src/test/snapshots/images/app.cash.paparazzi.plugin.test_LaunchViewTest_testViews_launch.png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/supports-dynamic-feature-modules/dynamic_feature/src/test/resources/launch.png
rename to paparazzi-gradle-plugin/src/test/projects/supports-dynamic-feature-modules/dynamic_feature/src/test/snapshots/images/app.cash.paparazzi.plugin.test_LaunchViewTest_testViews_launch.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/text-appearances-xml/build.gradle b/paparazzi-gradle-plugin/src/test/projects/text-appearances-xml/build.gradle
deleted file mode 100644
index fef0312e73..0000000000
--- a/paparazzi-gradle-plugin/src/test/projects/text-appearances-xml/build.gradle
+++ /dev/null
@@ -1,21 +0,0 @@
-plugins {
-  id 'com.android.library'
-  id 'kotlin-android'
-  id 'app.cash.paparazzi'
-}
-
-android {
-  namespace 'app.cash.paparazzi.plugin.test'
-  compileSdk libs.versions.compileSdk.get() as int
-  defaultConfig {
-    minSdk libs.versions.minSdk.get() as int
-  }
-  compileOptions {
-    sourceCompatibility = libs.versions.javaTarget.get()
-    targetCompatibility = libs.versions.javaTarget.get()
-  }
-  kotlinOptions {
-    jvmTarget = libs.versions.javaTarget.get()
-  }
-}
-
diff --git a/paparazzi-gradle-plugin/src/test/projects/text-appearances-xml/src/main/res/values/colors.xml b/paparazzi-gradle-plugin/src/test/projects/text-appearances-xml/src/main/res/values/colors.xml
deleted file mode 100644
index c42933e15d..0000000000
--- a/paparazzi-gradle-plugin/src/test/projects/text-appearances-xml/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <color name="keypadGreen">#00D015</color>
-</resources>
diff --git a/paparazzi-gradle-plugin/src/test/projects/text-appearances-xml/src/main/res/values/styles.xml b/paparazzi-gradle-plugin/src/test/projects/text-appearances-xml/src/main/res/values/styles.xml
deleted file mode 100644
index 2cb15baba3..0000000000
--- a/paparazzi-gradle-plugin/src/test/projects/text-appearances-xml/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <!-- Empty style for when you don't want a parent. -->
-  <style name="None" />
-
-  <style name="TextAppearance.Title" parent="None">
-    <item name="android:letterSpacing">0.01</item>
-    <item name="android:textSize">24sp</item>
-    <item name="android:textColor">@color/keypadGreen</item>
-  </style>
-</resources>
diff --git a/paparazzi-gradle-plugin/src/test/projects/text-appearances-xml/src/test/java/app/cash/paparazzi/plugin/test/TextAppearanceTest.kt b/paparazzi-gradle-plugin/src/test/projects/text-appearances-xml/src/test/java/app/cash/paparazzi/plugin/test/TextAppearanceTest.kt
deleted file mode 100644
index 13530e17cf..0000000000
--- a/paparazzi-gradle-plugin/src/test/projects/text-appearances-xml/src/test/java/app/cash/paparazzi/plugin/test/TextAppearanceTest.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2020 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package app.cash.paparazzi.plugin.test
-
-import android.widget.LinearLayout
-import app.cash.paparazzi.Paparazzi
-import org.junit.Rule
-import org.junit.Test
-
-class TextAppearanceTest {
-  @get:Rule
-  val paparazzi = Paparazzi()
-
-  @Test
-  fun verify() {
-    val view = paparazzi.inflate<LinearLayout>(R.layout.text_appearance_test)
-    paparazzi.snapshot(view)
-  }
-}
diff --git a/paparazzi-gradle-plugin/src/test/projects/text-appearances-code/build.gradle b/paparazzi-gradle-plugin/src/test/projects/text-appearances/build.gradle
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/text-appearances-code/build.gradle
rename to paparazzi-gradle-plugin/src/test/projects/text-appearances/build.gradle
diff --git a/paparazzi-gradle-plugin/src/test/projects/text-appearances-xml/src/main/res/layout/text_appearance_test.xml b/paparazzi-gradle-plugin/src/test/projects/text-appearances/src/main/res/layout/text_appearance_test.xml
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/text-appearances-xml/src/main/res/layout/text_appearance_test.xml
rename to paparazzi-gradle-plugin/src/test/projects/text-appearances/src/main/res/layout/text_appearance_test.xml
diff --git a/paparazzi-gradle-plugin/src/test/projects/text-appearances-code/src/main/res/values/colors.xml b/paparazzi-gradle-plugin/src/test/projects/text-appearances/src/main/res/values/colors.xml
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/text-appearances-code/src/main/res/values/colors.xml
rename to paparazzi-gradle-plugin/src/test/projects/text-appearances/src/main/res/values/colors.xml
diff --git a/paparazzi-gradle-plugin/src/test/projects/text-appearances-code/src/main/res/values/styles.xml b/paparazzi-gradle-plugin/src/test/projects/text-appearances/src/main/res/values/styles.xml
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/text-appearances-code/src/main/res/values/styles.xml
rename to paparazzi-gradle-plugin/src/test/projects/text-appearances/src/main/res/values/styles.xml
diff --git a/paparazzi-gradle-plugin/src/test/projects/text-appearances-code/src/test/java/app/cash/paparazzi/plugin/test/TextAppearanceTest.kt b/paparazzi-gradle-plugin/src/test/projects/text-appearances/src/test/java/app/cash/paparazzi/plugin/test/TextAppearanceTest.kt
similarity index 92%
rename from paparazzi-gradle-plugin/src/test/projects/text-appearances-code/src/test/java/app/cash/paparazzi/plugin/test/TextAppearanceTest.kt
rename to paparazzi-gradle-plugin/src/test/projects/text-appearances/src/test/java/app/cash/paparazzi/plugin/test/TextAppearanceTest.kt
index 09b1123971..d1d783569e 100644
--- a/paparazzi-gradle-plugin/src/test/projects/text-appearances-code/src/test/java/app/cash/paparazzi/plugin/test/TextAppearanceTest.kt
+++ b/paparazzi-gradle-plugin/src/test/projects/text-appearances/src/test/java/app/cash/paparazzi/plugin/test/TextAppearanceTest.kt
@@ -31,7 +31,7 @@ class TextAppearanceTest {
   val paparazzi = Paparazzi()
 
   @Test
-  fun verify() {
+  fun inCode() {
     val context = paparazzi.context
     val view = LinearLayout(context).apply {
       orientation = LinearLayout.VERTICAL
@@ -54,6 +54,12 @@ class TextAppearanceTest {
     paparazzi.snapshot(view)
   }
 
+  @Test
+  fun inXml() {
+    val view = paparazzi.inflate<LinearLayout>(R.layout.text_appearance_test)
+    paparazzi.snapshot(view)
+  }
+
   private fun createTextView(context: Context) =
     TextView(context, null, 0).apply {
       layoutParams = LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT)
diff --git a/paparazzi-gradle-plugin/src/test/projects/text-appearances-code/src/test/resources/textappearances.png b/paparazzi-gradle-plugin/src/test/projects/text-appearances/src/test/snapshots/images/app.cash.paparazzi.plugin.test_TextAppearanceTest_inCode.png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/text-appearances-code/src/test/resources/textappearances.png
rename to paparazzi-gradle-plugin/src/test/projects/text-appearances/src/test/snapshots/images/app.cash.paparazzi.plugin.test_TextAppearanceTest_inCode.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/text-appearances-xml/src/test/resources/textappearances.png b/paparazzi-gradle-plugin/src/test/projects/text-appearances/src/test/snapshots/images/app.cash.paparazzi.plugin.test_TextAppearanceTest_inXml.png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/text-appearances-xml/src/test/resources/textappearances.png
rename to paparazzi-gradle-plugin/src/test/projects/text-appearances/src/test/snapshots/images/app.cash.paparazzi.plugin.test_TextAppearanceTest_inXml.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/transitive-resources/module/src/test/java/app/cash/paparazzi/plugin/test/AmountViewTest.kt b/paparazzi-gradle-plugin/src/test/projects/transitive-resources/module/src/test/java/app/cash/paparazzi/plugin/test/AmountViewTest.kt
index a5fe65bd46..2cfa4f5ce2 100644
--- a/paparazzi-gradle-plugin/src/test/projects/transitive-resources/module/src/test/java/app/cash/paparazzi/plugin/test/AmountViewTest.kt
+++ b/paparazzi-gradle-plugin/src/test/projects/transitive-resources/module/src/test/java/app/cash/paparazzi/plugin/test/AmountViewTest.kt
@@ -24,8 +24,8 @@ class AmountViewTest {
   val paparazzi = Paparazzi()
 
   @Test
-  fun testViews() {
+  fun amount() {
     val amount = AmountView(paparazzi.context)
-    paparazzi.snapshot(amount, "amount")
+    paparazzi.snapshot(amount, "five_bucks")
   }
 }
diff --git a/paparazzi-gradle-plugin/src/test/projects/transitive-resources/module/src/test/resources/five_bucks.png b/paparazzi-gradle-plugin/src/test/projects/transitive-resources/module/src/test/snapshots/images/app.cash.paparazzi.plugin.test_AmountViewTest_amount_five_bucks.png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/transitive-resources/module/src/test/resources/five_bucks.png
rename to paparazzi-gradle-plugin/src/test/projects/transitive-resources/module/src/test/snapshots/images/app.cash.paparazzi.plugin.test_AmountViewTest_amount_five_bucks.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/update-paparazzi-config/src/test/resources/nexus_7_launch.png b/paparazzi-gradle-plugin/src/test/projects/update-paparazzi-config/src/test/snapshots/images/app.cash.paparazzi.plugin.test_LaunchViewTest_updatingConfigUpdatesResources_nexus7.png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/update-paparazzi-config/src/test/resources/nexus_7_launch.png
rename to paparazzi-gradle-plugin/src/test/projects/update-paparazzi-config/src/test/snapshots/images/app.cash.paparazzi.plugin.test_LaunchViewTest_updatingConfigUpdatesResources_nexus7.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/update-paparazzi-config/src/test/resources/pixel_3_launch.png b/paparazzi-gradle-plugin/src/test/projects/update-paparazzi-config/src/test/snapshots/images/app.cash.paparazzi.plugin.test_LaunchViewTest_updatingConfigUpdatesResources_pixel3.png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/update-paparazzi-config/src/test/resources/pixel_3_launch.png
rename to paparazzi-gradle-plugin/src/test/projects/update-paparazzi-config/src/test/snapshots/images/app.cash.paparazzi.plugin.test_LaunchViewTest_updatingConfigUpdatesResources_pixel3.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-aapt-code/build.gradle b/paparazzi-gradle-plugin/src/test/projects/verify-aapt-code/build.gradle
deleted file mode 100644
index d95de55f1b..0000000000
--- a/paparazzi-gradle-plugin/src/test/projects/verify-aapt-code/build.gradle
+++ /dev/null
@@ -1,26 +0,0 @@
-plugins {
-  id 'com.android.library'
-  id 'kotlin-android'
-  id 'app.cash.paparazzi'
-}
-
-android {
-  namespace 'app.cash.paparazzi.plugin.test'
-  compileSdk libs.versions.compileSdk.get() as int
-  defaultConfig {
-    minSdk libs.versions.minSdk.get() as int
-    vectorDrawables.useSupportLibrary = true
-  }
-  compileOptions {
-    sourceCompatibility = libs.versions.javaTarget.get()
-    targetCompatibility = libs.versions.javaTarget.get()
-  }
-  kotlinOptions {
-    jvmTarget = libs.versions.javaTarget.get()
-  }
-}
-
-dependencies {
-  implementation libs.androidx.appcompat
-}
-
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-aapt-compose/src/main/res/drawable/card_chip.xml b/paparazzi-gradle-plugin/src/test/projects/verify-aapt-compose/src/main/res/drawable/card_chip.xml
deleted file mode 100644
index a9cb398978..0000000000
--- a/paparazzi-gradle-plugin/src/test/projects/verify-aapt-compose/src/main/res/drawable/card_chip.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--Copyright Square, Inc.-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:width="42dp" android:height="34dp" android:viewportWidth="42" android:viewportHeight="34">
-    <path android:pathData="M36.795 0H5.205C2.333 0 0 2.384 0 5.318v22.374c0 2.934 2.333 5.318 5.205 5.318h31.59c2.872 0 5.205-2.384 5.205-5.318V5.318C41.955 2.384 39.622 0 36.795 0z" android:fillColor="#666666"/>
-    <group>
-        <clip-path android:pathData="M0.314 21.549h11.981c0.404 0 0.808 0.183 1.122 0.504 1.48 1.559 3.5 2.338 6.058 2.338h0.224c2.378 0 3.814-0.825 3.814-2.109 0-1.192-1.211-1.742-4.711-3.072-3.097-1.146-7.18-3.163-7.45-7.748H0.27v0.459h0.404v9.17H0.27v0.458h0.045zm20.866 7.977c5.519-0.504 8.93-3.53 8.93-7.977 0-4.31-3.994-6.281-7.898-7.611-2.02-0.78-3.5-1.421-4.128-2.476h-6.058c0.27 4.172 4.083 6.052 7 7.107 3.32 1.237 5.115 1.97 5.115 3.713 0 1.742-1.705 2.797-4.487 2.797H19.43c-2.737 0-4.936-0.871-6.507-2.568-0.18-0.183-0.403-0.275-0.628-0.275H0.27v0.459h0.403v4.997c0 1.238 0.494 2.384 1.257 3.21L1.705 31.13l0.314 0.32 0.27-0.274c0.807 0.687 1.795 1.1 2.916 1.1h9.02l0.493-2.568c0.045-0.137-0.045-0.229-0.18-0.275-1.704-0.504-3.275-1.33-4.666-2.475-0.134-0.138-0.18-0.321-0.045-0.459 0.135-0.137 0.314-0.183 0.449-0.046 1.346 1.055 2.827 1.88 4.442 2.338 0.449 0.138 0.718 0.596 0.629 1.055l-0.45 2.43h5.026l0.45-2.063c0.089-0.367 0.403-0.642 0.807-0.688zM0.314 10.774h10.994c0.135-5.364 4.801-7.61 9.154-7.931 0.09-0.046 0.18-0.092 0.18-0.23L21 0.644H5.205c-1.121 0-2.109 0.412-2.916 1.1l-0.27-0.23L1.705 1.88 1.93 2.11C1.167 2.934 0.673 4.08 0.673 5.318v4.997H0.27v0.458h0.045zm41.327 11.417H30.738c-0.315 4.447-3.904 7.518-9.513 7.977-0.09 0-0.18 0.092-0.225 0.183l-0.404 1.926H36.75c1.122 0 2.11-0.413 2.917-1.1l0.27 0.275 0.313-0.321-0.224-0.23c0.808-0.825 1.301-1.97 1.301-3.209v-4.997h0.36L41.64 22.19zm-0.314-11.875V5.319c0-1.238-0.493-2.385-1.301-3.21L40.25 1.88l-0.314-0.367-0.224 0.23c-0.808-0.688-1.795-1.1-2.917-1.1h-9.333l-0.539 2.75c-0.044 0.092 0.045 0.23 0.135 0.275 1.212 0.458 2.378 1.1 3.455 1.834 0.135 0.092 0.18 0.32 0.09 0.458-0.045 0.092-0.18 0.138-0.27 0.138-0.044 0-0.134 0-0.179-0.046-1.032-0.688-2.109-1.284-3.276-1.696-0.403-0.138-0.673-0.596-0.583-1.009l0.539-2.613h-5.16l-0.36 2.017c-0.09 0.413-0.403 0.688-0.807 0.734-4.039 0.32-8.391 2.384-8.481 7.29h5.878c-0.045-0.138-0.045-0.276-0.045-0.413 0-1.467 1.436-2.384 3.904-2.384 1.795 0 4.577 0.642 6.641 2.476 0.224 0.183 0.494 0.32 0.763 0.32h12.564v-0.458h-0.404zm0 1.146H29.122c-0.404 0-0.852-0.183-1.211-0.458-1.93-1.697-4.533-2.339-6.193-2.339-0.538 0-3.23 0.092-3.23 1.697 0 1.33 1.57 2.017 3.948 2.934 4.128 1.421 8.302 3.484 8.302 8.253h10.948V21.09h-0.359v-9.17h0.36v-0.458h-0.36z"/>
-        <path android:pathData="M0.314 21.549h11.981c0.404 0 0.808 0.183 1.122 0.504 1.48 1.559 3.5 2.338 6.058 2.338h0.224c2.378 0 3.814-0.825 3.814-2.109 0-1.192-1.211-1.742-4.711-3.072-3.097-1.146-7.18-3.163-7.45-7.748H0.27v0.459h0.404v9.17H0.27v0.458h0.045zm20.866 7.977c5.519-0.504 8.93-3.53 8.93-7.977 0-4.31-3.994-6.281-7.898-7.611-2.02-0.78-3.5-1.421-4.128-2.476h-6.058c0.27 4.172 4.083 6.052 7 7.107 3.32 1.237 5.115 1.97 5.115 3.713 0 1.742-1.705 2.797-4.487 2.797H19.43c-2.737 0-4.936-0.871-6.507-2.568-0.18-0.183-0.403-0.275-0.628-0.275H0.27v0.459h0.403v4.997c0 1.238 0.494 2.384 1.257 3.21L1.705 31.13l0.314 0.32 0.27-0.274c0.807 0.687 1.795 1.1 2.916 1.1h9.02l0.493-2.568c0.045-0.137-0.045-0.229-0.18-0.275-1.704-0.504-3.275-1.33-4.666-2.475-0.134-0.138-0.18-0.321-0.045-0.459 0.135-0.137 0.314-0.183 0.449-0.046 1.346 1.055 2.827 1.88 4.442 2.338 0.449 0.138 0.718 0.596 0.629 1.055l-0.45 2.43h5.026l0.45-2.063c0.089-0.367 0.403-0.642 0.807-0.688zM0.314 10.774h10.994c0.135-5.364 4.801-7.61 9.154-7.931 0.09-0.046 0.18-0.092 0.18-0.23L21 0.644H5.205c-1.121 0-2.109 0.412-2.916 1.1l-0.27-0.23L1.705 1.88 1.93 2.11C1.167 2.934 0.673 4.08 0.673 5.318v4.997H0.27v0.458h0.045zm41.327 11.417H30.738c-0.315 4.447-3.904 7.518-9.513 7.977-0.09 0-0.18 0.092-0.225 0.183l-0.404 1.926H36.75c1.122 0 2.11-0.413 2.917-1.1l0.27 0.275 0.313-0.321-0.224-0.23c0.808-0.825 1.301-1.97 1.301-3.209v-4.997h0.36L41.64 22.19zm-0.314-11.875V5.319c0-1.238-0.493-2.385-1.301-3.21L40.25 1.88l-0.314-0.367-0.224 0.23c-0.808-0.688-1.795-1.1-2.917-1.1h-9.333l-0.539 2.75c-0.044 0.092 0.045 0.23 0.135 0.275 1.212 0.458 2.378 1.1 3.455 1.834 0.135 0.092 0.18 0.32 0.09 0.458-0.045 0.092-0.18 0.138-0.27 0.138-0.044 0-0.134 0-0.179-0.046-1.032-0.688-2.109-1.284-3.276-1.696-0.403-0.138-0.673-0.596-0.583-1.009l0.539-2.613h-5.16l-0.36 2.017c-0.09 0.413-0.403 0.688-0.807 0.734-4.039 0.32-8.391 2.384-8.481 7.29h5.878c-0.045-0.138-0.045-0.276-0.045-0.413 0-1.467 1.436-2.384 3.904-2.384 1.795 0 4.577 0.642 6.641 2.476 0.224 0.183 0.494 0.32 0.763 0.32h12.564v-0.458h-0.404zm0 1.146H29.122c-0.404 0-0.852-0.183-1.211-0.458-1.93-1.697-4.533-2.339-6.193-2.339-0.538 0-3.23 0.092-3.23 1.697 0 1.33 1.57 2.017 3.948 2.934 4.128 1.421 8.302 3.484 8.302 8.253h10.948V21.09h-0.359v-9.17h0.36v-0.458h-0.36z">
-            <aapt:attr name="android:fillColor">
-                <gradient android:startY="3.4928" android:startX="1.38832" android:endY="46.3417" android:endX="68.7929" android:type="linear">
-                    <item android:offset="0" android:color="#FFFFFFFF"/>
-                    <item android:offset="0.4081" android:color="#FFC7B299"/>
-                    <item android:offset="1" android:color="#FF998675"/>
-                </gradient>
-            </aapt:attr>
-        </path>
-        <path android:pathData="M0.314 21.549h11.981c0.404 0 0.808 0.183 1.122 0.504 1.48 1.559 3.5 2.338 6.058 2.338h0.224c2.378 0 3.814-0.825 3.814-2.109 0-1.192-1.211-1.742-4.711-3.072-3.097-1.146-7.18-3.163-7.45-7.748H0.27v0.459h0.404v9.17H0.27v0.458h0.045zm20.866 7.977c5.519-0.504 8.93-3.53 8.93-7.977 0-4.31-3.994-6.281-7.898-7.611-2.02-0.78-3.5-1.421-4.128-2.476h-6.058c0.27 4.172 4.083 6.052 7 7.107 3.32 1.237 5.115 1.97 5.115 3.713 0 1.742-1.705 2.797-4.487 2.797H19.43c-2.737 0-4.936-0.871-6.507-2.568-0.18-0.183-0.403-0.275-0.628-0.275H0.27v0.459h0.403v4.997c0 1.238 0.494 2.384 1.257 3.21L1.705 31.13l0.314 0.32 0.27-0.274c0.807 0.687 1.795 1.1 2.916 1.1h9.02l0.493-2.568c0.045-0.137-0.045-0.229-0.18-0.275-1.704-0.504-3.275-1.33-4.666-2.475-0.134-0.138-0.18-0.321-0.045-0.459 0.135-0.137 0.314-0.183 0.449-0.046 1.346 1.055 2.827 1.88 4.442 2.338 0.449 0.138 0.718 0.596 0.629 1.055l-0.45 2.43h5.026l0.45-2.063c0.089-0.367 0.403-0.642 0.807-0.688zM0.314 10.774h10.994c0.135-5.364 4.801-7.61 9.154-7.931 0.09-0.046 0.18-0.092 0.18-0.23L21 0.644H5.205c-1.121 0-2.109 0.412-2.916 1.1l-0.27-0.23L1.705 1.88 1.93 2.11C1.167 2.934 0.673 4.08 0.673 5.318v4.997H0.27v0.458h0.045zm41.327 11.417H30.738c-0.315 4.447-3.904 7.518-9.513 7.977-0.09 0-0.18 0.092-0.225 0.183l-0.404 1.926H36.75c1.122 0 2.11-0.413 2.917-1.1l0.27 0.275 0.313-0.321-0.224-0.23c0.808-0.825 1.301-1.97 1.301-3.209v-4.997h0.36L41.64 22.19zm-0.314-11.875V5.319c0-1.238-0.493-2.385-1.301-3.21L40.25 1.88l-0.314-0.367-0.224 0.23c-0.808-0.688-1.795-1.1-2.917-1.1h-9.333l-0.539 2.75c-0.044 0.092 0.045 0.23 0.135 0.275 1.212 0.458 2.378 1.1 3.455 1.834 0.135 0.092 0.18 0.32 0.09 0.458-0.045 0.092-0.18 0.138-0.27 0.138-0.044 0-0.134 0-0.179-0.046-1.032-0.688-2.109-1.284-3.276-1.696-0.403-0.138-0.673-0.596-0.583-1.009l0.539-2.613h-5.16l-0.36 2.017c-0.09 0.413-0.403 0.688-0.807 0.734-4.039 0.32-8.391 2.384-8.481 7.29h5.878c-0.045-0.138-0.045-0.276-0.045-0.413 0-1.467 1.436-2.384 3.904-2.384 1.795 0 4.577 0.642 6.641 2.476 0.224 0.183 0.494 0.32 0.763 0.32h12.564v-0.458h-0.404zm0 1.146H29.122c-0.404 0-0.852-0.183-1.211-0.458-1.93-1.697-4.533-2.339-6.193-2.339-0.538 0-3.23 0.092-3.23 1.697 0 1.33 1.57 2.017 3.948 2.934 4.128 1.421 8.302 3.484 8.302 8.253h10.948V21.09h-0.359v-9.17h0.36v-0.458h-0.36z">
-            <aapt:attr name="android:fillColor">
-                <gradient android:startY="31.3798" android:startX="42.1542" android:endY="-9.12049" android:endX="13.8976" android:type="linear">
-                    <item android:offset="0" android:color="#FFF1EAE2"/>
-                    <item android:offset="0.149949" android:color="#FFF3ECE3"/>
-                    <item android:offset="0.319891" android:color="#FFF4EDE4"/>
-                    <item android:offset="0.509302" android:color="#FFEFE6DB"/>
-                    <item android:offset="0.707905" android:color="#FFECE4DB"/>
-                    <item android:offset="1" android:color="#FFF1F1F1"/>
-                </gradient>
-            </aapt:attr>
-        </path>
-        <path android:pathData="M1.25 0.5C1.08 0.775 1.166 1 1.441 1S2.08 0.775 2.25 0.5C2.42 0.225 2.334 0 2.059 0S1.42 0.225 1.25 0.5zM24 1.03c0 0.565 0.225 0.89 0.5 0.72 0.275-0.17 0.5-0.633 0.5-1.03C25 0.324 24.775 0 24.5 0S24 0.464 24 1.03zm4-0.78c0 0.138 0.113 0.25 0.25 0.25s0.25-0.112 0.25-0.25S28.387 0 28.25 0 28 0.113 28 0.25zm-8.181 2C19.661 2.663 19.749 3 20.016 3 20.282 3 20.5 2.663 20.5 2.25S20.412 1.5 20.303 1.5c-0.108 0-0.326 0.337-0.484 0.75zM24 2.75C24 2.888 24.113 3 24.25 3s0.25-0.112 0.25-0.25-0.113-0.25-0.25-0.25S24 2.612 24 2.75zm-4.76 1.78c-0.45 1.42 0.05 1.796 0.721 0.543 0.326-0.609 0.357-1.127 0.077-1.3-0.256-0.158-0.615 0.182-0.797 0.757zM22.83 4c-0.977 3.02-0.495 6.254 0.669 4.5 0.274-0.412 0.448-1.088 0.387-1.5-0.06-0.412 0.046-0.998 0.236-1.301 0.191-0.303 0.033-0.978-0.351-1.5C23.19 3.412 23.03 3.378 22.829 4zm2.895 1.875C24.304 9.252 23.56 14.5 24.5 14.5c0.275 0 0.5-0.575 0.5-1.278C25 11.64 26.04 7.34 26.504 7c0.188-0.138 0.493-0.869 0.678-1.625 0.501-2.046-0.536-1.69-1.457 0.5zM32 4.75C32 4.888 32.112 5 32.25 5s0.25-0.112 0.25-0.25-0.112-0.25-0.25-0.25S32 4.612 32 4.75zM0.508 5.875c0.004 0.206 0.217 0.706 0.473 1.11 0.576 0.911 1.251 0.341 0.846-0.714-0.298-0.779-1.333-1.09-1.32-0.396zM13 6.029c0 0.292 0.225 0.391 0.5 0.221S14 5.842 14 5.72c0-0.12-0.225-0.22-0.5-0.22S13 5.739 13 6.03zm20.54 0.173c-0.415 0.5-0.424 0.753-0.031 0.885C34.584 7.444 29.094 22 27.884 22c-0.223 0-1.383-0.9-2.576-2-3.16-2.913-3.467-2.449-0.421 0.636l2.603 2.635-1.295 1.398c-1.703 1.835-1.092 2.398 0.719 0.663 1.881-1.802 5.678-9.57 7.284-14.905C34.914 8.05 35.5 5.97 35.5 5.804c0-0.58-1.382-0.298-1.96 0.399zM2.876 6.33c0.344 0.139 0.906 0.139 1.25 0S4.188 6.079 3.5 6.079 2.531 6.193 2.875 6.331zM5 6.5C5 6.775 5.225 7 5.5 7S6 6.775 6 6.5 5.775 6 5.5 6 5 6.225 5 6.5zm10.5 0.25C15.5 6.888 15.613 7 15.75 7S16 6.888 16 6.75 15.887 6.5 15.75 6.5 15.5 6.612 15.5 6.75zM13 7.25c0 0.138 0.113 0.25 0.25 0.25s0.25-0.112 0.25-0.25S13.387 7 13.25 7 13 7.112 13 7.25zM8.5 8.146C6.987 8.373 5.02 8.447 4.128 8.311 3.098 8.155 2.245 8.327 1.79 8.783 1.395 9.177 0.83 9.5 0.535 9.5 0.241 9.5 0 10.063 0 10.75 0 11.943 0.136 12 2.966 12c2.761 0 3.044 0.11 4.096 1.587 0.656 0.922 1.216 1.329 1.336 0.971 0.112-0.338-0.191-1.053-0.674-1.587-0.484-0.534-0.788-0.983-0.676-0.998 0.111-0.015 1.954-0.21 4.096-0.436 2.142-0.224 3.995-0.51 4.12-0.634 0.124-0.124-0.05-0.81-0.387-1.524-0.723-1.532-2.324-1.841-6.377-1.233zM16 7.75C16 7.888 16.113 8 16.25 8s0.25-0.112 0.25-0.25-0.113-0.25-0.25-0.25S16 7.612 16 7.75zm12.278 2.778c-1.78 3.966-1.386 4.36 0.472 0.472 0.785-1.643 1.308-3.108 1.162-3.255-0.146-0.146-0.882 1.106-1.634 2.783zM13.334 8.834c-0.184 0.183-0.484 0.183-0.668 0C12.483 8.65 12.633 8.5 13 8.5s0.517 0.15 0.334 0.334zm4.968 0.541c-1.22 4.022-1.857 8.726-1.305 9.62 0.555 0.898 1.384-2.032 1.761-6.225 0.172-1.915 0.423-3.658 0.557-3.875 0.134-0.217 0.021-0.395-0.252-0.395-0.272 0-0.615 0.394-0.761 0.875zM4.5 9.25c0 0.137-0.112 0.25-0.25 0.25S4 9.387 4 9.25 4.112 9 4.25 9 4.5 9.113 4.5 9.25zm2 0c0 0.137-0.112 0.25-0.25 0.25S6 9.387 6 9.25 6.112 9 6.25 9 6.5 9.113 6.5 9.25zm4.375 0.108c-0.756 0.114-1.993 0.114-2.75 0C7.369 9.243 7.987 9.15 9.5 9.15c1.512 0 2.132 0.093 1.375 0.208zM22.08 11.93c-0.698 2.33-0.737 3.226-0.123 2.847 0.494-0.305 1.282-4.204 0.923-4.564-0.121-0.12-0.481 0.652-0.8 1.717zM3.5 13.5c0 0.367 0.15 0.517 0.333 0.334 0.183-0.184 0.183-0.484 0-0.668C3.65 12.983 3.5 13.133 3.5 13.5zm1-0.25c0 0.137 0.112 0.25 0.25 0.25S5 13.387 5 13.25 4.888 13 4.75 13 4.5 13.113 4.5 13.25zm28.334 2.584c-0.184 0.183-0.334 0.565-0.334 0.85 0 0.313 0.233 0.283 0.592-0.076 0.325-0.325 0.475-0.708 0.333-0.85-0.142-0.142-0.408-0.108-0.591 0.076zM15.5 16.25c0 0.137 0.113 0.25 0.25 0.25S16 16.387 16 16.25 15.887 16 15.75 16s-0.25 0.113-0.25 0.25zm3.959 2.375c-0.023 0.344-0.137 1.2-0.254 1.902-0.156 0.938 0.188 1.662 1.291 2.719 1.452 1.391 2.13 3.2 0.919 2.452-0.399-0.247-0.479-0.085-0.25 0.511 0.184 0.48 0.335 1.305 0.335 1.832 0 0.527 0.242 0.959 0.538 0.959 0.296 0 0.497-0.619 0.447-1.375-0.139-2.099-0.066-2.203 1.091-1.584 0.928 0.497 1.031 0.46 0.75-0.274C24.146 25.301 24 24.824 24 24.71c0-0.115-0.281-0.212-0.625-0.215-0.343-0.003-1.336-0.736-2.204-1.631-1.391-1.431-1.5-1.736-0.91-2.543 0.683-0.934 0.495-2.32-0.314-2.32-0.246 0-0.465 0.282-0.488 0.625zM6.75 21c-0.17 0.275-0.07 0.5 0.22 0.5 0.292 0 0.53-0.225 0.53-0.5s-0.099-0.5-0.22-0.5c-0.122 0-0.36 0.225-0.53 0.5zm9 0.09c-0.825 0.245-2.328 0.325-3.339 0.177-1.258-0.183-2.075-0.032-2.586 0.48-0.412 0.411-1.159 0.823-1.661 0.916C5.802 23.1 2.816 24.16 3.378 24.36c0.345 0.124 0.501 0.431 0.345 0.683C3.569 25.294 4.13 25.5 4.971 25.5 5.81 25.5 6.5 25.725 6.5 26s-0.956 0.503-2.125 0.508C2.819 26.514 2.45 26.645 3 27c0.413 0.267 1.699 0.488 2.86 0.492 1.7 0.006 2.05 0.158 1.81 0.788-0.165 0.428-0.6 0.663-0.968 0.521-0.369-0.14-0.803-0.041-0.965 0.222C5.574 29.285 5.932 29.5 6.532 29.5c0.856 0 0.97 0.145 0.534 0.671-0.715 0.861-0.279 1.291 0.977 0.963 0.696-0.183 0.898-0.534 0.688-1.196C8.528 29.304 8.676 29 9.186 29c0.415 0 0.892-0.223 1.06-0.494 0.175-0.284-0.026-0.367-0.471-0.197-1.216 0.467-0.908-0.593 0.349-1.199l1.125-0.543-1.125-0.033C8.85 26.496 8.62 25.753 9.75 25.319c0.412-0.158 0.75-0.621 0.75-1.03 0-0.658 2.703-1.778 4.31-1.786 0.585-0.003 1.464 4.422 1.266 6.372C16.014 29.494 16.197 30 16.482 30 16.791 30 17 28.576 17 26.47c0-2.225-0.184-3.415-0.5-3.22-0.786 0.485-0.585-0.328 0.33-1.338 1.061-1.173 0.792-1.377-1.08-0.822zm25.285 0.994c-0.019 0.459-0.171 1.19-0.338 1.625-0.2 0.519-0.028 0.791 0.5 0.791 0.875 0 0.97-0.698 0.303-2.25-0.343-0.799-0.437-0.832-0.465-0.166zM10.5 22.25c0 0.137-0.113 0.25-0.25 0.25S10 22.387 10 22.25 10.113 22 10.25 22s0.25 0.113 0.25 0.25zM39 23.5c0 0.366 0.15 0.517 0.334 0.334 0.182-0.184 0.182-0.484 0-0.668C39.15 22.983 39 23.134 39 23.5zM8.634 24.328c-0.338 0.137-1.013 0.146-1.5 0.018-0.486-0.127-0.209-0.238 0.616-0.248 0.825-0.01 1.223 0.093 0.884 0.23zM5 24.75C5 24.887 4.888 25 4.75 25S4.5 24.887 4.5 24.75s0.112-0.25 0.25-0.25S5 24.613 5 24.75zm26.5 0.75c0 0.275 0.238 0.5 0.53 0.5 0.29 0 0.39-0.225 0.22-0.5S31.842 25 31.72 25c-0.121 0-0.22 0.225-0.22 0.5zm6.822 0.54c-0.857 0.826-0.87 1.012-0.164 2.427C38.58 29.311 38.74 30 38.517 30c-0.223 0-0.375 0.394-0.337 0.875 0.048 0.605-0.355 0.924-1.305 1.033-0.86 0.099-1.375-0.079-1.375-0.475 0-0.465-0.148-0.485-0.556-0.076C33.995 32.303 34.96 33 37.225 33c1.465 0 2.26-0.243 2.455-0.75 0.158-0.413 0.547-0.75 0.864-0.75 0.416 0 0.404 0.21-0.045 0.75-0.52 0.627-0.448 0.75 0.439 0.75C41.717 33 42 32.689 42 31.834c0-1.512-0.486-1.968-1.341-1.258-0.852 0.706-1.284 0.331-0.867-0.755C39.965 29.37 40.532 29 41.053 29c1.19 0 1.244-0.85 0.072-1.155-0.834-0.218-0.834-0.232 0-0.287C42.063 27.496 42.429 25 41.5 25c-0.275 0-0.5 0.225-0.5 0.5 0 0.609-1.35 0.67-1.584 0.073-0.091-0.236-0.583-0.026-1.094 0.466zM8 25.72c0 0.122-0.225 0.36-0.5 0.53C7.225 26.42 7 26.32 7 26.03c0-0.292 0.225-0.53 0.5-0.53S8 25.599 8 25.72zm15 1.03c0 0.137 0.113 0.25 0.25 0.25s0.25-0.113 0.25-0.25-0.113-0.25-0.25-0.25S23 26.613 23 26.75zM1.5 27.5c0 0.366 0.15 0.517 0.333 0.334 0.184-0.184 0.184-0.484 0-0.668C1.65 26.983 1.5 27.134 1.5 27.5zm23.532 0.29c0.325 0.39 0.913 0.71 1.308 0.71 1.006 0 0.39-0.823-0.861-1.15-0.85-0.223-0.93-0.144-0.447 0.44zm-10.28 1.335c-0.18 0.894-0.429 1.992-0.554 2.441-0.126 0.448 0.06 0.926 0.412 1.06 0.465 0.178 0.667-0.492 0.736-2.44 0.11-3.047-0.114-3.446-0.594-1.061zm8.341 0.282c-0.078 1.37 0.023 1.65 0.393 1.093 0.603-0.907 0.664-2.349 0.114-2.688-0.22-0.136-0.448 0.582-0.507 1.595zM24.5 29.25c0 0.137 0.113 0.25 0.25 0.25S25 29.387 25 29.25 24.887 29 24.75 29s-0.25 0.113-0.25 0.25zm1.166 0.084c0.184 0.183 0.484 0.183 0.668 0C26.517 29.15 26.366 29 26 29s-0.517 0.15-0.334 0.334zM28 29.75c0 0.137 0.113 0.25 0.25 0.25s0.25-0.113 0.25-0.25-0.113-0.25-0.25-0.25S28 29.613 28 29.75zM1 30.5c0 0.366 0.15 0.517 0.333 0.334 0.183-0.184 0.183-0.484 0-0.668C1.15 29.983 1 30.134 1 30.5zm28-0.25c0 0.137 0.113 0.25 0.25 0.25s0.25-0.113 0.25-0.25S29.387 30 29.25 30 29 30.113 29 30.25zm-7.5 1.5c0 0.137 0.113 0.25 0.25 0.25S22 31.887 22 31.75s-0.113-0.25-0.25-0.25-0.25 0.113-0.25 0.25zm-14 0.75c0.982 0.635 2.5 0.635 2.5 0 0-0.275-0.731-0.496-1.625-0.492C7.142 32.013 6.931 32.132 7.5 32.5zm17.5 0c0.97 0.627 1.5 0.627 1.5 0 0-0.275-0.506-0.496-1.125-0.492-0.91 0.006-0.982 0.1-0.375 0.492z" android:fillType="evenOdd">
-            <aapt:attr name="android:fillColor">
-                <gradient android:startY="1.5" android:startX="32.5" android:endY="37.0292" android:endX="-0.969948" android:type="linear">
-                    <item android:offset="0" android:color="#FFECE3DA"/>
-                    <item android:offset="0.208782" android:color="#FFEBE2D6"/>
-                    <item android:offset="1" android:color="#FFEBE2D9"/>
-                </gradient>
-            </aapt:attr>
-        </path>
-    </group>
-</vector>
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-aapt-compose/src/test/java/app/cash/paparazzi/plugin/test/ComposeTest.kt b/paparazzi-gradle-plugin/src/test/projects/verify-aapt-compose/src/test/java/app/cash/paparazzi/plugin/test/ComposeTest.kt
deleted file mode 100644
index 3ca4b14558..0000000000
--- a/paparazzi-gradle-plugin/src/test/projects/verify-aapt-compose/src/test/java/app/cash/paparazzi/plugin/test/ComposeTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package app.cash.paparazzi.plugin.test
-
-import app.cash.paparazzi.Paparazzi
-import org.junit.Rule
-import org.junit.Test
-
-class ComposeTest {
-  @get:Rule
-  val paparazzi = Paparazzi()
-
-  @Test
-  fun compose() {
-    paparazzi.snapshot {
-      CardChip()
-    }
-  }
-}
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-aapt-compose/src/test/resources/compose_card_chip.png b/paparazzi-gradle-plugin/src/test/projects/verify-aapt-compose/src/test/resources/compose_card_chip.png
deleted file mode 100644
index 88e49e2700..0000000000
Binary files a/paparazzi-gradle-plugin/src/test/projects/verify-aapt-compose/src/test/resources/compose_card_chip.png and /dev/null differ
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-aapt-xml/build.gradle b/paparazzi-gradle-plugin/src/test/projects/verify-aapt-xml/build.gradle
deleted file mode 100644
index d95de55f1b..0000000000
--- a/paparazzi-gradle-plugin/src/test/projects/verify-aapt-xml/build.gradle
+++ /dev/null
@@ -1,26 +0,0 @@
-plugins {
-  id 'com.android.library'
-  id 'kotlin-android'
-  id 'app.cash.paparazzi'
-}
-
-android {
-  namespace 'app.cash.paparazzi.plugin.test'
-  compileSdk libs.versions.compileSdk.get() as int
-  defaultConfig {
-    minSdk libs.versions.minSdk.get() as int
-    vectorDrawables.useSupportLibrary = true
-  }
-  compileOptions {
-    sourceCompatibility = libs.versions.javaTarget.get()
-    targetCompatibility = libs.versions.javaTarget.get()
-  }
-  kotlinOptions {
-    jvmTarget = libs.versions.javaTarget.get()
-  }
-}
-
-dependencies {
-  implementation libs.androidx.appcompat
-}
-
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-aapt-xml/src/main/res/drawable/card_chip.xml b/paparazzi-gradle-plugin/src/test/projects/verify-aapt-xml/src/main/res/drawable/card_chip.xml
deleted file mode 100644
index a9cb398978..0000000000
--- a/paparazzi-gradle-plugin/src/test/projects/verify-aapt-xml/src/main/res/drawable/card_chip.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--Copyright Square, Inc.-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:width="42dp" android:height="34dp" android:viewportWidth="42" android:viewportHeight="34">
-    <path android:pathData="M36.795 0H5.205C2.333 0 0 2.384 0 5.318v22.374c0 2.934 2.333 5.318 5.205 5.318h31.59c2.872 0 5.205-2.384 5.205-5.318V5.318C41.955 2.384 39.622 0 36.795 0z" android:fillColor="#666666"/>
-    <group>
-        <clip-path android:pathData="M0.314 21.549h11.981c0.404 0 0.808 0.183 1.122 0.504 1.48 1.559 3.5 2.338 6.058 2.338h0.224c2.378 0 3.814-0.825 3.814-2.109 0-1.192-1.211-1.742-4.711-3.072-3.097-1.146-7.18-3.163-7.45-7.748H0.27v0.459h0.404v9.17H0.27v0.458h0.045zm20.866 7.977c5.519-0.504 8.93-3.53 8.93-7.977 0-4.31-3.994-6.281-7.898-7.611-2.02-0.78-3.5-1.421-4.128-2.476h-6.058c0.27 4.172 4.083 6.052 7 7.107 3.32 1.237 5.115 1.97 5.115 3.713 0 1.742-1.705 2.797-4.487 2.797H19.43c-2.737 0-4.936-0.871-6.507-2.568-0.18-0.183-0.403-0.275-0.628-0.275H0.27v0.459h0.403v4.997c0 1.238 0.494 2.384 1.257 3.21L1.705 31.13l0.314 0.32 0.27-0.274c0.807 0.687 1.795 1.1 2.916 1.1h9.02l0.493-2.568c0.045-0.137-0.045-0.229-0.18-0.275-1.704-0.504-3.275-1.33-4.666-2.475-0.134-0.138-0.18-0.321-0.045-0.459 0.135-0.137 0.314-0.183 0.449-0.046 1.346 1.055 2.827 1.88 4.442 2.338 0.449 0.138 0.718 0.596 0.629 1.055l-0.45 2.43h5.026l0.45-2.063c0.089-0.367 0.403-0.642 0.807-0.688zM0.314 10.774h10.994c0.135-5.364 4.801-7.61 9.154-7.931 0.09-0.046 0.18-0.092 0.18-0.23L21 0.644H5.205c-1.121 0-2.109 0.412-2.916 1.1l-0.27-0.23L1.705 1.88 1.93 2.11C1.167 2.934 0.673 4.08 0.673 5.318v4.997H0.27v0.458h0.045zm41.327 11.417H30.738c-0.315 4.447-3.904 7.518-9.513 7.977-0.09 0-0.18 0.092-0.225 0.183l-0.404 1.926H36.75c1.122 0 2.11-0.413 2.917-1.1l0.27 0.275 0.313-0.321-0.224-0.23c0.808-0.825 1.301-1.97 1.301-3.209v-4.997h0.36L41.64 22.19zm-0.314-11.875V5.319c0-1.238-0.493-2.385-1.301-3.21L40.25 1.88l-0.314-0.367-0.224 0.23c-0.808-0.688-1.795-1.1-2.917-1.1h-9.333l-0.539 2.75c-0.044 0.092 0.045 0.23 0.135 0.275 1.212 0.458 2.378 1.1 3.455 1.834 0.135 0.092 0.18 0.32 0.09 0.458-0.045 0.092-0.18 0.138-0.27 0.138-0.044 0-0.134 0-0.179-0.046-1.032-0.688-2.109-1.284-3.276-1.696-0.403-0.138-0.673-0.596-0.583-1.009l0.539-2.613h-5.16l-0.36 2.017c-0.09 0.413-0.403 0.688-0.807 0.734-4.039 0.32-8.391 2.384-8.481 7.29h5.878c-0.045-0.138-0.045-0.276-0.045-0.413 0-1.467 1.436-2.384 3.904-2.384 1.795 0 4.577 0.642 6.641 2.476 0.224 0.183 0.494 0.32 0.763 0.32h12.564v-0.458h-0.404zm0 1.146H29.122c-0.404 0-0.852-0.183-1.211-0.458-1.93-1.697-4.533-2.339-6.193-2.339-0.538 0-3.23 0.092-3.23 1.697 0 1.33 1.57 2.017 3.948 2.934 4.128 1.421 8.302 3.484 8.302 8.253h10.948V21.09h-0.359v-9.17h0.36v-0.458h-0.36z"/>
-        <path android:pathData="M0.314 21.549h11.981c0.404 0 0.808 0.183 1.122 0.504 1.48 1.559 3.5 2.338 6.058 2.338h0.224c2.378 0 3.814-0.825 3.814-2.109 0-1.192-1.211-1.742-4.711-3.072-3.097-1.146-7.18-3.163-7.45-7.748H0.27v0.459h0.404v9.17H0.27v0.458h0.045zm20.866 7.977c5.519-0.504 8.93-3.53 8.93-7.977 0-4.31-3.994-6.281-7.898-7.611-2.02-0.78-3.5-1.421-4.128-2.476h-6.058c0.27 4.172 4.083 6.052 7 7.107 3.32 1.237 5.115 1.97 5.115 3.713 0 1.742-1.705 2.797-4.487 2.797H19.43c-2.737 0-4.936-0.871-6.507-2.568-0.18-0.183-0.403-0.275-0.628-0.275H0.27v0.459h0.403v4.997c0 1.238 0.494 2.384 1.257 3.21L1.705 31.13l0.314 0.32 0.27-0.274c0.807 0.687 1.795 1.1 2.916 1.1h9.02l0.493-2.568c0.045-0.137-0.045-0.229-0.18-0.275-1.704-0.504-3.275-1.33-4.666-2.475-0.134-0.138-0.18-0.321-0.045-0.459 0.135-0.137 0.314-0.183 0.449-0.046 1.346 1.055 2.827 1.88 4.442 2.338 0.449 0.138 0.718 0.596 0.629 1.055l-0.45 2.43h5.026l0.45-2.063c0.089-0.367 0.403-0.642 0.807-0.688zM0.314 10.774h10.994c0.135-5.364 4.801-7.61 9.154-7.931 0.09-0.046 0.18-0.092 0.18-0.23L21 0.644H5.205c-1.121 0-2.109 0.412-2.916 1.1l-0.27-0.23L1.705 1.88 1.93 2.11C1.167 2.934 0.673 4.08 0.673 5.318v4.997H0.27v0.458h0.045zm41.327 11.417H30.738c-0.315 4.447-3.904 7.518-9.513 7.977-0.09 0-0.18 0.092-0.225 0.183l-0.404 1.926H36.75c1.122 0 2.11-0.413 2.917-1.1l0.27 0.275 0.313-0.321-0.224-0.23c0.808-0.825 1.301-1.97 1.301-3.209v-4.997h0.36L41.64 22.19zm-0.314-11.875V5.319c0-1.238-0.493-2.385-1.301-3.21L40.25 1.88l-0.314-0.367-0.224 0.23c-0.808-0.688-1.795-1.1-2.917-1.1h-9.333l-0.539 2.75c-0.044 0.092 0.045 0.23 0.135 0.275 1.212 0.458 2.378 1.1 3.455 1.834 0.135 0.092 0.18 0.32 0.09 0.458-0.045 0.092-0.18 0.138-0.27 0.138-0.044 0-0.134 0-0.179-0.046-1.032-0.688-2.109-1.284-3.276-1.696-0.403-0.138-0.673-0.596-0.583-1.009l0.539-2.613h-5.16l-0.36 2.017c-0.09 0.413-0.403 0.688-0.807 0.734-4.039 0.32-8.391 2.384-8.481 7.29h5.878c-0.045-0.138-0.045-0.276-0.045-0.413 0-1.467 1.436-2.384 3.904-2.384 1.795 0 4.577 0.642 6.641 2.476 0.224 0.183 0.494 0.32 0.763 0.32h12.564v-0.458h-0.404zm0 1.146H29.122c-0.404 0-0.852-0.183-1.211-0.458-1.93-1.697-4.533-2.339-6.193-2.339-0.538 0-3.23 0.092-3.23 1.697 0 1.33 1.57 2.017 3.948 2.934 4.128 1.421 8.302 3.484 8.302 8.253h10.948V21.09h-0.359v-9.17h0.36v-0.458h-0.36z">
-            <aapt:attr name="android:fillColor">
-                <gradient android:startY="3.4928" android:startX="1.38832" android:endY="46.3417" android:endX="68.7929" android:type="linear">
-                    <item android:offset="0" android:color="#FFFFFFFF"/>
-                    <item android:offset="0.4081" android:color="#FFC7B299"/>
-                    <item android:offset="1" android:color="#FF998675"/>
-                </gradient>
-            </aapt:attr>
-        </path>
-        <path android:pathData="M0.314 21.549h11.981c0.404 0 0.808 0.183 1.122 0.504 1.48 1.559 3.5 2.338 6.058 2.338h0.224c2.378 0 3.814-0.825 3.814-2.109 0-1.192-1.211-1.742-4.711-3.072-3.097-1.146-7.18-3.163-7.45-7.748H0.27v0.459h0.404v9.17H0.27v0.458h0.045zm20.866 7.977c5.519-0.504 8.93-3.53 8.93-7.977 0-4.31-3.994-6.281-7.898-7.611-2.02-0.78-3.5-1.421-4.128-2.476h-6.058c0.27 4.172 4.083 6.052 7 7.107 3.32 1.237 5.115 1.97 5.115 3.713 0 1.742-1.705 2.797-4.487 2.797H19.43c-2.737 0-4.936-0.871-6.507-2.568-0.18-0.183-0.403-0.275-0.628-0.275H0.27v0.459h0.403v4.997c0 1.238 0.494 2.384 1.257 3.21L1.705 31.13l0.314 0.32 0.27-0.274c0.807 0.687 1.795 1.1 2.916 1.1h9.02l0.493-2.568c0.045-0.137-0.045-0.229-0.18-0.275-1.704-0.504-3.275-1.33-4.666-2.475-0.134-0.138-0.18-0.321-0.045-0.459 0.135-0.137 0.314-0.183 0.449-0.046 1.346 1.055 2.827 1.88 4.442 2.338 0.449 0.138 0.718 0.596 0.629 1.055l-0.45 2.43h5.026l0.45-2.063c0.089-0.367 0.403-0.642 0.807-0.688zM0.314 10.774h10.994c0.135-5.364 4.801-7.61 9.154-7.931 0.09-0.046 0.18-0.092 0.18-0.23L21 0.644H5.205c-1.121 0-2.109 0.412-2.916 1.1l-0.27-0.23L1.705 1.88 1.93 2.11C1.167 2.934 0.673 4.08 0.673 5.318v4.997H0.27v0.458h0.045zm41.327 11.417H30.738c-0.315 4.447-3.904 7.518-9.513 7.977-0.09 0-0.18 0.092-0.225 0.183l-0.404 1.926H36.75c1.122 0 2.11-0.413 2.917-1.1l0.27 0.275 0.313-0.321-0.224-0.23c0.808-0.825 1.301-1.97 1.301-3.209v-4.997h0.36L41.64 22.19zm-0.314-11.875V5.319c0-1.238-0.493-2.385-1.301-3.21L40.25 1.88l-0.314-0.367-0.224 0.23c-0.808-0.688-1.795-1.1-2.917-1.1h-9.333l-0.539 2.75c-0.044 0.092 0.045 0.23 0.135 0.275 1.212 0.458 2.378 1.1 3.455 1.834 0.135 0.092 0.18 0.32 0.09 0.458-0.045 0.092-0.18 0.138-0.27 0.138-0.044 0-0.134 0-0.179-0.046-1.032-0.688-2.109-1.284-3.276-1.696-0.403-0.138-0.673-0.596-0.583-1.009l0.539-2.613h-5.16l-0.36 2.017c-0.09 0.413-0.403 0.688-0.807 0.734-4.039 0.32-8.391 2.384-8.481 7.29h5.878c-0.045-0.138-0.045-0.276-0.045-0.413 0-1.467 1.436-2.384 3.904-2.384 1.795 0 4.577 0.642 6.641 2.476 0.224 0.183 0.494 0.32 0.763 0.32h12.564v-0.458h-0.404zm0 1.146H29.122c-0.404 0-0.852-0.183-1.211-0.458-1.93-1.697-4.533-2.339-6.193-2.339-0.538 0-3.23 0.092-3.23 1.697 0 1.33 1.57 2.017 3.948 2.934 4.128 1.421 8.302 3.484 8.302 8.253h10.948V21.09h-0.359v-9.17h0.36v-0.458h-0.36z">
-            <aapt:attr name="android:fillColor">
-                <gradient android:startY="31.3798" android:startX="42.1542" android:endY="-9.12049" android:endX="13.8976" android:type="linear">
-                    <item android:offset="0" android:color="#FFF1EAE2"/>
-                    <item android:offset="0.149949" android:color="#FFF3ECE3"/>
-                    <item android:offset="0.319891" android:color="#FFF4EDE4"/>
-                    <item android:offset="0.509302" android:color="#FFEFE6DB"/>
-                    <item android:offset="0.707905" android:color="#FFECE4DB"/>
-                    <item android:offset="1" android:color="#FFF1F1F1"/>
-                </gradient>
-            </aapt:attr>
-        </path>
-        <path android:pathData="M1.25 0.5C1.08 0.775 1.166 1 1.441 1S2.08 0.775 2.25 0.5C2.42 0.225 2.334 0 2.059 0S1.42 0.225 1.25 0.5zM24 1.03c0 0.565 0.225 0.89 0.5 0.72 0.275-0.17 0.5-0.633 0.5-1.03C25 0.324 24.775 0 24.5 0S24 0.464 24 1.03zm4-0.78c0 0.138 0.113 0.25 0.25 0.25s0.25-0.112 0.25-0.25S28.387 0 28.25 0 28 0.113 28 0.25zm-8.181 2C19.661 2.663 19.749 3 20.016 3 20.282 3 20.5 2.663 20.5 2.25S20.412 1.5 20.303 1.5c-0.108 0-0.326 0.337-0.484 0.75zM24 2.75C24 2.888 24.113 3 24.25 3s0.25-0.112 0.25-0.25-0.113-0.25-0.25-0.25S24 2.612 24 2.75zm-4.76 1.78c-0.45 1.42 0.05 1.796 0.721 0.543 0.326-0.609 0.357-1.127 0.077-1.3-0.256-0.158-0.615 0.182-0.797 0.757zM22.83 4c-0.977 3.02-0.495 6.254 0.669 4.5 0.274-0.412 0.448-1.088 0.387-1.5-0.06-0.412 0.046-0.998 0.236-1.301 0.191-0.303 0.033-0.978-0.351-1.5C23.19 3.412 23.03 3.378 22.829 4zm2.895 1.875C24.304 9.252 23.56 14.5 24.5 14.5c0.275 0 0.5-0.575 0.5-1.278C25 11.64 26.04 7.34 26.504 7c0.188-0.138 0.493-0.869 0.678-1.625 0.501-2.046-0.536-1.69-1.457 0.5zM32 4.75C32 4.888 32.112 5 32.25 5s0.25-0.112 0.25-0.25-0.112-0.25-0.25-0.25S32 4.612 32 4.75zM0.508 5.875c0.004 0.206 0.217 0.706 0.473 1.11 0.576 0.911 1.251 0.341 0.846-0.714-0.298-0.779-1.333-1.09-1.32-0.396zM13 6.029c0 0.292 0.225 0.391 0.5 0.221S14 5.842 14 5.72c0-0.12-0.225-0.22-0.5-0.22S13 5.739 13 6.03zm20.54 0.173c-0.415 0.5-0.424 0.753-0.031 0.885C34.584 7.444 29.094 22 27.884 22c-0.223 0-1.383-0.9-2.576-2-3.16-2.913-3.467-2.449-0.421 0.636l2.603 2.635-1.295 1.398c-1.703 1.835-1.092 2.398 0.719 0.663 1.881-1.802 5.678-9.57 7.284-14.905C34.914 8.05 35.5 5.97 35.5 5.804c0-0.58-1.382-0.298-1.96 0.399zM2.876 6.33c0.344 0.139 0.906 0.139 1.25 0S4.188 6.079 3.5 6.079 2.531 6.193 2.875 6.331zM5 6.5C5 6.775 5.225 7 5.5 7S6 6.775 6 6.5 5.775 6 5.5 6 5 6.225 5 6.5zm10.5 0.25C15.5 6.888 15.613 7 15.75 7S16 6.888 16 6.75 15.887 6.5 15.75 6.5 15.5 6.612 15.5 6.75zM13 7.25c0 0.138 0.113 0.25 0.25 0.25s0.25-0.112 0.25-0.25S13.387 7 13.25 7 13 7.112 13 7.25zM8.5 8.146C6.987 8.373 5.02 8.447 4.128 8.311 3.098 8.155 2.245 8.327 1.79 8.783 1.395 9.177 0.83 9.5 0.535 9.5 0.241 9.5 0 10.063 0 10.75 0 11.943 0.136 12 2.966 12c2.761 0 3.044 0.11 4.096 1.587 0.656 0.922 1.216 1.329 1.336 0.971 0.112-0.338-0.191-1.053-0.674-1.587-0.484-0.534-0.788-0.983-0.676-0.998 0.111-0.015 1.954-0.21 4.096-0.436 2.142-0.224 3.995-0.51 4.12-0.634 0.124-0.124-0.05-0.81-0.387-1.524-0.723-1.532-2.324-1.841-6.377-1.233zM16 7.75C16 7.888 16.113 8 16.25 8s0.25-0.112 0.25-0.25-0.113-0.25-0.25-0.25S16 7.612 16 7.75zm12.278 2.778c-1.78 3.966-1.386 4.36 0.472 0.472 0.785-1.643 1.308-3.108 1.162-3.255-0.146-0.146-0.882 1.106-1.634 2.783zM13.334 8.834c-0.184 0.183-0.484 0.183-0.668 0C12.483 8.65 12.633 8.5 13 8.5s0.517 0.15 0.334 0.334zm4.968 0.541c-1.22 4.022-1.857 8.726-1.305 9.62 0.555 0.898 1.384-2.032 1.761-6.225 0.172-1.915 0.423-3.658 0.557-3.875 0.134-0.217 0.021-0.395-0.252-0.395-0.272 0-0.615 0.394-0.761 0.875zM4.5 9.25c0 0.137-0.112 0.25-0.25 0.25S4 9.387 4 9.25 4.112 9 4.25 9 4.5 9.113 4.5 9.25zm2 0c0 0.137-0.112 0.25-0.25 0.25S6 9.387 6 9.25 6.112 9 6.25 9 6.5 9.113 6.5 9.25zm4.375 0.108c-0.756 0.114-1.993 0.114-2.75 0C7.369 9.243 7.987 9.15 9.5 9.15c1.512 0 2.132 0.093 1.375 0.208zM22.08 11.93c-0.698 2.33-0.737 3.226-0.123 2.847 0.494-0.305 1.282-4.204 0.923-4.564-0.121-0.12-0.481 0.652-0.8 1.717zM3.5 13.5c0 0.367 0.15 0.517 0.333 0.334 0.183-0.184 0.183-0.484 0-0.668C3.65 12.983 3.5 13.133 3.5 13.5zm1-0.25c0 0.137 0.112 0.25 0.25 0.25S5 13.387 5 13.25 4.888 13 4.75 13 4.5 13.113 4.5 13.25zm28.334 2.584c-0.184 0.183-0.334 0.565-0.334 0.85 0 0.313 0.233 0.283 0.592-0.076 0.325-0.325 0.475-0.708 0.333-0.85-0.142-0.142-0.408-0.108-0.591 0.076zM15.5 16.25c0 0.137 0.113 0.25 0.25 0.25S16 16.387 16 16.25 15.887 16 15.75 16s-0.25 0.113-0.25 0.25zm3.959 2.375c-0.023 0.344-0.137 1.2-0.254 1.902-0.156 0.938 0.188 1.662 1.291 2.719 1.452 1.391 2.13 3.2 0.919 2.452-0.399-0.247-0.479-0.085-0.25 0.511 0.184 0.48 0.335 1.305 0.335 1.832 0 0.527 0.242 0.959 0.538 0.959 0.296 0 0.497-0.619 0.447-1.375-0.139-2.099-0.066-2.203 1.091-1.584 0.928 0.497 1.031 0.46 0.75-0.274C24.146 25.301 24 24.824 24 24.71c0-0.115-0.281-0.212-0.625-0.215-0.343-0.003-1.336-0.736-2.204-1.631-1.391-1.431-1.5-1.736-0.91-2.543 0.683-0.934 0.495-2.32-0.314-2.32-0.246 0-0.465 0.282-0.488 0.625zM6.75 21c-0.17 0.275-0.07 0.5 0.22 0.5 0.292 0 0.53-0.225 0.53-0.5s-0.099-0.5-0.22-0.5c-0.122 0-0.36 0.225-0.53 0.5zm9 0.09c-0.825 0.245-2.328 0.325-3.339 0.177-1.258-0.183-2.075-0.032-2.586 0.48-0.412 0.411-1.159 0.823-1.661 0.916C5.802 23.1 2.816 24.16 3.378 24.36c0.345 0.124 0.501 0.431 0.345 0.683C3.569 25.294 4.13 25.5 4.971 25.5 5.81 25.5 6.5 25.725 6.5 26s-0.956 0.503-2.125 0.508C2.819 26.514 2.45 26.645 3 27c0.413 0.267 1.699 0.488 2.86 0.492 1.7 0.006 2.05 0.158 1.81 0.788-0.165 0.428-0.6 0.663-0.968 0.521-0.369-0.14-0.803-0.041-0.965 0.222C5.574 29.285 5.932 29.5 6.532 29.5c0.856 0 0.97 0.145 0.534 0.671-0.715 0.861-0.279 1.291 0.977 0.963 0.696-0.183 0.898-0.534 0.688-1.196C8.528 29.304 8.676 29 9.186 29c0.415 0 0.892-0.223 1.06-0.494 0.175-0.284-0.026-0.367-0.471-0.197-1.216 0.467-0.908-0.593 0.349-1.199l1.125-0.543-1.125-0.033C8.85 26.496 8.62 25.753 9.75 25.319c0.412-0.158 0.75-0.621 0.75-1.03 0-0.658 2.703-1.778 4.31-1.786 0.585-0.003 1.464 4.422 1.266 6.372C16.014 29.494 16.197 30 16.482 30 16.791 30 17 28.576 17 26.47c0-2.225-0.184-3.415-0.5-3.22-0.786 0.485-0.585-0.328 0.33-1.338 1.061-1.173 0.792-1.377-1.08-0.822zm25.285 0.994c-0.019 0.459-0.171 1.19-0.338 1.625-0.2 0.519-0.028 0.791 0.5 0.791 0.875 0 0.97-0.698 0.303-2.25-0.343-0.799-0.437-0.832-0.465-0.166zM10.5 22.25c0 0.137-0.113 0.25-0.25 0.25S10 22.387 10 22.25 10.113 22 10.25 22s0.25 0.113 0.25 0.25zM39 23.5c0 0.366 0.15 0.517 0.334 0.334 0.182-0.184 0.182-0.484 0-0.668C39.15 22.983 39 23.134 39 23.5zM8.634 24.328c-0.338 0.137-1.013 0.146-1.5 0.018-0.486-0.127-0.209-0.238 0.616-0.248 0.825-0.01 1.223 0.093 0.884 0.23zM5 24.75C5 24.887 4.888 25 4.75 25S4.5 24.887 4.5 24.75s0.112-0.25 0.25-0.25S5 24.613 5 24.75zm26.5 0.75c0 0.275 0.238 0.5 0.53 0.5 0.29 0 0.39-0.225 0.22-0.5S31.842 25 31.72 25c-0.121 0-0.22 0.225-0.22 0.5zm6.822 0.54c-0.857 0.826-0.87 1.012-0.164 2.427C38.58 29.311 38.74 30 38.517 30c-0.223 0-0.375 0.394-0.337 0.875 0.048 0.605-0.355 0.924-1.305 1.033-0.86 0.099-1.375-0.079-1.375-0.475 0-0.465-0.148-0.485-0.556-0.076C33.995 32.303 34.96 33 37.225 33c1.465 0 2.26-0.243 2.455-0.75 0.158-0.413 0.547-0.75 0.864-0.75 0.416 0 0.404 0.21-0.045 0.75-0.52 0.627-0.448 0.75 0.439 0.75C41.717 33 42 32.689 42 31.834c0-1.512-0.486-1.968-1.341-1.258-0.852 0.706-1.284 0.331-0.867-0.755C39.965 29.37 40.532 29 41.053 29c1.19 0 1.244-0.85 0.072-1.155-0.834-0.218-0.834-0.232 0-0.287C42.063 27.496 42.429 25 41.5 25c-0.275 0-0.5 0.225-0.5 0.5 0 0.609-1.35 0.67-1.584 0.073-0.091-0.236-0.583-0.026-1.094 0.466zM8 25.72c0 0.122-0.225 0.36-0.5 0.53C7.225 26.42 7 26.32 7 26.03c0-0.292 0.225-0.53 0.5-0.53S8 25.599 8 25.72zm15 1.03c0 0.137 0.113 0.25 0.25 0.25s0.25-0.113 0.25-0.25-0.113-0.25-0.25-0.25S23 26.613 23 26.75zM1.5 27.5c0 0.366 0.15 0.517 0.333 0.334 0.184-0.184 0.184-0.484 0-0.668C1.65 26.983 1.5 27.134 1.5 27.5zm23.532 0.29c0.325 0.39 0.913 0.71 1.308 0.71 1.006 0 0.39-0.823-0.861-1.15-0.85-0.223-0.93-0.144-0.447 0.44zm-10.28 1.335c-0.18 0.894-0.429 1.992-0.554 2.441-0.126 0.448 0.06 0.926 0.412 1.06 0.465 0.178 0.667-0.492 0.736-2.44 0.11-3.047-0.114-3.446-0.594-1.061zm8.341 0.282c-0.078 1.37 0.023 1.65 0.393 1.093 0.603-0.907 0.664-2.349 0.114-2.688-0.22-0.136-0.448 0.582-0.507 1.595zM24.5 29.25c0 0.137 0.113 0.25 0.25 0.25S25 29.387 25 29.25 24.887 29 24.75 29s-0.25 0.113-0.25 0.25zm1.166 0.084c0.184 0.183 0.484 0.183 0.668 0C26.517 29.15 26.366 29 26 29s-0.517 0.15-0.334 0.334zM28 29.75c0 0.137 0.113 0.25 0.25 0.25s0.25-0.113 0.25-0.25-0.113-0.25-0.25-0.25S28 29.613 28 29.75zM1 30.5c0 0.366 0.15 0.517 0.333 0.334 0.183-0.184 0.183-0.484 0-0.668C1.15 29.983 1 30.134 1 30.5zm28-0.25c0 0.137 0.113 0.25 0.25 0.25s0.25-0.113 0.25-0.25S29.387 30 29.25 30 29 30.113 29 30.25zm-7.5 1.5c0 0.137 0.113 0.25 0.25 0.25S22 31.887 22 31.75s-0.113-0.25-0.25-0.25-0.25 0.113-0.25 0.25zm-14 0.75c0.982 0.635 2.5 0.635 2.5 0 0-0.275-0.731-0.496-1.625-0.492C7.142 32.013 6.931 32.132 7.5 32.5zm17.5 0c0.97 0.627 1.5 0.627 1.5 0 0-0.275-0.506-0.496-1.125-0.492-0.91 0.006-0.982 0.1-0.375 0.492z" android:fillType="evenOdd">
-            <aapt:attr name="android:fillColor">
-                <gradient android:startY="1.5" android:startX="32.5" android:endY="37.0292" android:endX="-0.969948" android:type="linear">
-                    <item android:offset="0" android:color="#FFECE3DA"/>
-                    <item android:offset="0.208782" android:color="#FFEBE2D6"/>
-                    <item android:offset="1" android:color="#FFEBE2D9"/>
-                </gradient>
-            </aapt:attr>
-        </path>
-    </group>
-</vector>
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-aapt-xml/src/test/java/app/cash/paparazzi/plugin/test/AaptDrawableTest.kt b/paparazzi-gradle-plugin/src/test/projects/verify-aapt-xml/src/test/java/app/cash/paparazzi/plugin/test/AaptDrawableTest.kt
deleted file mode 100644
index b5e16773c9..0000000000
--- a/paparazzi-gradle-plugin/src/test/projects/verify-aapt-xml/src/test/java/app/cash/paparazzi/plugin/test/AaptDrawableTest.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package app.cash.paparazzi.plugin.test
-
-import android.view.View
-import android.widget.ImageView
-import app.cash.paparazzi.Paparazzi
-import org.junit.Rule
-import org.junit.Test
-
-class AaptDrawableTest {
-  @get:Rule
-  val paparazzi = Paparazzi()
-
-  @Test
-  fun aaptEmbeddedDrawable() {
-    val view = paparazzi.inflate<View>(R.layout.aapt_drawable)
-    val imageView = view.findViewById<ImageView>(R.id.image)
-    imageView.setImageResource(R.drawable.card_chip)
-    paparazzi.snapshot(view)
-  }
-}
diff --git a/paparazzi-gradle-plugin/src/test/projects/night-mode-xml/build.gradle b/paparazzi-gradle-plugin/src/test/projects/verify-aapt/build.gradle
similarity index 87%
rename from paparazzi-gradle-plugin/src/test/projects/night-mode-xml/build.gradle
rename to paparazzi-gradle-plugin/src/test/projects/verify-aapt/build.gradle
index 2a58a31c5d..5da96fd086 100644
--- a/paparazzi-gradle-plugin/src/test/projects/night-mode-xml/build.gradle
+++ b/paparazzi-gradle-plugin/src/test/projects/verify-aapt/build.gradle
@@ -10,6 +10,7 @@ android {
   compileSdk libs.versions.compileSdk.get() as int
   defaultConfig {
     minSdk libs.versions.minSdk.get() as int
+    vectorDrawables.useSupportLibrary = true
   }
   compileOptions {
     sourceCompatibility = libs.versions.javaTarget.get()
@@ -24,8 +25,6 @@ android {
 }
 
 dependencies {
+  implementation libs.androidx.appcompat
   implementation libs.composeUi.material
-
-  testImplementation libs.testParameterInjector
 }
-
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-aapt-compose/src/main/java/app/cash/paparazzi/plugin/test/CardChip.kt b/paparazzi-gradle-plugin/src/test/projects/verify-aapt/src/main/java/app/cash/paparazzi/plugin/test/CardChip.kt
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/verify-aapt-compose/src/main/java/app/cash/paparazzi/plugin/test/CardChip.kt
rename to paparazzi-gradle-plugin/src/test/projects/verify-aapt/src/main/java/app/cash/paparazzi/plugin/test/CardChip.kt
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-aapt-code/src/main/res/drawable/card_chip.xml b/paparazzi-gradle-plugin/src/test/projects/verify-aapt/src/main/res/drawable/card_chip.xml
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/verify-aapt-code/src/main/res/drawable/card_chip.xml
rename to paparazzi-gradle-plugin/src/test/projects/verify-aapt/src/main/res/drawable/card_chip.xml
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-aapt-xml/src/main/res/layout/aapt_drawable.xml b/paparazzi-gradle-plugin/src/test/projects/verify-aapt/src/main/res/layout/aapt_drawable.xml
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/verify-aapt-xml/src/main/res/layout/aapt_drawable.xml
rename to paparazzi-gradle-plugin/src/test/projects/verify-aapt/src/main/res/layout/aapt_drawable.xml
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-aapt-code/src/test/java/app/cash/paparazzi/plugin/test/AaptDrawableTest.kt b/paparazzi-gradle-plugin/src/test/projects/verify-aapt/src/test/java/app/cash/paparazzi/plugin/test/AaptDrawableTest.kt
similarity index 74%
rename from paparazzi-gradle-plugin/src/test/projects/verify-aapt-code/src/test/java/app/cash/paparazzi/plugin/test/AaptDrawableTest.kt
rename to paparazzi-gradle-plugin/src/test/projects/verify-aapt/src/test/java/app/cash/paparazzi/plugin/test/AaptDrawableTest.kt
index c735fb0572..de4f225b10 100644
--- a/paparazzi-gradle-plugin/src/test/projects/verify-aapt-code/src/test/java/app/cash/paparazzi/plugin/test/AaptDrawableTest.kt
+++ b/paparazzi-gradle-plugin/src/test/projects/verify-aapt/src/test/java/app/cash/paparazzi/plugin/test/AaptDrawableTest.kt
@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import android.widget.FrameLayout
 import android.widget.FrameLayout.LayoutParams
+import android.widget.ImageView
 import androidx.appcompat.widget.AppCompatImageView
 import app.cash.paparazzi.Paparazzi
 import org.junit.Rule
@@ -16,7 +17,15 @@ class AaptDrawableTest {
   val paparazzi = Paparazzi()
 
   @Test
-  fun aaptEmbeddedDrawable() {
+  fun inXml() {
+    val view = paparazzi.inflate<View>(R.layout.aapt_drawable)
+    val imageView = view.findViewById<ImageView>(R.id.image)
+    imageView.setImageResource(R.drawable.card_chip)
+    paparazzi.snapshot(view)
+  }
+
+  @Test
+  fun inCode() {
     val imageView = AppCompatImageView(paparazzi.context).apply {
       layoutParams = LayoutParams(dip(140), dip(140))
         .apply { gravity = CENTER }
@@ -29,6 +38,11 @@ class AaptDrawableTest {
     paparazzi.snapshot(wrapped)
   }
 
+  @Test
+  fun inCompose() {
+    paparazzi.snapshot { CardChip() }
+  }
+
   private fun View.dip(value: Int): Int =
     TypedValue.applyDimension(
       TypedValue.COMPLEX_UNIT_DIP,
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-aapt-code/src/test/resources/card_chip.png b/paparazzi-gradle-plugin/src/test/projects/verify-aapt/src/test/snapshots/images/app.cash.paparazzi.plugin.test_AaptDrawableTest_inCode.png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/verify-aapt-code/src/test/resources/card_chip.png
rename to paparazzi-gradle-plugin/src/test/projects/verify-aapt/src/test/snapshots/images/app.cash.paparazzi.plugin.test_AaptDrawableTest_inCode.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-aapt-xml/src/test/resources/card_chip.png b/paparazzi-gradle-plugin/src/test/projects/verify-aapt/src/test/snapshots/images/app.cash.paparazzi.plugin.test_AaptDrawableTest_inCompose.png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/verify-aapt-xml/src/test/resources/card_chip.png
rename to paparazzi-gradle-plugin/src/test/projects/verify-aapt/src/test/snapshots/images/app.cash.paparazzi.plugin.test_AaptDrawableTest_inCompose.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-aapt/src/test/snapshots/images/app.cash.paparazzi.plugin.test_AaptDrawableTest_inXml.png b/paparazzi-gradle-plugin/src/test/projects/verify-aapt/src/test/snapshots/images/app.cash.paparazzi.plugin.test_AaptDrawableTest_inXml.png
new file mode 100644
index 0000000000..afa00c86d5
Binary files /dev/null and b/paparazzi-gradle-plugin/src/test/projects/verify-aapt/src/test/snapshots/images/app.cash.paparazzi.plugin.test_AaptDrawableTest_inXml.png differ
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-gif/src/test/snapshots/videos/app.cash.paparazzi.plugin.test_KeypadViewTest_testViews_spin.png b/paparazzi-gradle-plugin/src/test/projects/verify-gif/src/test/snapshots/videos/app.cash.paparazzi.plugin.test_KeypadViewTest_testViews_spin.png
index 02009b96e8..48a45880db 100644
Binary files a/paparazzi-gradle-plugin/src/test/projects/verify-gif/src/test/snapshots/videos/app.cash.paparazzi.plugin.test_KeypadViewTest_testViews_spin.png and b/paparazzi-gradle-plugin/src/test/projects/verify-gif/src/test/snapshots/videos/app.cash.paparazzi.plugin.test_KeypadViewTest_testViews_spin.png differ
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-recyclerview/src/test/resources/recycler_view.png b/paparazzi-gradle-plugin/src/test/projects/verify-recyclerview/src/test/snapshots/images/app.cash.paparazzi.plugin.test_RecyclerViewTest_test.png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/verify-recyclerview/src/test/resources/recycler_view.png
rename to paparazzi-gradle-plugin/src/test/projects/verify-recyclerview/src/test/snapshots/images/app.cash.paparazzi.plugin.test_RecyclerViewTest_test.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-rendering-modes/src/test/java/app/cash/paparazzi/plugin/test/RenderingModesTest.kt b/paparazzi-gradle-plugin/src/test/projects/verify-rendering-modes/src/test/java/app/cash/paparazzi/plugin/test/RenderingModesTest.kt
index 44d1c47b4e..8dce364ba6 100644
--- a/paparazzi-gradle-plugin/src/test/projects/verify-rendering-modes/src/test/java/app/cash/paparazzi/plugin/test/RenderingModesTest.kt
+++ b/paparazzi-gradle-plugin/src/test/projects/verify-rendering-modes/src/test/java/app/cash/paparazzi/plugin/test/RenderingModesTest.kt
@@ -32,13 +32,13 @@ class RenderingModesTest {
       )
     }
 
-    paparazzi.snapshot(view = linearLayout) // defaults to NORMAL
+    paparazzi.snapshot(view = linearLayout, name = "normal") // defaults to NORMAL
     paparazzi.unsafeUpdateConfig(renderingMode = RenderingMode.H_SCROLL)
-    paparazzi.snapshot(view = linearLayout)
+    paparazzi.snapshot(view = linearLayout, name = "horizontal_scroll")
 
     paparazzi.unsafeUpdateConfig(renderingMode = RenderingMode.V_SCROLL)
     linearLayout.orientation = LinearLayout.VERTICAL
-    paparazzi.snapshot(view = linearLayout)
+    paparazzi.snapshot(view = linearLayout, name = "vertical_scroll")
 
     paparazzi.unsafeUpdateConfig(renderingMode = RenderingMode.SHRINK)
     paparazzi.snapshot(
@@ -46,7 +46,8 @@ class RenderingModesTest {
         text = "0"
         textSize = 20f
         layoutParams = LayoutParams(WRAP_CONTENT, WRAP_CONTENT)
-      }
+      },
+      name = "shrink"
     )
   }
 }
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-rendering-modes/src/test/resources/horizontal_scroll.png b/paparazzi-gradle-plugin/src/test/projects/verify-rendering-modes/src/test/snapshots/images/app.cash.paparazzi.plugin.test_RenderingModesTest_renderingModes_horizontal_scroll.png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/verify-rendering-modes/src/test/resources/horizontal_scroll.png
rename to paparazzi-gradle-plugin/src/test/projects/verify-rendering-modes/src/test/snapshots/images/app.cash.paparazzi.plugin.test_RenderingModesTest_renderingModes_horizontal_scroll.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-rendering-modes/src/test/resources/normal.png b/paparazzi-gradle-plugin/src/test/projects/verify-rendering-modes/src/test/snapshots/images/app.cash.paparazzi.plugin.test_RenderingModesTest_renderingModes_normal.png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/verify-rendering-modes/src/test/resources/normal.png
rename to paparazzi-gradle-plugin/src/test/projects/verify-rendering-modes/src/test/snapshots/images/app.cash.paparazzi.plugin.test_RenderingModesTest_renderingModes_normal.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-rendering-modes/src/test/resources/shrink.png b/paparazzi-gradle-plugin/src/test/projects/verify-rendering-modes/src/test/snapshots/images/app.cash.paparazzi.plugin.test_RenderingModesTest_renderingModes_shrink.png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/verify-rendering-modes/src/test/resources/shrink.png
rename to paparazzi-gradle-plugin/src/test/projects/verify-rendering-modes/src/test/snapshots/images/app.cash.paparazzi.plugin.test_RenderingModesTest_renderingModes_shrink.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-rendering-modes/src/test/resources/vertical_scroll.png b/paparazzi-gradle-plugin/src/test/projects/verify-rendering-modes/src/test/snapshots/images/app.cash.paparazzi.plugin.test_RenderingModesTest_renderingModes_vertical_scroll.png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/verify-rendering-modes/src/test/resources/vertical_scroll.png
rename to paparazzi-gradle-plugin/src/test/projects/verify-rendering-modes/src/test/snapshots/images/app.cash.paparazzi.plugin.test_RenderingModesTest_renderingModes_vertical_scroll.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-screen-round/src/test/java/app/cash/paparazzi/plugin/test/RoundViewTest.kt b/paparazzi-gradle-plugin/src/test/projects/verify-screen-round/src/test/java/app/cash/paparazzi/plugin/test/RoundViewTest.kt
index a9ee401eef..2b4d5b57c3 100644
--- a/paparazzi-gradle-plugin/src/test/projects/verify-screen-round/src/test/java/app/cash/paparazzi/plugin/test/RoundViewTest.kt
+++ b/paparazzi-gradle-plugin/src/test/projects/verify-screen-round/src/test/java/app/cash/paparazzi/plugin/test/RoundViewTest.kt
@@ -22,22 +22,12 @@ class RoundViewTest(
   @Test
   fun test() {
     paparazzi.snapshot(
-      view = paparazzi.inflate(R.layout.custom_view),
-      name = configuration.testName
+      view = paparazzi.inflate(R.layout.custom_view)
     )
   }
 }
 
-enum class ScreenRoundTestConfiguration(
-  val round: ScreenRound,
-  val testName: String
-) {
-  ROUND(
-    round = ScreenRound.ROUND,
-    testName = "round"
-  ),
-  NOT_ROUND(
-    round = ScreenRound.NOTROUND,
-    testName = "not_round"
-  )
+enum class ScreenRoundTestConfiguration(val round: ScreenRound) {
+  ROUND(round = ScreenRound.ROUND),
+  NOT_ROUND(round = ScreenRound.NOTROUND)
 }
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-screen-round/src/test/resources/not_round.png b/paparazzi-gradle-plugin/src/test/projects/verify-screen-round/src/test/snapshots/images/app.cash.paparazzi.plugin.test_RoundViewTest_test[NOT_ROUND].png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/verify-screen-round/src/test/resources/not_round.png
rename to paparazzi-gradle-plugin/src/test/projects/verify-screen-round/src/test/snapshots/images/app.cash.paparazzi.plugin.test_RoundViewTest_test[NOT_ROUND].png
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-screen-round/src/test/resources/round.png b/paparazzi-gradle-plugin/src/test/projects/verify-screen-round/src/test/snapshots/images/app.cash.paparazzi.plugin.test_RoundViewTest_test[ROUND].png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/verify-screen-round/src/test/resources/round.png
rename to paparazzi-gradle-plugin/src/test/projects/verify-screen-round/src/test/snapshots/images/app.cash.paparazzi.plugin.test_RoundViewTest_test[ROUND].png
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-snapshot/src/test/resources/launch.png b/paparazzi-gradle-plugin/src/test/projects/verify-snapshot/src/test/snapshots/images/app.cash.paparazzi.plugin.test_LaunchViewTest_testViews_launch.png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/verify-snapshot/src/test/resources/launch.png
rename to paparazzi-gradle-plugin/src/test/projects/verify-snapshot/src/test/snapshots/images/app.cash.paparazzi.plugin.test_LaunchViewTest_testViews_launch.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-svgs/src/test/resources/arrow_up.png b/paparazzi-gradle-plugin/src/test/projects/verify-svgs/src/test/snapshots/images/app.cash.paparazzi.plugin.test_VectorDrawableTest_vectorDrawable_arrow_up.png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/verify-svgs/src/test/resources/arrow_up.png
rename to paparazzi-gradle-plugin/src/test/projects/verify-svgs/src/test/snapshots/images/app.cash.paparazzi.plugin.test_VectorDrawableTest_vectorDrawable_arrow_up.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/widgets/src/test/resources/full_screen.png b/paparazzi-gradle-plugin/src/test/projects/widgets/src/test/snapshots/images/app.cash.paparazzi.plugin.test_RenderingModeTest_default[FULL_SCREEN].png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/widgets/src/test/resources/full_screen.png
rename to paparazzi-gradle-plugin/src/test/projects/widgets/src/test/snapshots/images/app.cash.paparazzi.plugin.test_RenderingModeTest_default[FULL_SCREEN].png
diff --git a/paparazzi-gradle-plugin/src/test/projects/widgets/src/test/resources/widget.png b/paparazzi-gradle-plugin/src/test/projects/widgets/src/test/snapshots/images/app.cash.paparazzi.plugin.test_RenderingModeTest_default[WIDGET].png
similarity index 100%
rename from paparazzi-gradle-plugin/src/test/projects/widgets/src/test/resources/widget.png
rename to paparazzi-gradle-plugin/src/test/projects/widgets/src/test/snapshots/images/app.cash.paparazzi.plugin.test_RenderingModeTest_default[WIDGET].png