diff --git a/tests/remote_desktop_client.pm b/tests/remote_desktop_client.pm
index 5a5b86fa..1c927234 100644
--- a/tests/remote_desktop_client.pm
+++ b/tests/remote_desktop_client.pm
@@ -11,9 +11,9 @@ use lockapi;
 sub run {
     my $self = shift;
     my $password = get_var("USER_PASSWORD", "weakpassword");
-    my $rdpuser = "geralt";
-    my $rdppass = "ciriofcintra";
-    my $ip = "172.16.2.177";
+    my $rdpuser = get_var("RDP_USER", "geralt");
+    my $rdppass = get_var("RDP_PASS", "ciriofcintra");
+    my $ip = get_var("RDP_SERVER_IP", "172.16.2.177");
 
     # Wait until the RDP server is ready
     # and lock parallel connection.
@@ -54,10 +54,10 @@ sub run {
 
     # Check that we are on the correct computer.
     # We can tell from the terminal prompt.
-    assert_screen("freerdp_desktop_connected");
+    assert_screen("desktop_connected");
 
     # Unlock the parallel connection
-    mutex_unlock("karemorhen_opened");
+    mutex_unlock("kaermorhen_opened");
 }
 
 sub test_flags {