diff --git a/tests/SilkFX/assets/gainmaps/cave.jpg b/tests/SilkFX/assets/gainmaps/cave.jpg
deleted file mode 100644
index fa7d3fc325d57..0000000000000
Binary files a/tests/SilkFX/assets/gainmaps/cave.jpg and /dev/null differ
diff --git a/tests/SilkFX/assets/gainmaps/city_night.jpg b/tests/SilkFX/assets/gainmaps/city_night.jpg
new file mode 100644
index 0000000000000..cdb4311ddcbeb
Binary files /dev/null and b/tests/SilkFX/assets/gainmaps/city_night.jpg differ
diff --git a/tests/SilkFX/assets/gainmaps/desert_palms.jpg b/tests/SilkFX/assets/gainmaps/desert_palms.jpg
new file mode 100644
index 0000000000000..c337aadc2d4db
Binary files /dev/null and b/tests/SilkFX/assets/gainmaps/desert_palms.jpg differ
diff --git a/tests/SilkFX/assets/gainmaps/desert_sunset.jpg b/tests/SilkFX/assets/gainmaps/desert_sunset.jpg
new file mode 100644
index 0000000000000..fa15f5606af62
Binary files /dev/null and b/tests/SilkFX/assets/gainmaps/desert_sunset.jpg differ
diff --git a/tests/SilkFX/assets/gainmaps/desert_wanda.jpg b/tests/SilkFX/assets/gainmaps/desert_wanda.jpg
new file mode 100644
index 0000000000000..33f69a92bac39
Binary files /dev/null and b/tests/SilkFX/assets/gainmaps/desert_wanda.jpg differ
diff --git a/tests/SilkFX/assets/gainmaps/fountain_night.jpg b/tests/SilkFX/assets/gainmaps/fountain_night.jpg
new file mode 100644
index 0000000000000..863127b7ac59d
Binary files /dev/null and b/tests/SilkFX/assets/gainmaps/fountain_night.jpg differ
diff --git a/tests/SilkFX/assets/gainmaps/grand_canyon.jpg b/tests/SilkFX/assets/gainmaps/grand_canyon.jpg
new file mode 100644
index 0000000000000..12cd9665776e6
Binary files /dev/null and b/tests/SilkFX/assets/gainmaps/grand_canyon.jpg differ
diff --git a/tests/SilkFX/assets/gainmaps/granddam.jpg b/tests/SilkFX/assets/gainmaps/granddam.jpg
deleted file mode 100644
index 823f14efcbb2a..0000000000000
Binary files a/tests/SilkFX/assets/gainmaps/granddam.jpg and /dev/null differ
diff --git a/tests/SilkFX/assets/gainmaps/lamps.jpg b/tests/SilkFX/assets/gainmaps/lamps.jpg
new file mode 100644
index 0000000000000..65bda89ad6607
Binary files /dev/null and b/tests/SilkFX/assets/gainmaps/lamps.jpg differ
diff --git a/tests/SilkFX/assets/gainmaps/lightbulb.jpg b/tests/SilkFX/assets/gainmaps/lightbulb.jpg
deleted file mode 100644
index 232c5f0937df2..0000000000000
Binary files a/tests/SilkFX/assets/gainmaps/lightbulb.jpg and /dev/null differ
diff --git a/tests/SilkFX/assets/gainmaps/mountain_lake.jpg b/tests/SilkFX/assets/gainmaps/mountain_lake.jpg
new file mode 100644
index 0000000000000..b2b10d287c69c
Binary files /dev/null and b/tests/SilkFX/assets/gainmaps/mountain_lake.jpg differ
diff --git a/tests/SilkFX/assets/gainmaps/mountains.jpg b/tests/SilkFX/assets/gainmaps/mountains.jpg
new file mode 100644
index 0000000000000..82acd45fc0d82
Binary files /dev/null and b/tests/SilkFX/assets/gainmaps/mountains.jpg differ
diff --git a/tests/SilkFX/assets/gainmaps/porsche911.jpg b/tests/SilkFX/assets/gainmaps/porsche911.jpg
deleted file mode 100644
index 50f4fc83910e9..0000000000000
Binary files a/tests/SilkFX/assets/gainmaps/porsche911.jpg and /dev/null differ
diff --git a/tests/SilkFX/assets/gainmaps/sunflower.jpg b/tests/SilkFX/assets/gainmaps/sunflower.jpg
new file mode 100644
index 0000000000000..55b1b14c0ff42
Binary files /dev/null and b/tests/SilkFX/assets/gainmaps/sunflower.jpg differ
diff --git a/tests/SilkFX/assets/gainmaps/train_station_night.jpg b/tests/SilkFX/assets/gainmaps/train_station_night.jpg
new file mode 100644
index 0000000000000..45142bb326eef
Binary files /dev/null and b/tests/SilkFX/assets/gainmaps/train_station_night.jpg differ
diff --git a/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapDecodeTest.kt b/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapDecodeTest.kt
index db812ace0d850..a004fb5a43051 100644
--- a/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapDecodeTest.kt
+++ b/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapDecodeTest.kt
@@ -38,7 +38,7 @@ class GainmapDecodeTest(context: Context, attrs: AttributeSet?) : LinearLayout(c
 
     private fun decode(mode: DecodeMode) {
         val source = ImageDecoder.createSource(resources.assets,
-            "gainmaps/cave.jpg")
+                "gainmaps/${context.assets.list("gainmaps")!![0]}")
 
         val sourceInfo = findViewById<TextView>(R.id.source_info)!!
 
diff --git a/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapImage.kt b/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapImage.kt
index e079b6d5e4db1..78bc4c45fa4fb 100644
--- a/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapImage.kt
+++ b/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapImage.kt
@@ -92,7 +92,7 @@ class GainmapImage(context: Context, attrs: AttributeSet?) : FrameLayout(context
             }
         }
 
-        setImage(gainmapImages.indexOf("cave.jpg"))
+        setImage(0)
 
         imageView.apply {
             isClickable = true