diff --git a/tests/remote_desktop_server.pm b/tests/remote_desktop_server.pm
index 12f192c4..4e47504d 100644
--- a/tests/remote_desktop_server.pm
+++ b/tests/remote_desktop_server.pm
@@ -25,7 +25,8 @@ sub run {
 
     # Open Settings and navigate to Remote Login
     menu_launch_type("Settings");
-    assert_and_click("gnome_icon_search");
+    send_key("ctrl-f");
+    sleep(2);
     type_very_safely("system");
     assert_and_click("settings_system");
     assert_and_click("settings_remote_desktop");
@@ -48,6 +49,11 @@ sub run {
     assert_and_click("gnome_reveil_password");
     wait_still_screen(3);
     send_key("alt-f4");
+
+    # Check that the service is running.
+    $self->root_console(tty => 3);
+    assert_script_run("ps aux | grep rdp", timeout => 10);
+
 }
 
 sub test_flags {