diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.0-gtk4-demo-screenshot-floating.png b/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.0-gtk4-demo-screenshot-floating.png
deleted file mode 100644
index ef2ed78f..00000000
--- a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.0-gtk4-demo-screenshot-floating.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ccf2f6a71b447914ab99172f9f9df4f9c5baef89a83213ed6d8267d940ea1092
-size 48518
diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.0-gtk4-demo-screenshot-maximized.png b/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.0-gtk4-demo-screenshot-maximized.png
deleted file mode 100644
index 6ccf3ec4..00000000
--- a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.0-gtk4-demo-screenshot-maximized.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:33ab656bd19098b246b1c98ca2b271213ec7c5e730043bf17b307f34a95befa8
-size 52146
diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.5-gtk4-demo-screenshot-floating.png b/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.5-gtk4-demo-screenshot-floating.png
deleted file mode 100644
index b7058442..00000000
--- a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.5-gtk4-demo-screenshot-floating.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fcb071f6cd8de6e596af53487e87d5eb493ff4b86b473c79264373d348810b83
-size 156788
diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.5-gtk4-demo-screenshot-maximized.png b/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.5-gtk4-demo-screenshot-maximized.png
deleted file mode 100644
index c539085b..00000000
--- a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.5-gtk4-demo-screenshot-maximized.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d84a5a5e2129a6df836dd594e67db35754b5d3c0a4604d4ca7bf6db19863729e
-size 158927
diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/2.0-gtk4-demo-button-builder.png b/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/2.0-gtk4-demo-button-builder.png
deleted file mode 100644
index 11dcd672..00000000
--- a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/2.0-gtk4-demo-button-builder.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9758cc576117397dba1265e20ca0331095ec981d4aa62bec45049844e819ce4a
-size 2439
diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/2.0-gtk4-demo-screenshot-floating.png b/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/2.0-gtk4-demo-screenshot-floating.png
deleted file mode 100644
index c5d21a43..00000000
--- a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/2.0-gtk4-demo-screenshot-floating.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b6684e562ba92480b865268726d50357f087427f99c4c81889d6ebbe5b3697d4
-size 106883
diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/2.0-gtk4-demo-screenshot-maximized.png b/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/2.0-gtk4-demo-screenshot-maximized.png
deleted file mode 100644
index cf8191d4..00000000
--- a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/2.0-gtk4-demo-screenshot-maximized.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f89665fd5aa05af514da56eb98ec359210acc6d4e555ac8bd7f4448c6d2cf932
-size 122807
diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/fractional_scale_v1.robot b/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/fractional_scale_v1.robot
deleted file mode 100644
index 95a99d08..00000000
--- a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/fractional_scale_v1.robot
+++ /dev/null
@@ -1,59 +0,0 @@
-*** Settings ***
-Resource        ${KVM_RESOURCE}
-
-Test Setup      Set Output Scale    ${SCALE}
-
-
-*** Variables ***
-<<<<<<< HEAD
-${T}                ${CURDIR}
-${COMBO-BOXES}      ${T}/${SCALE}-gtk4-demo-button-combo-boxes-maximized.png
-=======
-${T}                        ${CURDIR}
-${FLOATING-SCREENSHOT}      ${T}/${SCALE}-gtk4-demo-screenshot-floating.png
-${MAXIMIZED-SCREENSHOT}     ${T}/${SCALE}-gtk4-demo-screenshot-maximized.png
-${DEMO-APP-TITLE}           ${T}/${SCALE}-gtk4-demo-title-app-title.png
-${DEMO-APP-TITLE-HALF}      ${T}/${SCALE}-gtk4-demo-title-app-title-half.png
-${BUILDER-BUTTON}           ${T}/${SCALE}-gtk4-demo-button-builder.png
-${BUILDER-TITLE}            ${T}/${SCALE}-gtk4-demo-title-builder.png
->>>>>>> b06e541 (scale: add half-aligned title template)
-
-
-*** Test Cases ***
-Ensure Scaling Is Visually Correct
-    Move Pointer To Proportional (1.0, 1.0)
-    Match                   ${T}/${SCALE}-gtk4-demo-screenshot-floating.png
-
-<<<<<<< HEAD
-    Walk Pointer To ${T}/${SCALE}-gtk4-demo-title-app-title.png
-=======
-    ${aligned}=             Run Keyword And Return Status
-    ...                     Walk Pointer To ${DEMO-APP-TITLE}
-    IF    ${aligned} == False    Walk Pointer To ${DEMO-APP-TITLE-HALF}
->>>>>>> b06e541 (scale: add half-aligned title template)
-    Click LEFT Button
-    Click LEFT Button
-    Move Pointer To Proportional (1.0, 1.0)
-
-    Match                   ${T}/${SCALE}-gtk4-demo-screenshot-maximized.png
-
-    Walk Pointer To ${T}/${SCALE}-gtk4-demo-title-app-title.png
-    Click LEFT Button
-    Click LEFT Button
-
-Click Button With Fractional Scaling Enabled
-    Move Pointer To Proportional (1.0, 1.0)
-<<<<<<< HEAD
-    Walk Pointer To ${T}/${SCALE}-gtk4-demo-title-app-title.png
-=======
-    ${aligned}=             Run Keyword And Return Status
-    ...                     Walk Pointer To ${DEMO-APP-TITLE}
-    IF    ${aligned} == False    Walk Pointer To ${DEMO-APP-TITLE-HALF}
->>>>>>> b06e541 (scale: add half-aligned title template)
-    Click LEFT Button
-    Click LEFT Button
-
-    Move Pointer To ${COMBO-BOXES}
-    Click LEFT Button
-
-    Match                   ${T}/${SCALE}-gtk4-demo-title-combo-boxes-maximized.png
diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/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
similarity index 100%
rename from mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.0-gtk4-demo-button-combo-boxes-maximized.png
rename to mir-ci/mir_ci/tests/robot/suites/scale/1.0-gtk4-demo-button-combo-boxes-maximized.png
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/1.0-gtk4-demo-button.png b/mir-ci/mir_ci/tests/robot/suites/scale/1.0-gtk4-demo-button.png
new file mode 100644
index 00000000..e2d05628
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/scale/1.0-gtk4-demo-button.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:07fe4c9c6c6d765eb945ffef0310fcd66166069d164eb94669793a0f7e91cb32
+size 865
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/1.0-gtk4-demo-screenshot.png b/mir-ci/mir_ci/tests/robot/suites/scale/1.0-gtk4-demo-screenshot.png
new file mode 100644
index 00000000..bf22365e
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/scale/1.0-gtk4-demo-screenshot.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2ef39906daf81d20ecfc714c07406ad354fd189430de759cca5b31e58b772810
+size 47089
diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/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
similarity index 100%
rename from mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.0-gtk4-demo-title-combo-boxes-maximized.png
rename to mir-ci/mir_ci/tests/robot/suites/scale/1.0-gtk4-demo-title-combo-boxes-maximized.png
diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.0-gtk4-demo-title-app-title.png b/mir-ci/mir_ci/tests/robot/suites/scale/1.0-gtk4-demo-title-main.png
similarity index 100%
rename from mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.0-gtk4-demo-title-app-title.png
rename to mir-ci/mir_ci/tests/robot/suites/scale/1.0-gtk4-demo-title-main.png
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/1.0-gtk4-demo-title.png b/mir-ci/mir_ci/tests/robot/suites/scale/1.0-gtk4-demo-title.png
new file mode 100644
index 00000000..4741b483
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/scale/1.0-gtk4-demo-title.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:75d52ce7aa1a61d7ac9fa5ad772b0724d5e00d2fd68a020c2a424583e4764e28
+size 1018
diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/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
similarity index 100%
rename from mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.25-gtk4-demo-button-combo-boxes-maximized.png
rename to mir-ci/mir_ci/tests/robot/suites/scale/1.25-gtk4-demo-button-combo-boxes-maximized.png
diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.25-gtk4-demo-screenshot-floating.png b/mir-ci/mir_ci/tests/robot/suites/scale/1.25-gtk4-demo-screenshot-floating.png
similarity index 100%
rename from mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.25-gtk4-demo-screenshot-floating.png
rename to mir-ci/mir_ci/tests/robot/suites/scale/1.25-gtk4-demo-screenshot-floating.png
diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.25-gtk4-demo-screenshot-maximized.png b/mir-ci/mir_ci/tests/robot/suites/scale/1.25-gtk4-demo-screenshot-maximized.png
similarity index 100%
rename from mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.25-gtk4-demo-screenshot-maximized.png
rename to mir-ci/mir_ci/tests/robot/suites/scale/1.25-gtk4-demo-screenshot-maximized.png
diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/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
similarity index 100%
rename from mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.25-gtk4-demo-title-app-title.png
rename to mir-ci/mir_ci/tests/robot/suites/scale/1.25-gtk4-demo-title-app-title.png
diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/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
similarity index 100%
rename from mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.25-gtk4-demo-title-combo-boxes-maximized.png
rename to mir-ci/mir_ci/tests/robot/suites/scale/1.25-gtk4-demo-title-combo-boxes-maximized.png
diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/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
similarity index 100%
rename from mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.5-gtk4-demo-button-combo-boxes-maximized.png
rename to mir-ci/mir_ci/tests/robot/suites/scale/1.5-gtk4-demo-button-combo-boxes-maximized.png
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/1.5-gtk4-demo-button.png b/mir-ci/mir_ci/tests/robot/suites/scale/1.5-gtk4-demo-button.png
new file mode 100644
index 00000000..703b9421
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/scale/1.5-gtk4-demo-button.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a9ae9ae2741ece901fc6a48a1d98dec6c327794c30a2fe3f2ec553824746be10
+size 4329
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/1.5-gtk4-demo-screenshot.png b/mir-ci/mir_ci/tests/robot/suites/scale/1.5-gtk4-demo-screenshot.png
new file mode 100644
index 00000000..279c14e4
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/scale/1.5-gtk4-demo-screenshot.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:06499c41e7c298a3e4db14b24f2fad3fe5cc4b6c753c5c25680f23b39020d84b
+size 128599
diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/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
similarity index 100%
rename from mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.5-gtk4-demo-title-combo-boxes-maximized.png
rename to mir-ci/mir_ci/tests/robot/suites/scale/1.5-gtk4-demo-title-combo-boxes-maximized.png
diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.5-gtk4-demo-title-app-title-half.png b/mir-ci/mir_ci/tests/robot/suites/scale/1.5-gtk4-demo-title-main-half.png
similarity index 100%
rename from mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.5-gtk4-demo-title-app-title-half.png
rename to mir-ci/mir_ci/tests/robot/suites/scale/1.5-gtk4-demo-title-main-half.png
diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.5-gtk4-demo-title-app-title.png b/mir-ci/mir_ci/tests/robot/suites/scale/1.5-gtk4-demo-title-main.png
similarity index 100%
rename from mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.5-gtk4-demo-title-app-title.png
rename to mir-ci/mir_ci/tests/robot/suites/scale/1.5-gtk4-demo-title-main.png
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/1.5-gtk4-demo-title.png b/mir-ci/mir_ci/tests/robot/suites/scale/1.5-gtk4-demo-title.png
new file mode 100644
index 00000000..753464ce
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/scale/1.5-gtk4-demo-title.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3298683b230d3c979b149415df6921e49397ef0adf1dac6438d184b32b040916
+size 4573
diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/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
similarity index 100%
rename from mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.75-gtk4-demo-button-combo-boxes-maximized.png
rename to mir-ci/mir_ci/tests/robot/suites/scale/1.75-gtk4-demo-button-combo-boxes-maximized.png
diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.75-gtk4-demo-screenshot-floating.png b/mir-ci/mir_ci/tests/robot/suites/scale/1.75-gtk4-demo-screenshot-floating.png
similarity index 100%
rename from mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.75-gtk4-demo-screenshot-floating.png
rename to mir-ci/mir_ci/tests/robot/suites/scale/1.75-gtk4-demo-screenshot-floating.png
diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.75-gtk4-demo-screenshot-maximized.png b/mir-ci/mir_ci/tests/robot/suites/scale/1.75-gtk4-demo-screenshot-maximized.png
similarity index 100%
rename from mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.75-gtk4-demo-screenshot-maximized.png
rename to mir-ci/mir_ci/tests/robot/suites/scale/1.75-gtk4-demo-screenshot-maximized.png
diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/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
similarity index 100%
rename from mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.75-gtk4-demo-title-app-title.png
rename to mir-ci/mir_ci/tests/robot/suites/scale/1.75-gtk4-demo-title-app-title.png
diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/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
similarity index 100%
rename from mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/1.75-gtk4-demo-title-combo-boxes-maximized.png
rename to mir-ci/mir_ci/tests/robot/suites/scale/1.75-gtk4-demo-title-combo-boxes-maximized.png
diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/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
similarity index 100%
rename from mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/2.0-gtk4-demo-button-combo-boxes-maximized.png
rename to mir-ci/mir_ci/tests/robot/suites/scale/2.0-gtk4-demo-button-combo-boxes-maximized.png
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/2.0-gtk4-demo-button.png b/mir-ci/mir_ci/tests/robot/suites/scale/2.0-gtk4-demo-button.png
new file mode 100644
index 00000000..3cd56e4c
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/scale/2.0-gtk4-demo-button.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c0541ccb0cffcaa34db34df63d52561ce34673c29ab1095b5923d2efda95bfb1
+size 2297
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/2.0-gtk4-demo-screenshot.png b/mir-ci/mir_ci/tests/robot/suites/scale/2.0-gtk4-demo-screenshot.png
new file mode 100644
index 00000000..aa6ee83a
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/scale/2.0-gtk4-demo-screenshot.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4d196b23079b6daca89c20e570f983da763593c9fafb6133fa0bae9c739b299a
+size 68345
diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/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
similarity index 100%
rename from mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/2.0-gtk4-demo-title-combo-boxes-maximized.png
rename to mir-ci/mir_ci/tests/robot/suites/scale/2.0-gtk4-demo-title-combo-boxes-maximized.png
diff --git a/mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/2.0-gtk4-demo-title-app-title.png b/mir-ci/mir_ci/tests/robot/suites/scale/2.0-gtk4-demo-title-main.png
similarity index 100%
rename from mir-ci/mir_ci/tests/robot/suites/fractional_scale_v1/2.0-gtk4-demo-title-app-title.png
rename to mir-ci/mir_ci/tests/robot/suites/scale/2.0-gtk4-demo-title-main.png
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/2.0-gtk4-demo-title.png b/mir-ci/mir_ci/tests/robot/suites/scale/2.0-gtk4-demo-title.png
new file mode 100644
index 00000000..adaac02f
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/scale/2.0-gtk4-demo-title.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb03db12e8253be927db0d5fd53dd9dfbe36688746185bdefc32ec8606154a46
+size 2309
diff --git a/mir-ci/mir_ci/tests/robot/suites/scale/scale.robot b/mir-ci/mir_ci/tests/robot/suites/scale/scale.robot
new file mode 100644
index 00000000..e2d0b643
--- /dev/null
+++ b/mir-ci/mir_ci/tests/robot/suites/scale/scale.robot
@@ -0,0 +1,38 @@
+*** Settings ***
+Resource        ${KVM_RESOURCE}
+
+Suite Setup     Suite Setup
+Test Setup      Set Output Scale    ${SCALE}
+
+
+*** Variables ***
+${T}                        ${CURDIR}
+${SCREENSHOT}               ${T}/${SCALE}-gtk4-demo-screenshot.png
+${DEMO-APP-TITLE}           ${T}/${SCALE}-gtk4-demo-title-main.png
+${DEMO-APP-TITLE-HALF}      ${T}/${SCALE}-gtk4-demo-title-main-half.png
+${BUTTON}                   ${T}/${SCALE}-gtk4-demo-button.png
+${TITLE}                    ${T}/${SCALE}-gtk4-demo-title.png
+
+
+*** Test Cases ***
+Ensure Scaling Is Visually Correct
+    Move Pointer To Proportional (1.0, 1.0)
+
+    Match                   ${SCREENSHOT}
+
+Click Button With Scaling Enabled
+    Walk Pointer To ${BUTTON}
+    Click LEFT Button
+
+    Match                   ${TITLE}
+
+
+*** Keywords ***
+Suite Setup
+    Set Output Scale        ${SCALE}
+    # Work around https://github.com/canonical/mir/issues/3553
+    ${aligned}=             Run Keyword And Return Status
+    ...                     Walk Pointer To ${DEMO-APP-TITLE}
+    IF    ${aligned} == False    Walk Pointer To ${DEMO-APP-TITLE-HALF}
+    Click LEFT Button
+    Click LEFT Button
diff --git a/mir-ci/mir_ci/tests/test_fractional_scale_v1.py b/mir-ci/mir_ci/tests/test_scale.py
similarity index 89%
rename from mir-ci/mir_ci/tests/test_fractional_scale_v1.py
rename to mir-ci/mir_ci/tests/test_scale.py
index a2a2ea7a..1b7b461a 100644
--- a/mir-ci/mir_ci/tests/test_fractional_scale_v1.py
+++ b/mir-ci/mir_ci/tests/test_scale.py
@@ -51,7 +51,7 @@ def collect_assets(platform: str, resources: Collection[str], suite: str, varian
     },
 )
 @pytest.mark.env(GSETTINGS_BACKEND="keyfile")
-@pytest.mark.parametrize("server", servers(ServerCap.FLOATING_WINDOWS | ServerCap.DISPLAY_CONFIG))
+@pytest.mark.parametrize("server", servers(ServerCap.DISPLAY_CONFIG))
 @pytest.mark.parametrize("scale", [1.0, 1.5, 2.0])
 @pytest.mark.deps(
     debs=("gtk-4-examples",),
@@ -62,16 +62,17 @@ def collect_assets(platform: str, resources: Collection[str], suite: str, varian
         ("rpaframework-recognition", "RPA.recognition"),
     ),
 )
-class TestFractionalScaleV1:
-    async def test_fractional_scale_v1(self, robot_log, server, scale, tmp_path) -> None:
-        extensions = ("all",)  # TODO no need to enable all extensions
+class TestScale:
+    async def test_scale(self, robot_log, server, scale, tmp_path) -> None:
+        extensions = ("all",)  # TODO no need to enable all extension
+
         server_instance = DisplayServer(
             server,
             add_extensions=extensions,
             env={"MIR_SERVER_X11_OUTPUT": "1024x768", "MIR_SERVER_DISPLAY_SCALE": str(scale)},
         )
 
-        assets = collect_assets("wayland", ["kvm"], "fractional_scale_v1")
+        assets = collect_assets("wayland", ["kvm"], "scale")
 
         async with server_instance, server_instance.program(App(APP_PATH, AppType.deb)):
             tuple((tmp_path / k).symlink_to(v) for k, v in assets.items())