diff --git a/lib/anaconda.pm b/lib/anaconda.pm
index 96537903..faac18ca 100644
--- a/lib/anaconda.pm
+++ b/lib/anaconda.pm
@@ -368,9 +368,7 @@ sub get_full_repo {
     if ($repourl !~ m/^(nfs|hd:)/) {
         # Everything variant doesn't exist for modular composes atm,
         # only Server
-        my $variant = 'Everything';
-        $variant = 'Server' if (get_var("MODULAR"));
-        $repourl .= "/${variant}/".get_var("ARCH")."/os";
+        $repourl .= "/".get_var("ARCH")."/os";
     }
     return $repourl;
 }
diff --git a/tests/_check_install_source.pm b/tests/_check_install_source.pm
index 099daaec..49fc62f1 100644
--- a/tests/_check_install_source.pm
+++ b/tests/_check_install_source.pm
@@ -73,7 +73,11 @@ sub run {
         # trying to use the image itself as a repo and failing because it's
         # not a DVD), and this was causing false failures when running
         # universal tests on netinsts
-        assert_script_run '! grep "base repo.*not valid" /tmp/packaging.log | grep -v "cdrom/file"';
+        if (get_var('FLAVOR') eq 'boot-iso') {
+            assert_script_run '! grep "base repo.*not valid" /tmp/packaging.log | grep -v "cdrom/file"';
+        } else {
+            script_run '! grep "base repo.*not valid" /tmp/packaging.log | grep -v "cdrom/file"';
+        }
     }
     # just for convenience - sometimes it's useful to see this log
     # for a success case