diff --git a/test/TEST-22-TMPFILES/test.sh b/test/TEST-22-TMPFILES/test.sh
index aa6efcfb48..5ab688e4ac 100755
--- a/test/TEST-22-TMPFILES/test.sh
+++ b/test/TEST-22-TMPFILES/test.sh
@@ -9,23 +9,9 @@ test_setup() {
     # create the basic filesystem layout
     setup_basic_environment
     mask_supporting_services
-    inst_binary mv
-    inst_binary stat
-    inst_binary seq
-    inst_binary xargs
-    inst_binary mkfifo
-    inst_binary readlink
-
-    # setup the testsuite service
-    cp testsuite.service $initdir/etc/systemd/system/
-    setup_testsuite
-
-    mkdir -p $initdir/testsuite
-    cp run-tmpfiles-tests.sh $initdir/testsuite/
-    cp test-*.sh $initdir/testsuite/
 
     # create dedicated rootfs for nspawn (located in $TESTDIR/nspawn-root)
     setup_nspawn_root
 }
 
-do_test "$@"
+do_test "$@" 22
diff --git a/test/test-functions b/test/test-functions
index 0a111771bf..9eef9a63fb 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -58,15 +58,19 @@ BASICTOOLS=(
     ln
     loadkeys
     login
+    mkfifo
+    mktemp
     modprobe
     mount
     mv
     nc
+    readlink
     rm
     rmdir
     sed
     setfont
     setsid
+    seq
     sh
     sleep
     socat
diff --git a/test/TEST-22-TMPFILES/test-01.sh b/test/units/testsuite-22.01.sh
similarity index 100%
rename from test/TEST-22-TMPFILES/test-01.sh
rename to test/units/testsuite-22.01.sh
diff --git a/test/TEST-22-TMPFILES/test-02.sh b/test/units/testsuite-22.02.sh
similarity index 100%
rename from test/TEST-22-TMPFILES/test-02.sh
rename to test/units/testsuite-22.02.sh
diff --git a/test/TEST-22-TMPFILES/test-03.sh b/test/units/testsuite-22.03.sh
similarity index 100%
rename from test/TEST-22-TMPFILES/test-03.sh
rename to test/units/testsuite-22.03.sh
diff --git a/test/TEST-22-TMPFILES/test-04.sh b/test/units/testsuite-22.04.sh
similarity index 100%
rename from test/TEST-22-TMPFILES/test-04.sh
rename to test/units/testsuite-22.04.sh
diff --git a/test/TEST-22-TMPFILES/test-05.sh b/test/units/testsuite-22.05.sh
similarity index 100%
rename from test/TEST-22-TMPFILES/test-05.sh
rename to test/units/testsuite-22.05.sh
diff --git a/test/TEST-22-TMPFILES/test-06.sh b/test/units/testsuite-22.06.sh
similarity index 100%
rename from test/TEST-22-TMPFILES/test-06.sh
rename to test/units/testsuite-22.06.sh
diff --git a/test/TEST-22-TMPFILES/test-07.sh b/test/units/testsuite-22.07.sh
similarity index 100%
rename from test/TEST-22-TMPFILES/test-07.sh
rename to test/units/testsuite-22.07.sh
diff --git a/test/TEST-22-TMPFILES/test-08.sh b/test/units/testsuite-22.08.sh
similarity index 100%
rename from test/TEST-22-TMPFILES/test-08.sh
rename to test/units/testsuite-22.08.sh
diff --git a/test/TEST-22-TMPFILES/test-09.sh b/test/units/testsuite-22.09.sh
similarity index 100%
rename from test/TEST-22-TMPFILES/test-09.sh
rename to test/units/testsuite-22.09.sh
diff --git a/test/TEST-22-TMPFILES/testsuite.service b/test/units/testsuite-22.service
similarity index 60%
rename from test/TEST-22-TMPFILES/testsuite.service
rename to test/units/testsuite-22.service
index 2f1b15c3ed..3d53cbf56c 100644
--- a/test/TEST-22-TMPFILES/testsuite.service
+++ b/test/units/testsuite-22.service
@@ -1,12 +1,11 @@
 [Unit]
-Description=Testsuite service
+Description=TEST-22-TMPFILES
 After=systemd-tmpfiles-setup.service
 Before=getty-pre.target
 Wants=getty-pre.target
 
 [Service]
-WorkingDirectory=/testsuite
-ExecStart=/testsuite/run-tmpfiles-tests.sh
+ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
 StandardOutput=tty
 StandardError=tty
diff --git a/test/TEST-22-TMPFILES/run-tmpfiles-tests.sh b/test/units/testsuite-22.sh
similarity index 58%
rename from test/TEST-22-TMPFILES/run-tmpfiles-tests.sh
rename to test/units/testsuite-22.sh
index a0158f0421..afce85aceb 100755
--- a/test/TEST-22-TMPFILES/run-tmpfiles-tests.sh
+++ b/test/units/testsuite-22.sh
@@ -5,8 +5,8 @@ set -e
 
 >/failed
 
-for t in test-*.sh; do
-        echo "Running $t"; ./$t
+for t in ${0%.sh}.*.sh; do
+    echo "Running $t"; ./$t
 done
 
 touch /testok