diff --git a/tests/remote_desktop_freerdp.pm b/tests/remote_desktop_freerdp.pm
index 7c6b60c9..8570f8c3 100644
--- a/tests/remote_desktop_freerdp.pm
+++ b/tests/remote_desktop_freerdp.pm
@@ -22,17 +22,25 @@ sub run {
 
     # Open terminal and make a connection to the remote server.
     menu_launch_type("terminal");
-    wait_still_screen(2);
+    wait_still_screen(3);
     enter_cmd("xfreerdp /:u $user /:p $password /:v $ip");
     
     # Check that a connection window has appeared.
-    assert_screen("freerdp_connection_window");
+    assert_screen("connection_window");
     
-    # Perform login, start terminal and check the hostname.
-    assert_and_check("freerdp_login_screen");
+    # Log onto the system.
+    assert_and_check("connection_login_screen");
     send_key("ret");
     sleep(2);
-    type_very_safely($syspw);
+    type_very_safely("$syspw\n");
+    wait_still_screen(2);
+
+    # Start the terminal
+    type_very_safely("terminal\n");
+    wait_still_screen(3);
+
+    # Check that we are on the correct computer.
+    # We can tell from the terminal prompt.
     assert_screen("freerdp_desktop_connected");
 }