diff --git a/app/tests/test-ui.c b/app/tests/test-ui.c
index 7bb02c759181962ea720978b233668b90d4cca41..33858ab9f740b4b4457384ee0fc95f597ae274f5 100644
--- a/app/tests/test-ui.c
+++ b/app/tests/test-ui.c
@@ -855,12 +855,15 @@ gimp_ui_switch_window_mode (Gimp *gimp)
 
 int main(int argc, char **argv)
 {
-  Gimp *gimp   = NULL;
-  gint  result = -1;
+  Gimp  *gimp   = NULL;
+  gint   result = -1;
+  gchar *session_type;
 
   gimp_test_bail_if_no_display ();
   gtk_test_init (&argc, &argv, NULL);
 
+  session_type = g_getenv("XDG_SESSION_TYPE");
+
   gimp_test_utils_setup_menus_path ();
 
   /* Start up GIMP */
@@ -891,7 +894,10 @@ int main(int argc, char **argv)
   ADD_TEST (switch_back_to_multi_window_mode);
   ADD_TEST (close_image);
   ADD_TEST (repeatedly_switch_window_mode);
-  ADD_TEST (window_roles);
+
+  if (g_strcmp0(session_type, "wayland") != 0) {
+    ADD_TEST (window_roles);
+  }
 
   /* Run the tests and return status */
   g_application_run (gimp->app, 0, NULL);