diff --git a/templates b/templates
index cabe51fb..7e4efa5f 100755
--- a/templates
+++ b/templates
@@ -446,6 +446,17 @@
                                     },
                       test_suite => { name => "install_rescue_encrypted" },
                     },
+                    {
+                      machine    => { name => "uefi" },
+                      prio       => 32,
+                      product    => {
+                                      arch    => "x86_64",
+                                      distri  => "fedora",
+                                      flavor  => "universal",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "install_rescue_encrypted" },
+                    },
                     {
                       machine    => { name => "64bit" },
                       prio       => 10,
@@ -1586,6 +1597,7 @@
                     {
                       name => "install_rescue_encrypted",
                       settings => [
+                        { key => "BOOTFROM", value => "d" },
                         { key => "ENTRYPOINT", value => "rescue_mode_encrypted" },
                         { key => "HDD_1", value => "disk_%MACHINE%_encrypted.qcow2" },
                         { key => "START_AFTER_TEST", value => "install_simple_encrypted" },
diff --git a/tests/rescue_mode_encrypted.pm b/tests/rescue_mode_encrypted.pm
index 8a1f80a1..5db1e0d2 100644
--- a/tests/rescue_mode_encrypted.pm
+++ b/tests/rescue_mode_encrypted.pm
@@ -9,7 +9,13 @@ sub run {
     send_key "down";
     send_key "ret";
     # select "rescue system"
-    type_string "r\n";
+    if (get_var('UEFI')) {
+        send_key "down";
+        send_key "ret";
+    }
+    else {
+        type_string "r\n";
+    }
 
     assert_screen "rescue_select", 120; # it takes time to start anaconda
     # continue