diff --git a/tests/remote_desktop_client.pm b/tests/remote_desktop_client.pm
new file mode 100644
index 00000000..a7d4ce83
--- /dev/null
+++ b/tests/remote_desktop_client.pm
@@ -0,0 +1,17 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+
+sub run {
+    my $self = shift;
+
+    boot_to_login_screen(timeout => 300);
+    $self->root_console(tty => 3);
+}
+
+sub test_flags {
+    return {fatal => 1, milestone => 1};
+}
+1;
+# vim: set sw=4 et:
diff --git a/tests/remote_desktop_server.pm b/tests/remote_desktop_server.pm
new file mode 100644
index 00000000..d09a2e6a
--- /dev/null
+++ b/tests/remote_desktop_server.pm
@@ -0,0 +1,36 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+
+sub run {
+    my $self = shift;
+    my $user = get_var("USER_LOGIN", "test");
+    my $password = get_var("USER_PASSWORD", "weakpassword");
+
+    #boot_to_login_screen(timeout => 300);
+    $self->root_console(tty => 3);
+    # Make necessary settings for the RDP server.
+    # Set SElinux to permissive to workaround a Fedora issue
+    assert_script_run("setenforce 0");
+    # Check that SElinux is in permissive mode
+    validate_script_output("getenforce", sub { m/Permissive/ });
+
+    # In Workstation, the RDP port should be opened per se, 
+    # but let's open it explicitely, to make sure it is open.
+    assert_script_run("firewall-cmd --add-port=3389/tcp");
+
+    # Change to Desktop
+    desktop_vt();
+
+    # Open Settings and switch on RDP login
+    menu_launch_type("Settings");
+    assert_and_click("settings_submenu_system");
+    assert_and_click("settings_remote_desktop");
+    assert_and_click("settings_remote_login");
+
+sub test_flags {
+    return {fatal => 1, milestone => 1};
+}
+1;
+# vim: set sw=4 et: