diff --git a/templates b/templates
index 2fa6ecab..906fe426 100755
--- a/templates
+++ b/templates
@@ -402,6 +402,17 @@
                                     },
                       test_suite => { name => "realmd_join_sssd" },
                     },
+                    {
+                      machine    => { name => "64bit" },
+                      prio       => 40,
+                      product    => {
+                                      arch    => "x86_64",
+                                      distri  => "fedora",
+                                      flavor  => "Server-dvd-iso",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "install_updates_nfs" },
+                    },
                     {
                       machine    => { name => "64bit" },
                       prio       => 10,
@@ -1936,5 +1947,16 @@
                         { key => "WORKER_CLASS", value => "tap" },
                       ],
                     },
+                    {
+                      name => "install_updates_nfs",
+                      settings => [
+                        { key => "GRUB", value => "inst.stage2=nfs:nfsvers=4:10.0.2.110:/repo" },
+                        { key => "TEST_UPDATES", value => "1" },
+                        { key => "PARALLEL_WITH", value => "support_server" },
+                        { key => "INSTALL_UNLOCK", value => "support_ready" },
+                        { key => "NICTYPE", value => "tap" },
+                        { key => "WORKER_CLASS", value => "tap" },
+                      ],
+                    },
                   ],
 }
diff --git a/tests/_support_server_postinstall.pm b/tests/_support_server_postinstall.pm
index 7753bbf5..413ae403 100644
--- a/tests/_support_server_postinstall.pm
+++ b/tests/_support_server_postinstall.pm
@@ -41,8 +41,15 @@ sub run {
     assert_script_run "curl -o /export/root-user-crypted-net.ks https://jskladan.fedorapeople.org/kickstarts/root-user-crypted-net.ks";
     # create the repo share
     assert_script_run "mkdir -p /repo";
+    # create a mount point for the ISO
+    assert_script_run "mkdir -p /mnt/iso";
     # mount the ISO there
-    assert_script_run "mount /dev/cdrom /repo";
+    assert_script_run "mount /dev/cdrom /mnt/iso";
+    # copy the contents of the ISO to the repo share
+    assert_script_run "cp -R /mnt/iso/* /repo";
+    # put the updates image in the NFS repo (for testing this update
+    # image delivery method)
+    assert_script_run "curl -o /repo/images/updates.img https://fedorapeople.org/groups/qa/updates/updates-openqa.img";
     # set up the exports
     assert_script_run "printf '/export 10.0.2.0/24(ro)\n/repo 10.0.2.0/24(ro)' > /etc/exports";
     # open firewall port