diff --git a/tests/_software_selection.pm b/tests/_software_selection.pm
index 64aa2aa0..10f0eb3e 100644
--- a/tests/_software_selection.pm
+++ b/tests/_software_selection.pm
@@ -8,7 +8,7 @@ sub run {
 
     # Select package set. Minimal is the default, if 'default' is specified, skip selection.
     my $packageset = get_var('PACKAGE_SET', 'minimal');
-    if ($packageset eq 'default') {
+    if ($packageset eq 'default' || get_var('MODULAR')) {
         return
     }