diff --git a/test/TEST-25-IMPORT/test.sh b/test/TEST-25-IMPORT/test.sh
index 14265cdfc5d..977f984bd31 100755
--- a/test/TEST-25-IMPORT/test.sh
+++ b/test/TEST-25-IMPORT/test.sh
@@ -12,22 +12,9 @@ test_setup() {
         eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
 
         setup_basic_environment
-        dracut_install dd gunzip mv tar diff
-
-        # setup the testsuite service
-        cat >$initdir/etc/systemd/system/testsuite.service <<EOF
-[Unit]
-Description=Testsuite service
-
-[Service]
-ExecStart=/testsuite.sh
-Type=oneshot
-EOF
-        cp testsuite.sh $initdir/
-
-        setup_testsuite
+        mask_supporting_services
     )
     setup_nspawn_root
 }
 
-do_test "$@"
+do_test "$@" 25
diff --git a/test/test-functions b/test/test-functions
index 70e3e75be3d..dfc2573bdc4 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -92,6 +92,7 @@ BASICTOOLS=(
     sulogin
     sysctl
     tail
+    tar
     tee
     test
     touch
diff --git a/test/units/testsuite-25.service b/test/units/testsuite-25.service
new file mode 100644
index 00000000000..39b43917d0a
--- /dev/null
+++ b/test/units/testsuite-25.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=TEST-25-IMPORT
+
+[Service]
+ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
+Type=oneshot
diff --git a/test/TEST-25-IMPORT/testsuite.sh b/test/units/testsuite-25.sh
similarity index 100%
rename from test/TEST-25-IMPORT/testsuite.sh
rename to test/units/testsuite-25.sh