diff --git a/tests/tests/swfs/from_shumway/3_joystick/input.json b/tests/tests/swfs/from_shumway/3_joystick/input.json
index a66bc67c5552..32b8dd903f11 100644
--- a/tests/tests/swfs/from_shumway/3_joystick/input.json
+++ b/tests/tests/swfs/from_shumway/3_joystick/input.json
@@ -1,4 +1,5 @@
 [
+  {"type": "Wait"},
   {"type": "Wait"},
   {"type": "MouseMove", "pos": [115.1, 116]},
   {"type": "Wait"},
diff --git a/tests/tests/swfs/from_shumway/3_joystick/output.expected.png b/tests/tests/swfs/from_shumway/3_joystick/output.expected.png
index a8814e6bb050..8fb88392caf1 100644
Binary files a/tests/tests/swfs/from_shumway/3_joystick/output.expected.png and b/tests/tests/swfs/from_shumway/3_joystick/output.expected.png differ
diff --git a/tests/tests/swfs/from_shumway/3_joystick/test.toml b/tests/tests/swfs/from_shumway/3_joystick/test.toml
index 1b004f9a3fdf..b5618190310a 100644
--- a/tests/tests/swfs/from_shumway/3_joystick/test.toml
+++ b/tests/tests/swfs/from_shumway/3_joystick/test.toml
@@ -1,7 +1,15 @@
-num_ticks = 20
+num_ticks = 21
 
 [image_comparisons.output]
-tolerance = 3
+trigger = 2
+
+[[image_comparisons.output.checks]]
+tolerance = 128
+max_outliers = 0
+
+[[image_comparisons.output.checks]]
+tolerance = 32
+max_outliers = 2500
 
 [player_options]
-with_renderer = { optional = true, quality = "low" }
+with_renderer = { optional = true, quality = "high" }
diff --git a/tests/tests/swfs/from_shumway/acid/acid-blend-2/output.10.expected.png b/tests/tests/swfs/from_shumway/acid/acid-blend-2/output.10.expected.png
new file mode 100644
index 000000000000..6655220da4df
Binary files /dev/null and b/tests/tests/swfs/from_shumway/acid/acid-blend-2/output.10.expected.png differ
diff --git a/tests/tests/swfs/from_shumway/acid/acid-blend-2/output.15.expected.png b/tests/tests/swfs/from_shumway/acid/acid-blend-2/output.15.expected.png
new file mode 100644
index 000000000000..d14fecdaa0b7
Binary files /dev/null and b/tests/tests/swfs/from_shumway/acid/acid-blend-2/output.15.expected.png differ
diff --git a/tests/tests/swfs/from_shumway/acid/acid-blend-2/output.20.expected.png b/tests/tests/swfs/from_shumway/acid/acid-blend-2/output.20.expected.png
new file mode 100644
index 000000000000..5ae46d436746
Binary files /dev/null and b/tests/tests/swfs/from_shumway/acid/acid-blend-2/output.20.expected.png differ
diff --git a/tests/tests/swfs/from_shumway/acid/acid-blend-2/output.26.expected.png b/tests/tests/swfs/from_shumway/acid/acid-blend-2/output.26.expected.png
new file mode 100644
index 000000000000..a5f5063f14ed
Binary files /dev/null and b/tests/tests/swfs/from_shumway/acid/acid-blend-2/output.26.expected.png differ
diff --git a/tests/tests/swfs/from_shumway/acid/acid-blend-2/output.40.expected.png b/tests/tests/swfs/from_shumway/acid/acid-blend-2/output.40.expected.png
new file mode 100644
index 000000000000..aea7a92c3062
Binary files /dev/null and b/tests/tests/swfs/from_shumway/acid/acid-blend-2/output.40.expected.png differ
diff --git a/tests/tests/swfs/from_shumway/acid/acid-blend-2/output.expected.png b/tests/tests/swfs/from_shumway/acid/acid-blend-2/output.expected.png
deleted file mode 100644
index a06c7986ddcb..000000000000
Binary files a/tests/tests/swfs/from_shumway/acid/acid-blend-2/output.expected.png and /dev/null differ
diff --git a/tests/tests/swfs/from_shumway/acid/acid-blend-2/test.toml b/tests/tests/swfs/from_shumway/acid/acid-blend-2/test.toml
index 7b42e8a7fdf3..6ca79009577e 100644
--- a/tests/tests/swfs/from_shumway/acid/acid-blend-2/test.toml
+++ b/tests/tests/swfs/from_shumway/acid/acid-blend-2/test.toml
@@ -1,10 +1,67 @@
 # Test adapted from Shumway at https://github.com/mozilla/shumway/tree/master/test/swfs/acid
 
-num_frames = 30
+num_frames = 40
 
-[image_comparisons.output]
-tolerance = 15
-max_outliers = 24
+# FIXME The graphics could be better, the texture is too "rough" in Ruffle.
+
+[image_comparisons."output.10"]
+trigger = 10
+
+[[image_comparisons."output.10".checks]]
+tolerance = 20
+max_outliers = 5000
+
+[[image_comparisons."output.10".checks]]
+tolerance = 130
+max_outliers = 0
+
+[image_comparisons."output.15"]
+trigger = 15
+
+[[image_comparisons."output.15".checks]]
+tolerance = 20
+max_outliers = 6000
+
+[[image_comparisons."output.15".checks]]
+tolerance = 135
+max_outliers = 0
+
+[image_comparisons."output.20"]
+trigger = 20
+
+[[image_comparisons."output.20".checks]]
+tolerance = 20
+max_outliers = 5500
+
+[[image_comparisons."output.20".checks]]
+tolerance = 130
+max_outliers = 0
+
+[image_comparisons."output.26"]
+trigger = 26
+
+[[image_comparisons."output.26".checks]]
+tolerance = 20
+max_outliers = 6000
+
+[[image_comparisons."output.26".checks]]
+tolerance = 120
+max_outliers = 0
+
+[image_comparisons."output.40"]
+trigger = 40
+
+[[image_comparisons."output.40".checks]]
+tolerance = 20
+max_outliers = 9000
+
+[[image_comparisons."output.40".checks]]
+tolerance = 40
+max_outliers = 1500
+
+[[image_comparisons."output.40".checks]]
+tolerance = 160
+max_outliers = 0
 
 [player_options]
-with_renderer = { optional = false, quality = "low" }
+with_renderer = { optional = false, quality = "high" }
diff --git a/tests/tests/swfs/from_shumway/acid/acid-clip/output.expected.png b/tests/tests/swfs/from_shumway/acid/acid-clip/output.expected.png
index e5b8368db7c5..fd36aa891563 100644
Binary files a/tests/tests/swfs/from_shumway/acid/acid-clip/output.expected.png and b/tests/tests/swfs/from_shumway/acid/acid-clip/output.expected.png differ
diff --git a/tests/tests/swfs/from_shumway/acid/acid-clip/test.toml b/tests/tests/swfs/from_shumway/acid/acid-clip/test.toml
index 36fe1b0dbfb7..f7d7614914c1 100644
--- a/tests/tests/swfs/from_shumway/acid/acid-clip/test.toml
+++ b/tests/tests/swfs/from_shumway/acid/acid-clip/test.toml
@@ -2,8 +2,17 @@
 
 num_frames = 1
 
-[image_comparisons.output]
-tolerance = 1
+[[image_comparisons.output.checks]]
+tolerance = 150
+max_outliers = 0
+
+[[image_comparisons.output.checks]]
+tolerance = 64
+max_outliers = 125
+
+[[image_comparisons.output.checks]]
+tolerance = 0
+max_outliers = 7000
 
 [player_options]
-with_renderer = { optional = false, quality = "low" }
+with_renderer = { optional = false, quality = "high" }