diff --git a/templates b/templates
index c07a2c64..3515a3cc 100755
--- a/templates
+++ b/templates
@@ -1547,6 +1547,17 @@
                                     },
                       test_suite => { name => "upgrade_minimal_64bit" },
                     },
+                    {
+                      machine    => { name => "uefi" },
+                      prio       => 30,
+                      product    => {
+                                      arch    => "x86_64",
+                                      distri  => "fedora",
+                                      flavor  => "universal",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "upgrade_minimal_uefi" },
+                    },
                     {
                       machine    => { name => "64bit" },
                       prio       => 30,
@@ -1624,6 +1635,17 @@
                                     },
                       test_suite => { name => "upgrade_2_minimal_64bit" },
                     },
+                    {
+                      machine    => { name => "uefi" },
+                      prio       => 40,
+                      product    => {
+                                      arch    => "x86_64",
+                                      distri  => "fedora",
+                                      flavor  => "universal",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "upgrade_2_minimal_uefi" },
+                    },
                     {
                       machine    => { name => "64bit" },
                       prio       => 40,
@@ -5016,6 +5038,17 @@
                         { key => "TEST_TARGET", value => "COMPOSE" },
                       ],
                     },
+                    {
+                      name => "upgrade_minimal_uefi",
+                      settings => [
+                        { key => "ROOT_PASSWORD", value => "weakpassword" },
+                        { key => "USER_LOGIN", value => "false" },
+                        { key => "BOOTFROM", value => "c" },
+                        { key => "HDD_1", value => "disk_f%CURRREL%_minimal-uefi_3_%ARCH%.img" },
+                        { key => "UPGRADE", value => "1" },
+                        { key => "TEST_TARGET", value => "COMPOSE" },
+                      ],
+                    },
                     {
                       name => "upgrade_desktop_64bit",
                       settings => [
@@ -5117,6 +5150,17 @@
                         { key => "TEST_TARGET", value => "COMPOSE" },
                       ],
                     },
+                    {
+                      name => "upgrade_2_minimal_uefi",
+                      settings => [
+                        { key => "ROOT_PASSWORD", value => "weakpassword" },
+                        { key => "USER_LOGIN", value => "false" },
+                        { key => "BOOTFROM", value => "c" },
+                        { key => "HDD_1", value => "disk_f%PREVREL%_minimal-uefi_3_%ARCH%.img" },
+                        { key => "UPGRADE", value => "1" },
+                        { key => "TEST_TARGET", value => "COMPOSE" },
+                      ],
+                    },
                     {
                       name => "upgrade_2_desktop_64bit",
                       settings => [