diff --git a/tests/remote_desktop_freerdp.pm b/tests/remote_desktop_freerdp.pm
index 48d26a55..47a5da5c 100644
--- a/tests/remote_desktop_freerdp.pm
+++ b/tests/remote_desktop_freerdp.pm
@@ -28,7 +28,7 @@ sub run {
     # Open terminal and make a connection to the remote server.
     menu_launch_type("terminal");
     wait_still_screen(3);
-    enter_cmd("xfreerdp /u:$rdpuser /p:$rdppass /v:$ip");
+    enter_cmd("xfreerdp /u:$rdpuser /p:$rdppass /v:$ip /sec:tls");
     
     # Check that a connection window has appeared.
     assert_screen("connection_window");
diff --git a/tests/remote_desktop_server.pm b/tests/remote_desktop_server.pm
index 3871c23c..aecf4851 100644
--- a/tests/remote_desktop_server.pm
+++ b/tests/remote_desktop_server.pm
@@ -51,6 +51,7 @@ sub run {
     type_very_safely($rdppass);
     assert_and_click("gnome_reveil_password");
     wait_still_screen(3);
+    assert_and_click("settings_button_back");
     send_key("alt-f4");
 
     # RDP does not allow connections when the user is still logged in
@@ -64,7 +65,10 @@ sub run {
 
     # Check that the service is running.
     $self->root_console(tty => 3);
-    assert_script_run("ps aux | grep rdp", timeout => 10);
+    if (script_run("systemctl status gnome-remote-desktop --no-pager")) {
+        record_soft_failure("The Gnome Remote Desktop service is not running.");
+        assert_script_run("systemctl enable --now gnome-remote-desktop");  
+    }
 
     # Create mutex to synchronise with the children.
     mutex_create("kaermorhen_opened");