diff --git a/main.pm b/main.pm
index 876a9137..e9952340 100644
--- a/main.pm
+++ b/main.pm
@@ -248,7 +248,6 @@ sub _load_early_postinstall_tests {
     # Appropriate login method for install type
     if (get_var("DESKTOP")) {
         _load_instance("tests/_graphical_wait_login", $instance);
-        _load_instance("tests/_snapshot_only") if (get_var("LOGIN_SNAPSHOT"));
     }
     # Test non-US input at this point, on language tests
     if (get_var("SWITCHED_LAYOUT") || get_var("INPUT_METHOD")) {
@@ -264,7 +263,6 @@ sub _load_early_postinstall_tests {
     # the installation is interrupted on purpose.
     unless (get_var("DESKTOP") || get_var("CRASH_REPORT")) {
         _load_instance("tests/_console_wait_login", $instance);
-        _load_instance("tests/_snapshot_only") if (get_var("LOGIN_SNAPSHOT"));
     }
 }
 
diff --git a/templates.fif.json b/templates.fif.json
index 034466d4..3c162ebc 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -2594,7 +2594,7 @@
                 "+START_AFTER_TEST": "server_cockpit_default",
                 "BOOTFROM": "c",
                 "LOGIN_SNAPSHOT": "1",
-                "POSTINSTALL": "server_cockpit_updates server_cockpit_autoupdate",
+                "POSTINSTALL": "_cockpit_setup server_cockpit_updates server_cockpit_autoupdate",
                 "ROOT_PASSWORD": "weakpassword",
                 "USER_LOGIN": "false"
             }
diff --git a/tests/_snapshot_only.pm b/tests/_cockpit_setup.pm
similarity index 62%
rename from tests/_snapshot_only.pm
rename to tests/_cockpit_setup.pm
index 084f537d..56e606f2 100644
--- a/tests/_snapshot_only.pm
+++ b/tests/_cockpit_setup.pm
@@ -5,6 +5,8 @@ use utils;
 
 sub run {
     my $self = shift;
+    # for update testing, ensure the update repos are set up
+    repo_setup if (get_var("ADVISORY_OR_TASK"));
 }
 
 sub test_flags {