diff --git a/test/TEST-30-ONCLOCKCHANGE/test.sh b/test/TEST-30-ONCLOCKCHANGE/test.sh
index 9e2c11238c..5b4133202f 100755
--- a/test/TEST-30-ONCLOCKCHANGE/test.sh
+++ b/test/TEST-30-ONCLOCKCHANGE/test.sh
@@ -12,32 +12,9 @@ test_setup() {
         LOG_LEVEL=5
         eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
 
-        inst_any /usr/share/zoneinfo/Europe/Kiev
-        inst_any /usr/share/zoneinfo/Europe/Berlin
-
         setup_basic_environment
         mask_supporting_services
-
-        # extend the watchdog
-        mkdir -p $initdir/etc/systemd/system/systemd-timedated.service.d
-        cat >$initdir/etc/systemd/system/systemd-timedated.service.d/watchdog.conf <<EOF
-[Service]
-WatchdogSec=10min
-EOF
-
-        # 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
     )
 }
 
-do_test "$@"
+do_test "$@" 30
diff --git a/test/meson.build b/test/meson.build
index 6b85854d20..b347a0817d 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -24,6 +24,8 @@ install_subdir('testsuite-16.units',
                install_dir : testdata_dir)
 install_subdir('testsuite-28.units',
                install_dir : testdata_dir)
+install_subdir('testsuite-30.units',
+               install_dir : testdata_dir)
 
 testsuite08_dir = testdata_dir + '/testsuite-08.units'
 install_data('testsuite-08.units/-.mount',
diff --git a/test/test-functions b/test/test-functions
index dfc2573bdc..ca01a81d8e 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -839,6 +839,7 @@ install_config_files() {
     # we want an empty environment
     > $initdir/etc/environment
     > $initdir/etc/machine-id
+
     # set the hostname
     echo systemd-testsuite > $initdir/etc/hostname
     # fstab
diff --git a/test/testsuite-30.units/systemd-timedated.service.d/watchdog.conf b/test/testsuite-30.units/systemd-timedated.service.d/watchdog.conf
new file mode 100644
index 0000000000..d5ed27cf6b
--- /dev/null
+++ b/test/testsuite-30.units/systemd-timedated.service.d/watchdog.conf
@@ -0,0 +1,2 @@
+[Service]
+WatchdogSec=10min
diff --git a/test/units/testsuite-30.service b/test/units/testsuite-30.service
new file mode 100644
index 0000000000..c3bb25853d
--- /dev/null
+++ b/test/units/testsuite-30.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=TEST-30-ONCLOCKCHANGE
+
+[Service]
+ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
+Type=oneshot
diff --git a/test/TEST-30-ONCLOCKCHANGE/testsuite.sh b/test/units/testsuite-30.sh
similarity index 100%
rename from test/TEST-30-ONCLOCKCHANGE/testsuite.sh
rename to test/units/testsuite-30.sh