diff --git a/main.pm b/main.pm
index 8fe573b0..6aff7a24 100644
--- a/main.pm
+++ b/main.pm
@@ -276,9 +276,13 @@ sub load_postinstall_tests() {
     # are checking that an installer image built from the update works and do
     # not install the update themselves in this manner
     if (get_var("ADVISORY_OR_TASK") && !get_var("UPGRADE") && !get_var("INSTALL")) {
-        autotest::loadtest "tests/_advisory_update.pm";
-        # now load the early boot tests again, as _advisory_update reboots
-        _load_early_postinstall_tests(2);
+        # don't try and install updates on the support server unless the
+        # update is for the same release as the support server disk image
+        if (get_var("TEST") ne "support_server" || get_var("VERSION") eq get_var("CURRREL")) {
+            autotest::loadtest "tests/_advisory_update.pm";
+            # now load the early boot tests again, as _advisory_update reboots
+            _load_early_postinstall_tests(2);
+        }
     }
     # from now on, we have fully installed and booted system with root/specified user logged in
 
@@ -321,7 +325,11 @@ sub load_postinstall_tests() {
     # do this for INSTALL test(s); these are checking that an installer image
     # built from the update works and do not install the update themselves.
     if (get_var("ADVISORY_OR_TASK") && !get_var("INSTALL")) {
-        autotest::loadtest "tests/_advisory_post.pm";
+        # don't try and install updates on the support server unless the
+        # update is for the same release as the support server disk image
+        if (get_var("TEST") ne "support_server" || get_var("VERSION") eq get_var("CURRREL")) {
+            autotest::loadtest "tests/_advisory_post.pm";
+        }
     }
 
     # we should shut down before uploading disk images