diff --git a/needles/graphical_login_sddm_input.json b/needles/graphical_login_sddm_input.json
new file mode 100644
index 00000000..1d53012c
--- /dev/null
+++ b/needles/graphical_login_sddm_input.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "xpos": 422,
+      "ypos": 445,
+      "width": 78,
+      "height": 17,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "DESKTOP-kde",
+    "LANGUAGE-english",
+    "graphical_login_input"
+  ]
+}
\ No newline at end of file
diff --git a/needles/graphical_login_sddm_input.png b/needles/graphical_login_sddm_input.png
new file mode 100644
index 00000000..46e0f9ae
Binary files /dev/null and b/needles/graphical_login_sddm_input.png differ
diff --git a/needles/kde_desktop_clean.json b/needles/kde_desktop_clean.json
new file mode 100644
index 00000000..23df9ea5
--- /dev/null
+++ b/needles/kde_desktop_clean.json
@@ -0,0 +1,17 @@
+{
+  "properties": [],
+  "tags": [
+    "DESKTOP-kde",
+    "LANGUAGE-english",
+    "graphical_desktop_clean"
+  ],
+  "area": [
+    {
+      "xpos": 3,
+      "ypos": 739,
+      "width": 26,
+      "height": 26,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde_desktop_clean.png b/needles/kde_desktop_clean.png
new file mode 100644
index 00000000..52f3aaee
Binary files /dev/null and b/needles/kde_desktop_clean.png differ
diff --git a/tests/upgrade_postinstall_desktop.pm b/tests/upgrade_postinstall_desktop.pm
index 50804527..f313ee61 100644
--- a/tests/upgrade_postinstall_desktop.pm
+++ b/tests/upgrade_postinstall_desktop.pm
@@ -7,16 +7,18 @@ sub run {
     my $self = shift;
     my $password = get_var("USER_PASSWORD", "weakpassword");
 
-    # wait for GDM to appear
+    # wait for DM to appear
     $self->boot_to_login_screen("graphical_login", 20);
 
     # login as normal user
-    send_key "ret";
+    if (get_var("DESKTOP") eq 'gnome') {
+        send_key "ret";
+    }
     assert_screen "graphical_login_input";
     type_string $password;
     send_key "ret";
     # wait until desktop appears
-    assert_screen "graphical_desktop_clean", 30;
+    assert_screen "graphical_desktop_clean", 60;
     # check an upgrade actually happened (and we can log into a console)
     $self->root_console(tty=>3);
     $self->check_release(lc(get_var('VERSION')));