diff --git a/tests/remote_desktop_server.pm b/tests/remote_desktop_server.pm
index d09a2e6a..12f192c4 100644
--- a/tests/remote_desktop_server.pm
+++ b/tests/remote_desktop_server.pm
@@ -23,14 +23,35 @@ sub run {
     # Change to Desktop
     desktop_vt();
 
-    # Open Settings and switch on RDP login
+    # Open Settings and navigate to Remote Login
     menu_launch_type("Settings");
-    assert_and_click("settings_submenu_system");
+    assert_and_click("gnome_icon_search");
+    type_very_safely("system");
+    assert_and_click("settings_system");
     assert_and_click("settings_remote_desktop");
     assert_and_click("settings_remote_login");
+    assert_and_click("gnome_button_unlock");
+    if (check_screen("auth_required_password", timeout => 60)) {
+        type_very_safely("$password\n");
+    }
+    else {
+        die("Authentication dialogue is not visible but was expected.");
+    }
+
+    # Set up remote login in Gnome Settings.
+    assert_and_click("settings_switch_remote");
+    wait_still_screen(3);
+    assert_and_click("settings_remote_username");
+    type_very_safely("remotee");
+    assert_and_click("settings_remote_password");
+    type_very_safely("opensesame");
+    assert_and_click("gnome_reveil_password");
+    wait_still_screen(3);
+    send_key("alt-f4");
+}
 
 sub test_flags {
-    return {fatal => 1, milestone => 1};
+    return {fatal => 1};
 }
 1;
 # vim: set sw=4 et: