diff --git a/test/TEST-16-EXTEND-TIMEOUT/test.sh b/test/TEST-16-EXTEND-TIMEOUT/test.sh
index 43d9f1278b..474b9db2fc 100755
--- a/test/TEST-16-EXTEND-TIMEOUT/test.sh
+++ b/test/TEST-16-EXTEND-TIMEOUT/test.sh
@@ -15,21 +15,9 @@ test_setup() {
 
         setup_basic_environment
         mask_supporting_services
-
-        for s in success-all success-start success-stop success-runtime \
-                 fail-start fail-stop fail-runtime
-        do
-            cp testsuite-${s}.service ${initdir}/etc/systemd/system
-        done
-        cp testsuite.service ${initdir}/etc/systemd/system
-
-        cp extend_timeout_test_service.sh ${initdir}/
-        cp assess.sh ${initdir}/
-
-        setup_testsuite
     )
 
     setup_nspawn_root
 }
 
-do_test "$@"
+do_test "$@" 16
diff --git a/test/TEST-16-EXTEND-TIMEOUT/testsuite.service b/test/TEST-16-EXTEND-TIMEOUT/testsuite.service
deleted file mode 100644
index 7512ba9e12..0000000000
--- a/test/TEST-16-EXTEND-TIMEOUT/testsuite.service
+++ /dev/null
@@ -1,18 +0,0 @@
-
-[Unit]
-Description=Testsuite: Assess all other testsuite-*.services worked as expected
-
-Wants=testsuite-success-all.service
-Wants=testsuite-success-start.service
-Wants=testsuite-success-runtime.service
-Wants=testsuite-success-stop.service
-Wants=testsuite-fail-start.service
-Wants=testsuite-fail-stop.service
-Wants=testsuite-fail-runtime.service
-StopWhenUnneeded=yes
-
-[Service]
-Type=simple
-TimeoutStartSec=infinity
-ExecStartPre=/assess.sh
-ExecStart=/bin/true
diff --git a/test/meson.build b/test/meson.build
index 61e0aee13f..6fea0fc93d 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -20,6 +20,8 @@ install_subdir('testsuite-10.units',
                install_dir : testdata_dir)
 install_subdir('testsuite-11.units',
                install_dir : testdata_dir)
+install_subdir('testsuite-16.units',
+               install_dir : testdata_dir)
 
 testsuite08_dir = testdata_dir + '/testsuite-08.units'
 install_data('testsuite-08.units/-.mount',
diff --git a/test/TEST-16-EXTEND-TIMEOUT/extend_timeout_test_service.sh b/test/testsuite-16.units/extend-timeout.sh
similarity index 100%
rename from test/TEST-16-EXTEND-TIMEOUT/extend_timeout_test_service.sh
rename to test/testsuite-16.units/extend-timeout.sh
diff --git a/test/TEST-16-EXTEND-TIMEOUT/testsuite-fail-runtime.service b/test/testsuite-16.units/fail-runtime.service
similarity index 68%
rename from test/TEST-16-EXTEND-TIMEOUT/testsuite-fail-runtime.service
rename to test/testsuite-16.units/fail-runtime.service
index e0b9f6a70b..06417f7133 100644
--- a/test/TEST-16-EXTEND-TIMEOUT/testsuite-fail-runtime.service
+++ b/test/testsuite-16.units/fail-runtime.service
@@ -1,13 +1,11 @@
-
 [Unit]
 Description=Testsuite: Fail Runtime (EXTEND_TIMEOUT_USEC Didn't occur in sufficient time after RuntimeSecMax.)
 
 [Service]
-
 # EXTEND_TIMEOUT_USEC on runtime start (0) and 7 seconds after. Systemd will expect one at 7+5 (extend_timeout_interval)
 # seconds this won't happen until 7 + 7 (sleep interval) seconds. Therefore timeout at 12 seconds.
 Type=notify
 TimeoutStartSec=4
 TimeoutStopSec=4
 RuntimeMaxSec=10
-ExecStart=/extend_timeout_test_service.sh SERVICE=fail_runtime extend_timeout_interval=5 sleep_interval=7 start_intervals=0 run_intervals=2 stop_intervals=0
+ExecStart=/usr/lib/systemd/tests/testdata/testsuite-16.units/extend-timeout.sh SERVICE=fail_runtime extend_timeout_interval=5 sleep_interval=7 start_intervals=0 run_intervals=2 stop_intervals=0
diff --git a/test/TEST-16-EXTEND-TIMEOUT/testsuite-fail-start.service b/test/testsuite-16.units/fail-start.service
similarity index 68%
rename from test/TEST-16-EXTEND-TIMEOUT/testsuite-fail-start.service
rename to test/testsuite-16.units/fail-start.service
index c3fcf23dc0..95e9b01d12 100644
--- a/test/TEST-16-EXTEND-TIMEOUT/testsuite-fail-start.service
+++ b/test/testsuite-16.units/fail-start.service
@@ -1,4 +1,3 @@
-
 [Unit]
 Description=Testsuite: Fail Start (EXTEND_TIMEOUT_USEC Didn't occur in sufficient time after TimeoutStartSec.)
 
@@ -10,4 +9,4 @@ Type=notify
 TimeoutStartSec=10
 TimeoutStopSec=4
 RuntimeMaxSec=4
-ExecStart=/extend_timeout_test_service.sh SERVICE=fail_start extend_timeout_interval=5 sleep_interval=7 start_intervals=2 run_intervals=0 stop_intervals=0
+ExecStart=/usr/lib/systemd/tests/testdata/testsuite-16.units/extend-timeout.sh SERVICE=fail_start extend_timeout_interval=5 sleep_interval=7 start_intervals=2 run_intervals=0 stop_intervals=0
diff --git a/test/TEST-16-EXTEND-TIMEOUT/testsuite-fail-stop.service b/test/testsuite-16.units/fail-stop.service
similarity index 79%
rename from test/TEST-16-EXTEND-TIMEOUT/testsuite-fail-stop.service
rename to test/testsuite-16.units/fail-stop.service
index ce76d10db7..7fc66003a4 100644
--- a/test/TEST-16-EXTEND-TIMEOUT/testsuite-fail-stop.service
+++ b/test/testsuite-16.units/fail-stop.service
@@ -1,16 +1,14 @@
-
 [Unit]
 Description=Testsuite: Fail Stop (EXTEND_TIMEOUT_USEC Didn't occur in sufficient time after TimeoutStopSec.)
 
 [Service]
-
 # EXTEND_TIMEOUT_USEC on stop (0) and 7 seconds after. Systemd will expect one at 7+5 (extend_timeout_interval)
 # seconds this won't happen until 7 + 7 (sleep interval) seconds. Therefore timeout at 12 seconds.
 Type=notify
 TimeoutStartSec=4
 TimeoutStopSec=10
 RuntimeMaxSec=4
-ExecStart=/extend_timeout_test_service.sh SERVICE=fail_stop extend_timeout_interval=5 sleep_interval=7 start_intervals=0 run_intervals=0 stop_intervals=2
+ExecStart=/usr/lib/systemd/tests/testdata/testsuite-16.units/extend-timeout.sh SERVICE=fail_stop extend_timeout_interval=5 sleep_interval=7 start_intervals=0 run_intervals=0 stop_intervals=2
 # Due to 6041a7ee2c1bbff6301082f192fc1b0882400d42 SIGTERM isn't sent as the service shuts down with STOPPING=1
 # This file makes the test assess.sh quicker by notifing it that this test has finished.
 ExecStopPost=/bin/bash -c '[[ $SERVICE_RESULT == timeout && $EXIT_CODE == killed ]] && touch /fail_runtime.terminated'
diff --git a/test/TEST-16-EXTEND-TIMEOUT/testsuite-success-all.service b/test/testsuite-16.units/success-all.service
similarity index 69%
rename from test/TEST-16-EXTEND-TIMEOUT/testsuite-success-all.service
rename to test/testsuite-16.units/success-all.service
index 666f4229bf..c30ee78dfa 100644
--- a/test/TEST-16-EXTEND-TIMEOUT/testsuite-success-all.service
+++ b/test/testsuite-16.units/success-all.service
@@ -1,4 +1,3 @@
-
 [Unit]
 Description=Testsuite: EXTEND_TIMEOUT_USEC Success - extend timeout on all services
 
@@ -11,4 +10,4 @@ Type=notify
 TimeoutStartSec=4
 TimeoutStopSec=4
 RuntimeMaxSec=4
-ExecStart=/extend_timeout_test_service.sh SERVICE=success_all extend_timeout_interval=4 sleep_interval=2 start_intervals=3 run_intervals=3 stop_intervals=3
+ExecStart=/usr/lib/systemd/tests/testdata/testsuite-16.units/extend-timeout.sh SERVICE=success_all extend_timeout_interval=4 sleep_interval=2 start_intervals=3 run_intervals=3 stop_intervals=3
diff --git a/test/TEST-16-EXTEND-TIMEOUT/testsuite-success-runtime.service b/test/testsuite-16.units/success-runtime.service
similarity index 62%
rename from test/TEST-16-EXTEND-TIMEOUT/testsuite-success-runtime.service
rename to test/testsuite-16.units/success-runtime.service
index dc226f5054..8f83cdb4a1 100644
--- a/test/TEST-16-EXTEND-TIMEOUT/testsuite-success-runtime.service
+++ b/test/testsuite-16.units/success-runtime.service
@@ -1,4 +1,3 @@
-
 [Unit]
 Description=Testsuite: Success Runtime (EXTEND_TIMEOUT_USEC > WATCHDOG_USEC however < RuntimeMaxSec)
 
@@ -10,4 +9,4 @@ Type=notify
 TimeoutStartSec=4
 TimeoutStopSec=4
 RuntimeMaxSec=8
-ExecStart=/extend_timeout_test_service.sh SERVICE=success_runtime extend_timeout_interval=4 sleep_interval=6 start_intervals=0 run_intervals=1 stop_intervals=0
+ExecStart=/usr/lib/systemd/tests/testdata/testsuite-16.units/extend-timeout.sh SERVICE=success_runtime extend_timeout_interval=4 sleep_interval=6 start_intervals=0 run_intervals=1 stop_intervals=0
diff --git a/test/TEST-16-EXTEND-TIMEOUT/testsuite-success-start.service b/test/testsuite-16.units/success-start.service
similarity index 63%
rename from test/TEST-16-EXTEND-TIMEOUT/testsuite-success-start.service
rename to test/testsuite-16.units/success-start.service
index 228eece73e..26c74390c0 100644
--- a/test/TEST-16-EXTEND-TIMEOUT/testsuite-success-start.service
+++ b/test/testsuite-16.units/success-start.service
@@ -1,13 +1,11 @@
-
 [Unit]
 Description=Testsuite: Success Start (EXTEND_TIMEOUT_USEC > WATCHDOG_USEC however < TimeoutStartSec)
 
 [Service]
-
 # EXTEND_TIMEOUT_USEC=4 second interval once at startup, but sleep 6 seconds.
 # Therefore startup is 6 seconds and < TimeoutStartSec so still successful.
 Type=notify
 TimeoutStartSec=8
 TimeoutStopSec=4
 RuntimeMaxSec=4
-ExecStart=/extend_timeout_test_service.sh SERVICE=success_start extend_timeout_interval=4 sleep_interval=6 start_intervals=1 run_intervals=0 stop_intervals=0
+ExecStart=/usr/lib/systemd/tests/testdata/testsuite-16.units/extend-timeout.sh SERVICE=success_start extend_timeout_interval=4 sleep_interval=6 start_intervals=1 run_intervals=0 stop_intervals=0
diff --git a/test/TEST-16-EXTEND-TIMEOUT/testsuite-success-stop.service b/test/testsuite-16.units/success-stop.service
similarity index 63%
rename from test/TEST-16-EXTEND-TIMEOUT/testsuite-success-stop.service
rename to test/testsuite-16.units/success-stop.service
index b809397bf3..b20908ad75 100644
--- a/test/TEST-16-EXTEND-TIMEOUT/testsuite-success-stop.service
+++ b/test/testsuite-16.units/success-stop.service
@@ -1,13 +1,11 @@
-
 [Unit]
 Description=Testsuite: Success Stop (EXTEND_TIMEOUT_USEC > WATCHDOG_USEC however < TimeoutStopSec)
 
 [Service]
-
 # EXTEND_TIMEOUT_USEC=4 seconds once during shutdown, but sleep for 6 seconds.
 # Therefore stop time is 6 seconds and < TimeoutStopSec so still successful.
 Type=notify
 TimeoutStartSec=4
 TimeoutStopSec=8
 RuntimeMaxSec=4
-ExecStart=/extend_timeout_test_service.sh SERVICE=success_stop extend_timeout_interval=4 sleep_interval=6 start_intervals=0 run_intervals=0 stop_intervals=1
+ExecStart=/usr/lib/systemd/tests/testdata/testsuite-16.units/extend-timeout.sh SERVICE=success_stop extend_timeout_interval=4 sleep_interval=6 start_intervals=0 run_intervals=0 stop_intervals=1
diff --git a/test/units/testsuite-16.service b/test/units/testsuite-16.service
new file mode 100644
index 0000000000..1ebf3d3af6
--- /dev/null
+++ b/test/units/testsuite-16.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=TEST-16-EXTEND-TIMEOUT
+# Testsuite: Assess all other testsuite-*.services worked as expected
+
+Wants=success-all.service
+Wants=success-start.service
+Wants=success-runtime.service
+Wants=success-stop.service
+Wants=fail-start.service
+Wants=fail-stop.service
+Wants=fail-runtime.service
+StopWhenUnneeded=yes
+
+[Service]
+Type=simple
+TimeoutStartSec=infinity
+ExecStartPre=/usr/lib/systemd/tests/testdata/units/%N.sh
+ExecStart=true
diff --git a/test/TEST-16-EXTEND-TIMEOUT/assess.sh b/test/units/testsuite-16.sh
similarity index 94%
rename from test/TEST-16-EXTEND-TIMEOUT/assess.sh
rename to test/units/testsuite-16.sh
index 6f98810b30..68e5561245 100755
--- a/test/TEST-16-EXTEND-TIMEOUT/assess.sh
+++ b/test/units/testsuite-16.sh
@@ -19,7 +19,7 @@ function wait_for()
 
     if [[ ! -f /${service}.${result} ]]
     then
-        journalctl -u testsuite-${service/_/-}.service >> "${TL}"
+        journalctl -u ${service/_/-}.service >> "${TL}"
     fi
 }