diff --git a/test/test-functions b/test/test-functions
index 8bae7a9911e..c6ea580eaae 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -1551,11 +1551,11 @@ setup_basic_dirs() {
 
 mask_supporting_services() {
     # mask some services that we do not want to run in these tests
-    ln -fs /dev/null "${initdir:?}/etc/systemd/system/systemd-hwdb-update.service"
-    ln -fs /dev/null "$initdir/etc/systemd/system/systemd-journal-catalog-update.service"
-    ln -fs /dev/null "$initdir/etc/systemd/system/systemd-networkd.service"
-    ln -fs /dev/null "$initdir/etc/systemd/system/systemd-networkd.socket"
-    ln -fs /dev/null "$initdir/etc/systemd/system/systemd-resolved.service"
+    ln -fsv /dev/null "${initdir:?}/etc/systemd/system/systemd-hwdb-update.service"
+    ln -fsv /dev/null "$initdir/etc/systemd/system/systemd-journal-catalog-update.service"
+    ln -fsv /dev/null "$initdir/etc/systemd/system/systemd-networkd.service"
+    ln -fsv /dev/null "$initdir/etc/systemd/system/systemd-networkd.socket"
+    ln -fsv /dev/null "$initdir/etc/systemd/system/systemd-resolved.service"
 }
 
 inst_libs() {
@@ -2335,7 +2335,13 @@ test_create_image() {
     (
         LOG_LEVEL=5
         setup_basic_environment
-        mask_supporting_services
+
+        # We want to test all services in TEST-01-BASIC, but mask them in
+        # all other tests
+        if [[ "$TESTID" != "01" ]]; then
+            dinfo "Masking supporting services"
+            mask_supporting_services
+        fi
     )
 }