diff --git a/templates b/templates
index c17a9fe3..cc776f8d 100755
--- a/templates
+++ b/templates
@@ -1668,6 +1668,28 @@
                                     },
                       test_suite => { name => "upgrade_2_server_64bit" },
                     },
+                    {
+                      machine    => { name => "64bit" },
+                      prio       => 30,
+                      product    => {
+                                      arch    => "x86_64",
+                                      distri  => "fedora",
+                                      flavor  => "universal",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "upgrade_2_server_domain_controller" },
+                    },
+                    {
+                      machine    => { name => "64bit" },
+                      prio       => 30,
+                      product    => {
+                                      arch    => "x86_64",
+                                      distri  => "fedora",
+                                      flavor  => "universal",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "upgrade_2_realmd_client" },
+                    },
                     {
                       machine    => { name => "64bit" },
                       prio       => 40,
@@ -5238,6 +5260,44 @@
                         { key => "TEST_TARGET", value => "COMPOSE" },
                       ],
                     },
+                    {
+                      name => "upgrade_2_server_domain_controller",
+                      settings => [
+                        { key => "PARALLEL_CANCEL_WHOLE_CLUSTER", value => "0" },
+                        { key => "ROOT_PASSWORD", value => "weakpassword" },
+                        { key => "+HDD_1", value => "disk_f%PREVREL%_server_3_%ARCH%.img" },
+                        { key => "UPGRADE", value => "1" },
+                        { key => "TEST_TARGET", value => "COMPOSE" },
+                        { key => "PREUPGRADE", value => "role_deploy_domain_controller" },
+                        { key => "POSTINSTALL", value => "role_deploy_domain_controller_check" },
+                        { key => "USER_LOGIN", value => "false" },
+                        { key => "GRUB_POSTINSTALL", value => "net.ifnames=0 biosdevname=0" },
+                        { key => "BOOTFROM", value => "c" },
+                        { key => "GRUB", value => "net.ifnames=0 biosdevname=0" },
+                        { key => "POST_STATIC", value => "10.0.2.100 ipa001.domain.local" },
+                        { key => "NICTYPE", value => "tap" },
+                        { key => "WORKER_CLASS", value => "tap" },
+                      ],
+                    },
+                    {
+                      name => "upgrade_2_realmd_client",
+                      settings => [
+                        { key => "ROOT_PASSWORD", value => "weakpassword" },
+                        { key => "+HDD_1", value => "disk_f%PREVREL%_server_3_%ARCH%.img" },
+                        { key => "UPGRADE", value => "1" },
+                        { key => "TEST_TARGET", value => "COMPOSE" },
+                        { key => "PREUPGRADE", value => "realmd_join_sssd" },
+                        { key => "POSTINSTALL", value => "_setup_browser freeipa_webui freeipa_password_change freeipa_client" },
+                        { key => "PARALLEL_WITH", value => "upgrade_2_server_domain_controller" },
+                        { key => "USER_LOGIN", value => "false" },
+                        { key => "GRUB_POSTINSTALL", value => "net.ifnames=0 biosdevname=0" },
+                        { key => "BOOTFROM", value => "c" },
+                        { key => "GRUB", value => "net.ifnames=0 biosdevname=0" },
+                        { key => "POST_STATIC", value => "10.0.2.103 client003.domain.local" },
+                        { key => "NICTYPE", value => "tap" },
+                        { key => "WORKER_CLASS", value => "tap" },
+                      ],
+                    },
                     {
                       name => "upgrade_2_kde_64bit",
                       settings => [