diff --git a/src/tests/cursor-tests.c b/src/tests/cursor-tests.c
index 3c0c6a462..6a9298517 100644
--- a/src/tests/cursor-tests.c
+++ b/src/tests/cursor-tests.c
@@ -311,6 +311,14 @@ meta_test_native_cursor_scaling (void)
       .width = 1920, .height = 1080, .scale = 2.0,
       .layout_mode = META_LOGICAL_MONITOR_LAYOUT_MODE_PHYSICAL,
     },
+    {
+      .width = 1440, .height = 900, .scale = 1.5,
+      .layout_mode = META_LOGICAL_MONITOR_LAYOUT_MODE_LOGICAL,
+    },
+    {
+      .width = 1440, .height = 900, .scale = 2.25,
+      .layout_mode = META_LOGICAL_MONITOR_LAYOUT_MODE_LOGICAL,
+    },
   };
   int i;
 
diff --git a/src/tests/ref-tests/backends_native_cursor_scaling_4_0.ref.png b/src/tests/ref-tests/backends_native_cursor_scaling_4_0.ref.png
new file mode 100644
index 000000000..31fb95efd
Binary files /dev/null and b/src/tests/ref-tests/backends_native_cursor_scaling_4_0.ref.png differ
diff --git a/src/tests/ref-tests/backends_native_cursor_scaling_4_1.ref.png b/src/tests/ref-tests/backends_native_cursor_scaling_4_1.ref.png
new file mode 100644
index 000000000..31fb95efd
Binary files /dev/null and b/src/tests/ref-tests/backends_native_cursor_scaling_4_1.ref.png differ
diff --git a/src/tests/ref-tests/backends_native_cursor_scaling_5_0.ref.png b/src/tests/ref-tests/backends_native_cursor_scaling_5_0.ref.png
new file mode 100644
index 000000000..b299f4092
Binary files /dev/null and b/src/tests/ref-tests/backends_native_cursor_scaling_5_0.ref.png differ
diff --git a/src/tests/ref-tests/backends_native_cursor_scaling_5_1.ref.png b/src/tests/ref-tests/backends_native_cursor_scaling_5_1.ref.png
new file mode 100644
index 000000000..219198356
Binary files /dev/null and b/src/tests/ref-tests/backends_native_cursor_scaling_5_1.ref.png differ
diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index 734044543..cba0cdf08 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -1044,12 +1044,13 @@ meta_wayland_surface_commit (MetaWaylandSurface *surface)
               wl_client_get_credentials (wl_resource_get_client (resource), &pid, NULL,
                                          NULL);
 
-              g_warning ("Bug in client with pid %ld: Cursor buffer size (%dx%d) is "
-                         "not an integer multiple of the buffer_scale (%d).",
-                         (long) pid,
-                         meta_multi_texture_get_width (committed_texture),
-                         meta_multi_texture_get_height (committed_texture),
-                         committed_scale);
+              meta_topic (META_DEBUG_WAYLAND,
+                          "Bug in client with pid %ld: Cursor buffer size (%dx%d) is "
+                          "not an integer multiple of the buffer_scale (%d).",
+                          (long) pid,
+                          meta_multi_texture_get_width (committed_texture),
+                          meta_multi_texture_get_height (committed_texture),
+                          committed_scale);
             }
         }
     }