diff --git a/test/TEST-04-JOURNAL/test.sh b/test/TEST-04-JOURNAL/test.sh
index af96dfd719..868ac28aa1 100755
--- a/test/TEST-04-JOURNAL/test.sh
+++ b/test/TEST-04-JOURNAL/test.sh
@@ -14,31 +14,8 @@ test_setup() {
 
         setup_basic_environment
         mask_supporting_services
-
-        # setup the testsuite service
-        cat >$initdir/etc/systemd/system/testsuite.service <<EOF
-[Unit]
-Description=Testsuite service
-
-[Service]
-ExecStart=/test-journal.sh
-Type=oneshot
-EOF
-
-        cat >$initdir/etc/systemd/system/forever-print-hola.service <<EOF
-[Unit]
-Description=ForeverPrintHola service
-
-[Service]
-Type=simple
-ExecStart=/bin/sh -x -c 'while :; do printf "Hola\n" || touch /i-lose-my-logs; sleep 1; done'
-EOF
-
-        cp test-journal.sh $initdir/
-
-        setup_testsuite
     )
     setup_nspawn_root
 }
 
-do_test "$@"
+do_test "$@" 04
diff --git a/test/meson.build b/test/meson.build
index 2b2ac590c4..15b4c49ff9 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -12,6 +12,8 @@ install_subdir('test-path',
                install_dir : testdata_dir)
 install_subdir('test-umount',
                install_dir : testdata_dir)
+install_subdir('testsuite-04.units',
+               install_dir : testdata_dir)
 
 if conf.get('ENABLE_RESOLVE') == 1
         install_subdir('test-resolve',
diff --git a/test/test-functions b/test/test-functions
index 673685ea6b..b38c04c6b3 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -220,7 +220,7 @@ init=$PATH_TO_INIT \
 console=$CONSOLE \
 selinux=0 \
 $_cgroup_args \
-SYSTEMD_UNIT_PATH=/usr/lib/systemd/tests/testdata/units: \
+SYSTEMD_UNIT_PATH=/usr/lib/systemd/tests/testdata/testsuite-$1.units:/usr/lib/systemd/tests/testdata/units: \
 systemd.unit=testsuite.target \
 systemd.wants=testsuite-$1.service ${_end}
 $KERNEL_APPEND \
@@ -267,7 +267,7 @@ run_nspawn() {
         --register=no
         --kill-signal=SIGKILL
         --directory=$TESTDIR/$1
-        --setenv=SYSTEMD_UNIT_PATH=/usr/lib/systemd/tests/testdata/units:
+        --setenv=SYSTEMD_UNIT_PATH=/usr/lib/systemd/tests/testdata/testsuite-$2.units:/usr/lib/systemd/tests/testdata/units:
         $PATH_TO_INIT
         $KERNEL_APPEND
         systemd.unit=testsuite.target
diff --git a/test/testsuite-04.units/forever-print-hola.service b/test/testsuite-04.units/forever-print-hola.service
new file mode 100644
index 0000000000..a0dc095688
--- /dev/null
+++ b/test/testsuite-04.units/forever-print-hola.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=ForeverPrintHola service
+
+[Service]
+Type=simple
+ExecStart=sh -x -c 'while :; do printf "Hola\n" || touch /i-lose-my-logs; sleep 1; done'
diff --git a/test/units/testsuite-04.service b/test/units/testsuite-04.service
new file mode 100644
index 0000000000..468acfa43e
--- /dev/null
+++ b/test/units/testsuite-04.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=TEST-04-JOURNAL
+
+[Service]
+ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
+Type=oneshot
diff --git a/test/TEST-04-JOURNAL/test-journal.sh b/test/units/testsuite-04.sh
similarity index 100%
rename from test/TEST-04-JOURNAL/test-journal.sh
rename to test/units/testsuite-04.sh