diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6db4d46d..d8f0130b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -21,12 +21,15 @@ jobs:
         server:
         - mir_kiosk
         - ubuntu_frame
-        - mir_test_tools
         channel: [stable]
         include:
         - server: ubuntu_frame
           channel: 24/edge
 
+        - server: mir_test_tools
+          channel: 22/stable
+          variant: noble/22/1024/1024x768
+
         - server: mir_test_tools
           channel: 24/edge
 
@@ -90,7 +93,7 @@ jobs:
     - name: Run the tests
       working-directory: mir-ci/mir_ci
       env:
-        MIR_CI_VARIANT: noble/1024/1024x768
+        MIR_CI_VARIANT: ${{ matrix.variant && matrix.variant || 'noble/1024/1024x768' }}
       run: |
         # set up coredumps
         ulimit -c unlimited
diff --git a/mir-ci/mir_ci/tests/robot/resources/osk/variants/noble/22/1024 b/mir-ci/mir_ci/tests/robot/resources/osk/variants/noble/22/1024
new file mode 120000
index 00000000..1eb906ac
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/resources/osk/variants/noble/22/1024
@@ -0,0 +1 @@
+../../1024
\ No newline at end of file
diff --git a/mir-ci/mir_ci/tests/robot/suites/drag_and_drop/variants/noble/dnd_action_copy.png b/mir-ci/mir_ci/tests/robot/suites/drag_and_drop/variants/noble/dnd_action_copy.png
index 1b937413..a82c62aa 100644
--- a/mir-ci/mir_ci/tests/robot/suites/drag_and_drop/variants/noble/dnd_action_copy.png
+++ b/mir-ci/mir_ci/tests/robot/suites/drag_and_drop/variants/noble/dnd_action_copy.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:29a492a85d1b87b74ee17c3117888c8dd23d3d0ac1a1a4d25efb332c997b175c
-size 3077
+oid sha256:d88a18fae0c5b15ccd87456f221688fe65c7cf260bfc124ede82ed1e9086fd69
+size 3019
diff --git a/mir-ci/mir_ci/tests/robot/suites/drag_and_drop/variants/noble/dnd_nothing.png b/mir-ci/mir_ci/tests/robot/suites/drag_and_drop/variants/noble/dnd_nothing.png
new file mode 100644
index 00000000..bcf2c348
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/drag_and_drop/variants/noble/dnd_nothing.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:73f24b9c92fbdb6979c34ebc4031bb87292adf15fa005e1d65b59041b657d433
+size 1257
diff --git a/mir-ci/mir_ci/tests/robot/suites/drag_and_drop/variants/noble/dnd_received_pixbuf.png b/mir-ci/mir_ci/tests/robot/suites/drag_and_drop/variants/noble/dnd_received_pixbuf.png
new file mode 100644
index 00000000..f8d93738
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/drag_and_drop/variants/noble/dnd_received_pixbuf.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:29e662594dfc8af8506a2d864afb86cf1e64b30c95f618512a0d220b3221cd88
+size 3335
diff --git a/mir-ci/mir_ci/tests/robot/suites/drag_and_drop/variants/noble/dnd_received_text.png b/mir-ci/mir_ci/tests/robot/suites/drag_and_drop/variants/noble/dnd_received_text.png
index f3e21e69..0b838bb9 100644
--- a/mir-ci/mir_ci/tests/robot/suites/drag_and_drop/variants/noble/dnd_received_text.png
+++ b/mir-ci/mir_ci/tests/robot/suites/drag_and_drop/variants/noble/dnd_received_text.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3acf8dce1ea0eec134a379e05b8b497724f7c835850cd7cbba93e993bdc4c417
-size 1946
+oid sha256:547355c3c9781a2d07e715f14d3f066aa1443a28392acde59821f94ebaac8903
+size 1954
diff --git a/mir-ci/mir_ci/tests/robot/suites/drag_and_drop/variants/noble/dnd_setup.png b/mir-ci/mir_ci/tests/robot/suites/drag_and_drop/variants/noble/dnd_setup.png
index 61519035..eadd1cc9 100644
--- a/mir-ci/mir_ci/tests/robot/suites/drag_and_drop/variants/noble/dnd_setup.png
+++ b/mir-ci/mir_ci/tests/robot/suites/drag_and_drop/variants/noble/dnd_setup.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:110f98c41ce5573c392ac90e37ce4732301f780f6e716f56fcd14802d06fa959
-size 3278
+oid sha256:7222f393331bc2bccdac8fd0735fdb50482dc71de6d98bc353c5f0bdbb2c6302
+size 3147
diff --git a/mir-ci/mir_ci/tests/robot/suites/drag_and_drop/variants/noble/dnd_sources.png b/mir-ci/mir_ci/tests/robot/suites/drag_and_drop/variants/noble/dnd_sources.png
index 1cbfa3e5..27635b25 100644
--- a/mir-ci/mir_ci/tests/robot/suites/drag_and_drop/variants/noble/dnd_sources.png
+++ b/mir-ci/mir_ci/tests/robot/suites/drag_and_drop/variants/noble/dnd_sources.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e0310402e4b43efcd93f4b454763aac5a829fb111bb0601d32a5f162626bdaac
-size 2799
+oid sha256:847fa780953c685a56b9b826a482e6684804d705b8a45f469da3bdd7e421295a
+size 2547
diff --git a/mir-ci/mir_ci/tests/robot/suites/drag_and_drop/variants/noble/dnd_target.png b/mir-ci/mir_ci/tests/robot/suites/drag_and_drop/variants/noble/dnd_target.png
index 30249dfd..4335b166 100644
--- a/mir-ci/mir_ci/tests/robot/suites/drag_and_drop/variants/noble/dnd_target.png
+++ b/mir-ci/mir_ci/tests/robot/suites/drag_and_drop/variants/noble/dnd_target.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6a638c484e1cc25f959531e5ac09b17f0b43c20c2cf4ef7a00c92bc1c3f2b971
-size 2072
+oid sha256:d059ccc62c241bd8cb1ab8363ca02df3bea143eb2fb53155164d6e9104e07fa6
+size 2079
diff --git a/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/button_close_focused.png b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/button_close_focused.png
deleted file mode 100644
index dba4aa57..00000000
--- a/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/button_close_focused.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9e8a4de128e996fa15f97ca8b9fa3a93fb8a4dd006b0879799b94e9a205f7b23
-size 830
diff --git a/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/mir_flutter_app.robot b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/mir_flutter_app.robot
index 5dbe8427..92911bb9 100644
--- a/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/mir_flutter_app.robot
+++ b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/mir_flutter_app.robot
@@ -1,5 +1,7 @@
 *** Settings ***
-Resource    ${KVM_RESOURCE}
+Resource            ${KVM_RESOURCE}
+
+Test Teardown       VIDEO.Match    ${ZERO_WINDOWS}
 
 
 *** Variables ***
@@ -8,8 +10,6 @@ ${T}                                        ${CURDIR}
 ${ANCHOR_OPTION_TOP_LEFT}                   ${T}/anchor_option_top_left.png
 ${ANCHOR_OPTION_BOTTOM_RIGHT}               ${T}/anchor_option_bottom_right.png
 
-${BUTTON_CLOSE_FOCUSED}                     ${T}/button_close_focused.png
-
 ${DIALOG_CUSTOM_POSITIONER}                 ${T}/dialog_custom_positioner.png
 
 ${EXPECTED_SATELLITE_PLACEMENT}             ${T}/expected_satellite_placement.png
@@ -30,6 +30,8 @@ ${WINDOW_SATELLITE_1}                       ${T}/window_satellite_1.png
 ${WINDOW_POPUP_1}                           ${T}/window_popup_1.png
 ${WINDOW_TIP_1}                             ${T}/window_tip_1.png
 
+${ZERO_WINDOWS}                             ${T}/zero_windows.png
+
 
 *** Test Cases ***
 Reference App Opens
@@ -43,12 +45,12 @@ Regular Window Opens
 Floating Regular Window Opens
     Open FLOATING_REGULAR Window
     VIDEO.Match             ${WINDOW_FLOATING_REGULAR_0_FOCUSED}
-    Close Focused Toplevel Window
+    Close Floating Toplevel Window
 
 Dialog Window Opens
     Open DIALOG Window
     VIDEO.Match             ${WINDOW_DIALOG_FOCUSED}
-    Close Focused Toplevel Window
+    Close Dialog Window
 
 Satellite Window Opens
     Open REGULAR Window
@@ -77,7 +79,7 @@ Floating Regular Window Stays On Top
     Click LEFT Button
     Walk Pointer To ${WINDOW_FLOATING_REGULAR_0_NON_FOCUSED}
     Click LEFT Button
-    Close Focused Toplevel Window
+    Close Floating Toplevel Window
 
 Dialog Is Modal To Parent
     Open REGULAR Window
@@ -97,7 +99,7 @@ Satellite Is Placed According To Custom Positioner
     Open FLOATING_REGULAR Window
     Open SATELLITE Window
     VIDEO.Match             ${EXPECTED_SATELLITE_PLACEMENT}
-    Close Focused Toplevel Window
+    Close Floating Toplevel Window
 
 Child Windows Move With Parent
     Open FLOATING_REGULAR Window
@@ -117,7 +119,7 @@ Child Windows Move With Parent
     Release LEFT Button
     VIDEO.Match             ${EXPECTED_WINDOW_AFTER_MOVE}
     Close Dialog Window
-    Close Focused Toplevel Window
+    Close Floating Toplevel Window
 
 Slide Constraint Is Applied
     Set Top Left Custom Positioner
@@ -129,7 +131,7 @@ Slide Constraint Is Applied
     Release LEFT Button
     Open POPUP Window
     VIDEO.Match             ${EXPECTED_POPUP_PLACEMENT_SLIDE}
-    Close Focused Toplevel Window
+    Close Floating Toplevel Window
 
 Flip Constraint Is Applied
     Set Top Left Custom Positioner
@@ -165,7 +167,7 @@ Flip Constraint Is Applied
     Release LEFT Button
     Open POPUP Window
     VIDEO.Match             ${EXPECTED_POPUP_PLACEMENT_FLIP}
-    Close Focused Toplevel Window
+    Close Floating Toplevel Window
 
 Resize Constraint Is Applied
     Set Top Left Custom Positioner
@@ -201,7 +203,7 @@ Resize Constraint Is Applied
     Release LEFT Button
     Open POPUP Window
     VIDEO.Match             ${EXPECTED_POPUP_PLACEMENT_RESIZE}
-    Close Focused Toplevel Window
+    Close Floating Toplevel Window
 
 Flip Constraint Precedes Slide
     Set Top Left Custom Positioner
@@ -227,7 +229,7 @@ Flip Constraint Precedes Slide
     Release LEFT Button
     Open POPUP Window
     VIDEO.Match             ${EXPECTED_POPUP_PLACEMENT_FLIP}
-    Close Focused Toplevel Window
+    Close Floating Toplevel Window
 
 Slide Constraint Precedes Resize
     Set Top Left Custom Positioner
@@ -253,19 +255,38 @@ Slide Constraint Precedes Resize
     Release LEFT Button
     Open POPUP Window
     VIDEO.Match             ${EXPECTED_POPUP_PLACEMENT_SLIDE}
-    Close Focused Toplevel Window
+    Close Floating Toplevel Window
 
 
 *** Keywords ***
+Wait Until ${template} Is Absent
+    Wait Until Keyword Succeeds                     5                       1
+    ...                     Run Keyword And Expect Error                    ImageNotFoundError
+    ...                     VIDEO.Match             ${template}             0
+
 Close Focused Toplevel Window
-    Walk Pointer To ${BUTTON_CLOSE_FOCUSED}
+    Move Pointer To (0, 0)
+    ${pos}=                 Move Pointer To ${WINDOW_REGULAR_0_FOCUSED}
+    ${pos}=                 Displace ${pos} By (130, 0)
+    Move Pointer To ${pos}
     Click LEFT Button
+    Wait Until ${WINDOW_REGULAR_0_FOCUSED} Is Absent
+
+Close Floating Toplevel Window
+    Move Pointer To (0, 0)
+    ${pos}=                 Move Pointer To ${WINDOW_FLOATING_REGULAR_0_FOCUSED}
+    ${pos}=                 Displace ${pos} By (138, 0)
+    Move Pointer To ${pos}
+    Click LEFT Button
+    Wait Until ${WINDOW_FLOATING_REGULAR_0_FOCUSED} Is Absent
 
 Close Dialog Window
-    ${pos}=                 Walk Pointer To ${WINDOW_DIALOG_FOCUSED}
+    Move Pointer To (0, 0)
+    ${pos}=                 Move Pointer To ${WINDOW_DIALOG_FOCUSED}
     ${pos}=                 Displace ${pos} By (112, 0)
-    Walk Pointer To ${pos}
+    Move Pointer To ${pos}
     Click LEFT Button
+    Wait Until ${WINDOW_DIALOG_FOCUSED} Is Absent
 
 Select ${preset} Positioner Preset
     ${vertical_distance_between_options}=           Set Variable            48
diff --git a/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/anchor_option_bottom_right.png b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/anchor_option_bottom_right.png
new file mode 100644
index 00000000..d3704afe
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/anchor_option_bottom_right.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5d4396a7832194f5314eacef2f9469369e4a2a59cdae665f80b79ad06725dac4
+size 1988
diff --git a/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/anchor_option_top_left.png b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/anchor_option_top_left.png
new file mode 100644
index 00000000..22e96123
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/anchor_option_top_left.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:56c2bdf8c1bdf95951272d6258d37be1e8f6fd6fe4ccbdb283d8773f2820ef66
+size 1328
diff --git a/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/dialog_custom_positioner.png b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/dialog_custom_positioner.png
new file mode 100644
index 00000000..54be5af1
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/dialog_custom_positioner.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f6e73ed48fde0dd46ccd8854e51714c880fde5a051753bd600214df7e6a4cdf0
+size 3471
diff --git a/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/expected_popup_placement_resize.png b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/expected_popup_placement_resize.png
new file mode 100644
index 00000000..b7ce5152
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/expected_popup_placement_resize.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c0461ddcbcc8a262b6f98e7fe48036af8d857d6607419c93a382cd41457d46dd
+size 7219
diff --git a/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/expected_popup_placement_slide.png b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/expected_popup_placement_slide.png
new file mode 100644
index 00000000..f1e00dbd
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/expected_popup_placement_slide.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b77c63a69756a1742f543a254dc34eb718cf77e6848b4eca864564a1afd57ca8
+size 5750
diff --git a/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/window_dialog_focused.png b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/window_dialog_focused.png
new file mode 100644
index 00000000..c1dc12a0
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/window_dialog_focused.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1a7047752f21e5ccfa64468655009ecd0cad3cbcd8997444720b4f96484b3f6a
+size 1169
diff --git a/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/window_floating_regular_0_focused.png b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/window_floating_regular_0_focused.png
new file mode 100644
index 00000000..76dfb52c
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/window_floating_regular_0_focused.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6a6b1f271f2de7f669805bb0e27705fcbe85f04451dc2359fbf6a1383c897815
+size 2388
diff --git a/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/window_floating_regular_0_non_focused.png b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/window_floating_regular_0_non_focused.png
new file mode 100644
index 00000000..9d0827ba
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/window_floating_regular_0_non_focused.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f03c19cd3461961598ffea0092031228269dde906eb6f3df006cec514272affa
+size 2345
diff --git a/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/window_main.png b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/window_main.png
new file mode 100644
index 00000000..ff4b2b3a
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/window_main.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a13c5620e911fa9d60ee512c46d73b4dd77a87d132c3ea3f1a3be95e7ed8945f
+size 28317
diff --git a/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/window_popup_1.png b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/window_popup_1.png
new file mode 100644
index 00000000..c231c009
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/window_popup_1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d496ef5ad1bd03d1d529a5b1ce5f92d9103dc2f109a18ed86f9c4abb7a83f88c
+size 2767
diff --git a/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/window_regular_0_focused.png b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/window_regular_0_focused.png
new file mode 100644
index 00000000..cc5a5be4
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/window_regular_0_focused.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:abc28c564199116e87d07658d2483907ea6afcee1b305f1776c37d0c26475770
+size 1641
diff --git a/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/window_satellite_1.png b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/window_satellite_1.png
new file mode 100644
index 00000000..772ba387
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/window_satellite_1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:79c75150f47186adcd77e0904b32d49f625b17fdf256dbcba0e16e0a4d254942
+size 2413
diff --git a/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/window_tip_1.png b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/window_tip_1.png
new file mode 100644
index 00000000..281d7c0a
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/window_tip_1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c32972cfb1f5523507511555941a435b36ce1187c21a16ae664b553ca8418b83
+size 2129
diff --git a/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/zero_windows.png b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/zero_windows.png
new file mode 100644
index 00000000..a8f99773
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/variants/noble/22/zero_windows.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a4fece3ec28d13df82d934e35c163e89e88e889ce007752c7cdf896accfea87b
+size 1674
diff --git a/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/zero_windows.png b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/zero_windows.png
new file mode 100644
index 00000000..e981ffdc
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/zero_windows.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8334dd490247ee9463d13c4572ee064bbe34b65cef0591212025c5da9a2bd411
+size 1697
diff --git a/mir-ci/mir_ci/tests/robot/suites/osk/variants/noble/01_pluma.png b/mir-ci/mir_ci/tests/robot/suites/osk/variants/noble/01_pluma.png
index 2c0c419e..8be23a22 100644
--- a/mir-ci/mir_ci/tests/robot/suites/osk/variants/noble/01_pluma.png
+++ b/mir-ci/mir_ci/tests/robot/suites/osk/variants/noble/01_pluma.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9277f6d4793b9ae796652ca76a98eb27ef1be60fb812f6d3f142d7f6cd0bf90b
-size 3574
+oid sha256:875f6a272af28886b4ae0c3009631ace08653db4adaf36011dfe387cb97fcd9c
+size 3208
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/1.0-gtk4-demo-button-combo-boxes-maximized.png b/mir-ci/mir_ci/tests/robot/suites/scale/1.0-gtk4-demo-button-combo-boxes-maximized.png
deleted file mode 100644
index d54279f1..00000000
--- a/mir-ci/mir_ci/tests/robot/suites/scale/1.0-gtk4-demo-button-combo-boxes-maximized.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4e799a91cd9d7de2db56dc8374ff197d3892275f6d4a904c553f8552ac37c5bb
-size 1453
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/1.0-gtk4-demo-title-combo-boxes-maximized.png b/mir-ci/mir_ci/tests/robot/suites/scale/1.0-gtk4-demo-title-combo-boxes-maximized.png
deleted file mode 100644
index a861193b..00000000
--- a/mir-ci/mir_ci/tests/robot/suites/scale/1.0-gtk4-demo-title-combo-boxes-maximized.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3b130bef713e46b217b2dbab58c234f23f09a626e421e2dde6eec6ac57a72c2e
-size 1599
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/1.25-gtk4-demo-button-combo-boxes-maximized.png b/mir-ci/mir_ci/tests/robot/suites/scale/1.25-gtk4-demo-button-combo-boxes-maximized.png
deleted file mode 100644
index 71363905..00000000
--- a/mir-ci/mir_ci/tests/robot/suites/scale/1.25-gtk4-demo-button-combo-boxes-maximized.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:df0508c85f9ba9a4312a119c4c19289095c17af16e720ecc69b7c862f3e0a45d
-size 2849
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/1.25-gtk4-demo-screenshot-floating.png b/mir-ci/mir_ci/tests/robot/suites/scale/1.25-gtk4-demo-screenshot-floating.png
deleted file mode 100644
index a7e6baf4..00000000
--- a/mir-ci/mir_ci/tests/robot/suites/scale/1.25-gtk4-demo-screenshot-floating.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f3096399546d5dc7edcb4a952f535b16bd76bcf9619e1923407e84fdc1fab7b2
-size 123031
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/1.25-gtk4-demo-screenshot-maximized.png b/mir-ci/mir_ci/tests/robot/suites/scale/1.25-gtk4-demo-screenshot-maximized.png
deleted file mode 100644
index d44445d9..00000000
--- a/mir-ci/mir_ci/tests/robot/suites/scale/1.25-gtk4-demo-screenshot-maximized.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5ab4e93a718d335a7878faf695cf5dcafce028911a2c96fb373d2edfa505e290
-size 104717
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/1.25-gtk4-demo-title-app-title.png b/mir-ci/mir_ci/tests/robot/suites/scale/1.25-gtk4-demo-title-app-title.png
deleted file mode 100644
index 27440df9..00000000
--- a/mir-ci/mir_ci/tests/robot/suites/scale/1.25-gtk4-demo-title-app-title.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2d870151c7a783cb9a91e23f936c5f14a7a471b5f7ca6ff86c9d06664aa1012e
-size 2157
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/1.25-gtk4-demo-title-combo-boxes-maximized.png b/mir-ci/mir_ci/tests/robot/suites/scale/1.25-gtk4-demo-title-combo-boxes-maximized.png
deleted file mode 100644
index cd1bf6f0..00000000
--- a/mir-ci/mir_ci/tests/robot/suites/scale/1.25-gtk4-demo-title-combo-boxes-maximized.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:22d3d5c29f352f1613f46bbfb09f6c2b4921c98e59ea403900655e3c82362950
-size 2914
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/1.5-gtk4-demo-button-combo-boxes-maximized.png b/mir-ci/mir_ci/tests/robot/suites/scale/1.5-gtk4-demo-button-combo-boxes-maximized.png
deleted file mode 100644
index 0217998b..00000000
--- a/mir-ci/mir_ci/tests/robot/suites/scale/1.5-gtk4-demo-button-combo-boxes-maximized.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8d4b157c2db3fe9b3a4fc730d7abde8442ba36d2409225bec818c58a37f6f584
-size 3843
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/1.5-gtk4-demo-title-combo-boxes-maximized.png b/mir-ci/mir_ci/tests/robot/suites/scale/1.5-gtk4-demo-title-combo-boxes-maximized.png
deleted file mode 100644
index adfb82c6..00000000
--- a/mir-ci/mir_ci/tests/robot/suites/scale/1.5-gtk4-demo-title-combo-boxes-maximized.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:454ce515253301240cd7408ec0dc58312391bbc8d180e30d2773760aedf8102d
-size 2810
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/1.75-gtk4-demo-button-combo-boxes-maximized.png b/mir-ci/mir_ci/tests/robot/suites/scale/1.75-gtk4-demo-button-combo-boxes-maximized.png
deleted file mode 100644
index 431403d3..00000000
--- a/mir-ci/mir_ci/tests/robot/suites/scale/1.75-gtk4-demo-button-combo-boxes-maximized.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d8456ffdfcc85ddddf85017836a13209be60ea998f0a56473adcd9a1c1a5d04d
-size 4042
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/1.75-gtk4-demo-screenshot-floating.png b/mir-ci/mir_ci/tests/robot/suites/scale/1.75-gtk4-demo-screenshot-floating.png
deleted file mode 100644
index ff35fe0c..00000000
--- a/mir-ci/mir_ci/tests/robot/suites/scale/1.75-gtk4-demo-screenshot-floating.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7a1e94d2577e1b11f9082a1d6b57d9209d57e7aff1625c40a2e62e476e7d417a
-size 177619
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/1.75-gtk4-demo-screenshot-maximized.png b/mir-ci/mir_ci/tests/robot/suites/scale/1.75-gtk4-demo-screenshot-maximized.png
deleted file mode 100644
index a9503d72..00000000
--- a/mir-ci/mir_ci/tests/robot/suites/scale/1.75-gtk4-demo-screenshot-maximized.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:885bee3556642d5451bb1aefd6d9fe55e3d09bf2829daac0a728d4e1f62bf21a
-size 170068
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/1.75-gtk4-demo-title-app-title.png b/mir-ci/mir_ci/tests/robot/suites/scale/1.75-gtk4-demo-title-app-title.png
deleted file mode 100644
index 52b4c1ae..00000000
--- a/mir-ci/mir_ci/tests/robot/suites/scale/1.75-gtk4-demo-title-app-title.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c80b3d8fa2d63a522ce698f8eccdea2484cdc0029b17f75f8ed3934471512b5a
-size 3287
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/1.75-gtk4-demo-title-combo-boxes-maximized.png b/mir-ci/mir_ci/tests/robot/suites/scale/1.75-gtk4-demo-title-combo-boxes-maximized.png
deleted file mode 100644
index 60351553..00000000
--- a/mir-ci/mir_ci/tests/robot/suites/scale/1.75-gtk4-demo-title-combo-boxes-maximized.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bc7bf27ef01998654e58b91cd030b03b7d1d5851704fe06831e987cae52f9f03
-size 2881
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/2.0-gtk4-demo-button-combo-boxes-maximized.png b/mir-ci/mir_ci/tests/robot/suites/scale/2.0-gtk4-demo-button-combo-boxes-maximized.png
deleted file mode 100644
index 378ca686..00000000
--- a/mir-ci/mir_ci/tests/robot/suites/scale/2.0-gtk4-demo-button-combo-boxes-maximized.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:758e7facc7cd645934e7cd1573e0c811357fef3f3be074fb8f74b376e4dd573f
-size 3358
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/2.0-gtk4-demo-title-combo-boxes-maximized.png b/mir-ci/mir_ci/tests/robot/suites/scale/2.0-gtk4-demo-title-combo-boxes-maximized.png
deleted file mode 100644
index bfb3e464..00000000
--- a/mir-ci/mir_ci/tests/robot/suites/scale/2.0-gtk4-demo-title-combo-boxes-maximized.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dbefc3b27d9d9c1caa4fe10a7aa06c8f3a33be9d89c1fe020b1c057642e9b8e4
-size 3984
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/1.0-gtk4-demo-button.png b/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/1.0-gtk4-demo-button.png
new file mode 100644
index 00000000..084ade31
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/1.0-gtk4-demo-button.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:908dffd81ac2af83e05a8e866e892cbf26c4c57f1b1584ba2053202ee77b7efb
+size 852
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/1.0-gtk4-demo-screenshot.png b/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/1.0-gtk4-demo-screenshot.png
new file mode 100644
index 00000000..dba166cf
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/1.0-gtk4-demo-screenshot.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:09da697e34f6d7e4f56fdc13d93c2119587d9dbe0d6610e7734bf57f35045396
+size 41012
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/1.0-gtk4-demo-title-main.png b/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/1.0-gtk4-demo-title-main.png
new file mode 100644
index 00000000..366d46e4
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/1.0-gtk4-demo-title-main.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e22c1c3fe37aa4e0ed14fea0d0bd6bca4a6134b64f860f440873531ed3236775
+size 1557
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/1.0-gtk4-demo-title.png b/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/1.0-gtk4-demo-title.png
new file mode 100644
index 00000000..7e491d1b
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/1.0-gtk4-demo-title.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fd3fa2d1c1eadea552a2f0685310b51154e94095724b7192dbe927291dbfa7ab
+size 1104
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/1.5-gtk4-demo-button.png b/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/1.5-gtk4-demo-button.png
new file mode 100644
index 00000000..76986199
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/1.5-gtk4-demo-button.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cf5d7652b4920525e499a3d5878c8b7e8f1b16ec3c801da31105b05c26c3021c
+size 4568
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/1.5-gtk4-demo-screenshot.png b/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/1.5-gtk4-demo-screenshot.png
new file mode 100644
index 00000000..0b77879b
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/1.5-gtk4-demo-screenshot.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:085130e0d8ca2866d2af6c7de46f3fb307ca0fe7ff5a7f27b9a5b9facd30e7b0
+size 136060
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/1.5-gtk4-demo-title-main-half.png b/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/1.5-gtk4-demo-title-main-half.png
new file mode 100644
index 00000000..f256f27b
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/1.5-gtk4-demo-title-main-half.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9e010a7b3aca14511448d68fc60bd01704088988269300d32b5417c054f3e010
+size 3528
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/1.5-gtk4-demo-title-main.png b/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/1.5-gtk4-demo-title-main.png
new file mode 100644
index 00000000..88a1f294
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/1.5-gtk4-demo-title-main.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8eb52bbedb335620e14a0f448096fbff07200fa3ac275a204bb006e3659a2be9
+size 3375
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/1.5-gtk4-demo-title.png b/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/1.5-gtk4-demo-title.png
new file mode 100644
index 00000000..4270c2c0
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/1.5-gtk4-demo-title.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e0eb5df2bf2030aebacec2df215f4c0619bdf61659065c1ec60b1ff2ab017fa
+size 4790
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/2.0-gtk4-demo-button.png b/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/2.0-gtk4-demo-button.png
new file mode 100644
index 00000000..dc2a729e
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/2.0-gtk4-demo-button.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7d4c991433ad650f9389140104a0fb4d351486dfab5fd78ec1ffc6b9a26d8820
+size 1898
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/2.0-gtk4-demo-screenshot.png b/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/2.0-gtk4-demo-screenshot.png
new file mode 100644
index 00000000..2ef91ec2
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/2.0-gtk4-demo-screenshot.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0f14ff7ff3222409336371ba02e0ab889f13ff7f5c174e61c5bd2c72f6415442
+size 59474
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/2.0-gtk4-demo-title-main.png b/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/2.0-gtk4-demo-title-main.png
new file mode 100644
index 00000000..22ab64a2
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/2.0-gtk4-demo-title-main.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:675d4a6f0037e67e2c9e5d0d0d3b074da68ea2c4a57c3ba817e84d39706c8ddf
+size 2915
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/2.0-gtk4-demo-title.png b/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/2.0-gtk4-demo-title.png
new file mode 100644
index 00000000..59ef4005
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/scale/variants/noble/2.0-gtk4-demo-title.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:53a691b5b4fbaea0299c1d3eca72703c38fe6812e22b81185e465cccf3e9547c
+size 1865
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/variants/oracular/1.0-gtk4-demo-button.png b/mir-ci/mir_ci/tests/robot/suites/scale/variants/oracular/1.0-gtk4-demo-button.png
new file mode 100644
index 00000000..6b1964ce
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/scale/variants/oracular/1.0-gtk4-demo-button.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:53ba9acd4336eec7ed7d4d30d96d72d4f703e76cd7e2ff8da26bac6af5955bf7
+size 1002
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/variants/oracular/1.0-gtk4-demo-screenshot.png b/mir-ci/mir_ci/tests/robot/suites/scale/variants/oracular/1.0-gtk4-demo-screenshot.png
new file mode 100644
index 00000000..563b259b
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/scale/variants/oracular/1.0-gtk4-demo-screenshot.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3cef913711c6659cf66806b9c1a5af345ebdaf45072823537ba5aa49101b12df
+size 47903
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/variants/oracular/1.5-gtk4-demo-screenshot.png b/mir-ci/mir_ci/tests/robot/suites/scale/variants/oracular/1.5-gtk4-demo-screenshot.png
new file mode 100644
index 00000000..74881dd8
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/scale/variants/oracular/1.5-gtk4-demo-screenshot.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3e5ee8a598b9543fa9082f770b48e332f03920812a36e657e32457f9707ee142
+size 147655
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/variants/oracular/2.0-gtk4-demo-screenshot.png b/mir-ci/mir_ci/tests/robot/suites/scale/variants/oracular/2.0-gtk4-demo-screenshot.png
new file mode 100644
index 00000000..6a5ab8fd
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/scale/variants/oracular/2.0-gtk4-demo-screenshot.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:940bbc0aca43d81efa05d622fa5230fb2f89135995ad2793eac64d740a87c043
+size 77211
diff --git a/mir-ci/mir_ci/tests/test_mir_flutter_app.py b/mir-ci/mir_ci/tests/test_mir_flutter_app.py
index cc56cd02..3f11916b 100644
--- a/mir-ci/mir_ci/tests/test_mir_flutter_app.py
+++ b/mir-ci/mir_ci/tests/test_mir_flutter_app.py
@@ -50,6 +50,8 @@ async def test_mir_flutter_app(self, robot_log, server, app, tmp_path) -> None:
 
         async with server_instance, server_instance.program(App(app.command[0], app.app_type)) as app:
             tuple((tmp_path / k).symlink_to(v) for k, v in assets.items())
-            robot = server_instance.program(App(("robot", "-d", tmp_path, "--log", robot_log, tmp_path)))
+            robot = server_instance.program(
+                App(("robot", "--exitonfailure", "-d", tmp_path, "--log", robot_log, tmp_path))
+            )
             async with robot:
                 await robot.wait(120)