From 7a321b5a21f7ad4ed526ac5a40ea0fabeb2e2ba5 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sat, 11 May 2024 19:17:13 +0200
Subject: [PATCH] test: Rename testsuite-XX units to match test name

Having these named differently than the test itself mostly creates
unecessary confusion and makes writing logic against the tests harder
so let's rename the testsuite-xx units and scripts to just use the
test name itself.
---
 mkosi.images/system/mkosi.conf                |   2 +-
 .../always-activating.service                 |   0
 .../always-activating.socket                  |   0
 .../fails-on-restart-restartdirect.service    |   0
 .../fails-on-restart-restartdirect.target     |   0
 .../fails-on-restart.service                  |   0
 .../fails-on-restart.target                   |   0
 .../hello-after-sleep.target                  |   0
 .../TEST-03-JOBS.units}/hello.service         |   0
 .../propagatestopto-and-pullin.target         |   0
 .../propagatestopto-indirect.target           |   0
 .../propagatestopto-only.target               |   0
 .../sleep-infinity-simple.service             |   0
 .../TEST-03-JOBS.units}/sleep.service         |   0
 .../succeeds-on-restart-restartdirect.service |   2 +-
 .../succeeds-on-restart-restartdirect.target  |   0
 .../succeeds-on-restart.service               |   2 +-
 .../succeeds-on-restart.sh                    |   0
 .../succeeds-on-restart.target                |   0
 .../TEST-03-JOBS.units}/unstoppable.service   |   0
 test/TEST-03-JOBS/meson.build                 |   2 +
 .../delegated-cgroup-filtering.service        |   0
 .../forever-print-hola.service                |   0
 .../logs-filtering.service                    |   0
 .../silent-success.service                    |   0
 .../verbose-success.service                   |   0
 test/TEST-04-JOURNAL/meson.build              |   2 +
 test/TEST-04-JOURNAL/test.sh                  |   2 +-
 .../TEST-06-SELINUX.units}/hola.service       |   0
 test/TEST-06-SELINUX/meson.build              |   2 +
 .../issue14566-repro.service                  |   2 +-
 .../TEST-07-PID1.units}/issue14566-repro.sh   |   0
 .../issue16115-repro-1.service                |   0
 .../issue16115-repro-2.service                |   0
 .../issue16115-repro-3.service                |   0
 .../TEST-07-PID1.units}/issue2467.service     |   0
 .../TEST-07-PID1.units}/issue2467.socket      |   0
 .../TEST-07-PID1.units}/issue2730-alias.mount |   0
 .../TEST-07-PID1.units}/issue2730.mount       |   0
 .../TEST-07-PID1.units}/issue27953.service    |   0
 .../issue3166-fail-on-restart.service         |   0
 .../local-fs.target.wants/issue2730.mount     |   0
 .../pass-fds-to-exec-no.socket                |   0
 .../pass-fds-to-exec-yes.socket               |   0
 test/TEST-07-PID1/meson.build                 |   2 +
 test/TEST-08-INITRD/test.sh                   |   2 +-
 test/TEST-13-NSPAWN/test.sh                   |   2 +-
 .../extend-timeout.sh                         |   0
 .../fail-runtime.service                      |   2 +-
 .../fail-start.service                        |   2 +-
 .../fail-stop.service                         |   2 +-
 .../success-all.service                       |   2 +-
 .../success-runtime.service                   |   2 +-
 .../success-start.service                     |   2 +-
 .../success-stop.service                      |   2 +-
 test/TEST-16-EXTEND-TIMEOUT/meson.build       |   2 +
 .../TEST-23-UNIT-FILE-binds-to.service}       |   6 +-
 .../TEST-23-UNIT-FILE-bound-by.service}       |   0
 .../TEST-23-UNIT-FILE-fail.service}           |   2 +-
 ...23-UNIT-FILE-joins-namespace-of-1.service} |   0
 ...23-UNIT-FILE-joins-namespace-of-2.service} |   2 +-
 ...23-UNIT-FILE-joins-namespace-of-3.service} |   2 +-
 ...23-UNIT-FILE-joins-namespace-of-4.service} |   2 +-
 ...23-UNIT-FILE-joins-namespace-of-5.service} |   0
 ...23-UNIT-FILE-joins-namespace-of-6.service} |   2 +-
 ...23-UNIT-FILE-joins-namespace-of-7.service} |   2 +-
 ...23-UNIT-FILE-joins-namespace-of-8.service} |   0
 ...23-UNIT-FILE-joins-namespace-of-9.service} |   2 +-
 .../TEST-23-UNIT-FILE-namespaced.service}     |   2 +-
 .../TEST-23-UNIT-FILE-non-namespaced.service} |   0
 ...TEST-23-UNIT-FILE-oneshot-restartforce.sh} |   0
 .../TEST-23-UNIT-FILE-openfile-server.socket} |   0
 ...EST-23-UNIT-FILE-openfile-server@.service} |   0
 .../TEST-23-UNIT-FILE-prop-stop-one.service   |  10 ++
 .../TEST-23-UNIT-FILE-prop-stop-two.service}  |   0
 .../TEST-23-UNIT-FILE-retry-fail.service}     |   2 +-
 .../TEST-23-UNIT-FILE-retry-upheld.service}   |   4 +-
 .../TEST-23-UNIT-FILE-retry-uphold.service}   |   2 +-
 .../TEST-23-UNIT-FILE-short-lived.service}    |   2 +-
 ...IT-FILE-specifier-j-depends-wants.service} |   0
 ...ST-23-UNIT-FILE-specifier-j-wants.service} |   4 +-
 .../TEST-23-UNIT-FILE-success.service}        |   2 +-
 ...EST-23-UNIT-FILE-upheldby-install.service} |   2 +-
 .../TEST-23-UNIT-FILE-uphold.service}         |   2 +-
 test/TEST-23-UNIT-FILE/meson.build            |   2 +
 .../systemd-timedated.service.d/watchdog.conf |   0
 test/TEST-30-ONCLOCKCHANGE/meson.build        |   2 +
 .../test-honor-first-shutdown.service         |   2 +-
 .../test-honor-first-shutdown.sh              |   0
 test/TEST-52-HONORFIRSTSHUTDOWN/meson.build   |   2 +
 .../TEST-63-PATH.units}/test63-glob.path      |   0
 .../TEST-63-PATH.units}/test63-glob.service   |   0
 .../test63-issue-24577-dep.service            |   0
 .../test63-issue-24577.path                   |   0
 .../test63-issue-24577.service                |   0
 .../TEST-63-PATH.units}/test63-pr-30768.path  |   0
 .../test63-pr-30768.service                   |   0
 .../TEST-63-PATH.units}/test63.path           |   0
 .../TEST-63-PATH.units}/test63.service        |   0
 test/TEST-63-PATH/meson.build                 |   2 +
 .../fdstore-nopin.service                     |   2 +-
 .../fdstore-pin.service                       |   2 +-
 .../fdstore-pin.sh                            |   0
 .../fdstore-pin.target                        |   0
 .../TEST-80-NOTIFYACCESS.units/notify.service |   4 +
 .../TEST-80-NOTIFYACCESS.units}/test.sh       |   0
 test/TEST-80-NOTIFYACCESS/meson.build         |   2 +
 test/integration-test-wrapper.py              |   5 +-
 test/meson.build                              | 132 ++++++++----------
 test/test-functions                           |  31 ++--
 .../testsuite-23-prop-stop-one.service        |  10 --
 test/testsuite-80.units/notify.service        |   4 -
 ...suite-01.service => TEST-01-BASIC.service} |   0
 .../{testsuite-01.sh => TEST-01-BASIC.sh}     |   0
 ...e-02.service => TEST-02-UNITTESTS.service} |   0
 .../{testsuite-02.sh => TEST-02-UNITTESTS.sh} |   0
 ...tsuite-03.service => TEST-03-JOBS.service} |   0
 .../{testsuite-03.sh => TEST-03-JOBS.sh}      |   0
 ...h => TEST-04-JOURNAL.LogFilterPatterns.sh} |   0
 ...ST-04-JOURNAL.SYSTEMD_JOURNAL_COMPRESS.sh} |   0
 ...ite-04.bsod.sh => TEST-04-JOURNAL.bsod.sh} |   0
 ...suite-04.cat.sh => TEST-04-JOURNAL.cat.sh} |   0
 ... => TEST-04-JOURNAL.corrupted-journals.sh} |   0
 ...suite-04.fss.sh => TEST-04-JOURNAL.fss.sh} |   0
 ...d.sh => TEST-04-JOURNAL.journal-append.sh} |   0
 ....sh => TEST-04-JOURNAL.journal-corrupt.sh} |   0
 ...sh => TEST-04-JOURNAL.journal-gatewayd.sh} |   0
 ...e.sh => TEST-04-JOURNAL.journal-remote.sh} |   0
 ....journal.sh => TEST-04-JOURNAL.journal.sh} |   0
 ...ite-04.service => TEST-04-JOURNAL.service} |   0
 .../{testsuite-04.sh => TEST-04-JOURNAL.sh}   |   0
 ....sh => TEST-05-RLIMITS.effective-limit.sh} |   0
 ...05.rlimit.sh => TEST-05-RLIMITS.rlimit.sh} |   4 +-
 ...ite-19.service => TEST-05-RLIMITS.service} |   2 +-
 .../{testsuite-05.sh => TEST-05-RLIMITS.sh}   |   0
 ...ite-06.service => TEST-06-SELINUX.service} |   0
 .../{testsuite-06.sh => TEST-06-SELINUX.sh}   |   0
 ...aux-scope.sh => TEST-07-PID1.aux-scope.sh} |   0
 ...ontext.sh => TEST-07-PID1.exec-context.sh} |   0
 ...h => TEST-07-PID1.exec-deserialization.sh} |   0
 ...mps.sh => TEST-07-PID1.exec-timestamps.sh} |   0
 ...e-14566.sh => TEST-07-PID1.issue-14566.sh} |   0
 ...e-16115.sh => TEST-07-PID1.issue-16115.sh} |   0
 ...sue-1981.sh => TEST-07-PID1.issue-1981.sh} |   0
 ...sue-2467.sh => TEST-07-PID1.issue-2467.sh} |   0
 ...e-27953.sh => TEST-07-PID1.issue-27953.sh} |   0
 ...e-30412.sh => TEST-07-PID1.issue-30412.sh} |   0
 ...sue-3166.sh => TEST-07-PID1.issue-3166.sh} |   0
 ...sue-3171.sh => TEST-07-PID1.issue-3171.sh} |   0
 ...nge.sh => TEST-07-PID1.main-PID-change.sh} |  20 +--
 ...sh => TEST-07-PID1.mount-invalid-chars.sh} |   0
 ...ll-limit.sh => TEST-07-PID1.poll-limit.sh} |   0
 ...7.pr-31351.sh => TEST-07-PID1.pr-31351.sh} |   0
 ...ork.sh => TEST-07-PID1.private-network.sh} |   0
 ...tsuite-07.service => TEST-07-PID1.service} |   0
 .../{testsuite-07.sh => TEST-07-PID1.sh}      |   0
 ...fds.sh => TEST-07-PID1.socket-pass-fds.sh} |   0
 ....sh => TEST-07-PID1.type-exec-parallel.sh} |   0
 ...uite-08.service => TEST-08-INITRD.service} |   0
 .../{testsuite-08.sh => TEST-08-INITRD.sh}    |   0
 ...9.journal.sh => TEST-09-REBOOT.journal.sh} |   0
 ...uite-09.service => TEST-09-REBOOT.service} |   0
 .../{testsuite-09.sh => TEST-09-REBOOT.sh}    |   0
 ...portctl.sh => TEST-13-NSPAWN.importctl.sh} |   0
 ...inectl.sh => TEST-13-NSPAWN.machinectl.sh} |   0
 ...wn-oci.sh => TEST-13-NSPAWN.nspawn-oci.sh} |   2 +-
 ...-13.nspawn.sh => TEST-13-NSPAWN.nspawn.sh} |  32 ++---
 ...es.sh => TEST-13-NSPAWN.nss-mymachines.sh} |   0
 ...uite-13.service => TEST-13-NSPAWN.service} |   0
 .../{testsuite-13.sh => TEST-13-NSPAWN.sh}    |   0
 ...uite-15.service => TEST-15-DROPIN.service} |   0
 .../{testsuite-15.sh => TEST-15-DROPIN.sh}    |  12 +-
 ...service => TEST-16-EXTEND-TIMEOUT.service} |   0
 ...tsuite-16.sh => TEST-16-EXTEND-TIMEOUT.sh} |   0
 ...{testsuite-17.00.sh => TEST-17-UDEV.00.sh} |   0
 ...{testsuite-17.01.sh => TEST-17-UDEV.01.sh} |   0
 ...{testsuite-17.02.sh => TEST-17-UDEV.02.sh} |   0
 ...{testsuite-17.03.sh => TEST-17-UDEV.03.sh} |   0
 ...{testsuite-17.04.sh => TEST-17-UDEV.04.sh} |   0
 ...{testsuite-17.05.sh => TEST-17-UDEV.05.sh} |   0
 ...{testsuite-17.06.sh => TEST-17-UDEV.06.sh} |   0
 ...{testsuite-17.07.sh => TEST-17-UDEV.07.sh} |   0
 ...{testsuite-17.08.sh => TEST-17-UDEV.08.sh} |   0
 ...{testsuite-17.09.sh => TEST-17-UDEV.09.sh} |   0
 ...{testsuite-17.10.sh => TEST-17-UDEV.10.sh} |   0
 ...{testsuite-17.11.sh => TEST-17-UDEV.11.sh} |   0
 ...{testsuite-17.12.sh => TEST-17-UDEV.12.sh} |   0
 ...{testsuite-17.13.sh => TEST-17-UDEV.13.sh} |   0
 ...entials.sh => TEST-17-UDEV.credentials.sh} |   0
 ...perty.sh => TEST-17-UDEV.link-property.sh} |   0
 ...tsuite-17.service => TEST-17-UDEV.service} |   0
 .../{testsuite-17.sh => TEST-17-UDEV.sh}      |   0
 ....service => TEST-18-FAILUREACTION.service} |   0
 ...stsuite-18.sh => TEST-18-FAILUREACTION.sh} |   0
 ...p.sh => TEST-19-CGROUP.ExitType-cgroup.sh} |   0
 ...ice.sh => TEST-19-CGROUP.cleanup-slice.sh} |   0
 ...delegate.sh => TEST-19-CGROUP.delegate.sh} |   0
 ...uite-05.service => TEST-19-CGROUP.service} |   2 +-
 .../{testsuite-19.sh => TEST-19-CGROUP.sh}    |   0
 ...te-21.service => TEST-21-DFUZZERE.service} |   0
 .../{testsuite-21.sh => TEST-21-DFUZZERE.sh}  |   0
 ...tsuite-22.01.sh => TEST-22-TMPFILES.01.sh} |   0
 ...tsuite-22.02.sh => TEST-22-TMPFILES.02.sh} |   0
 ...tsuite-22.03.sh => TEST-22-TMPFILES.03.sh} |   0
 ...tsuite-22.04.sh => TEST-22-TMPFILES.04.sh} |   0
 ...tsuite-22.05.sh => TEST-22-TMPFILES.05.sh} |   0
 ...tsuite-22.06.sh => TEST-22-TMPFILES.06.sh} |   0
 ...tsuite-22.07.sh => TEST-22-TMPFILES.07.sh} |   0
 ...tsuite-22.08.sh => TEST-22-TMPFILES.08.sh} |   0
 ...tsuite-22.09.sh => TEST-22-TMPFILES.09.sh} |   0
 ...tsuite-22.10.sh => TEST-22-TMPFILES.10.sh} |   0
 ...tsuite-22.11.sh => TEST-22-TMPFILES.11.sh} |   0
 ...tsuite-22.12.sh => TEST-22-TMPFILES.12.sh} |   0
 ...tsuite-22.13.sh => TEST-22-TMPFILES.13.sh} |   0
 ...tsuite-22.14.sh => TEST-22-TMPFILES.14.sh} |   0
 ...tsuite-22.15.sh => TEST-22-TMPFILES.15.sh} |   0
 ...tsuite-22.16.sh => TEST-22-TMPFILES.16.sh} |   0
 ...tsuite-22.17.sh => TEST-22-TMPFILES.17.sh} |   0
 ...tsuite-22.18.sh => TEST-22-TMPFILES.18.sh} |   0
 ...tsuite-22.19.sh => TEST-22-TMPFILES.19.sh} |   0
 ...te-22.service => TEST-22-TMPFILES.service} |   0
 .../{testsuite-22.sh => TEST-22-TMPFILES.sh}  |   0
 ...sh => TEST-23-UNIT-FILE-openfile-child.sh} |   0
 test/units/TEST-23-UNIT-FILE-short-lived.sh   |  18 +++
 ...oad.sh => TEST-23-UNIT-FILE.ExecReload.sh} |   0
 ...t.sh => TEST-23-UNIT-FILE.ExecStopPost.sh} |   0
 .../TEST-23-UNIT-FILE.JoinsNamespaceOf.sh     |  31 ++++
 ...-23-UNIT-FILE.RuntimeDirectoryPreserve.sh} |   0
 ...sh => TEST-23-UNIT-FILE.StandardOutput.sh} |   8 +-
 test/units/TEST-23-UNIT-FILE.Upholds.sh       |  99 +++++++++++++
 ...nit.sh => TEST-23-UNIT-FILE.clean-unit.sh} |   0
 ...h => TEST-23-UNIT-FILE.exec-command-ex.sh} |   0
 ...h => TEST-23-UNIT-FILE.oneshot-restart.sh} |   6 +-
 ...nfile.sh => TEST-23-UNIT-FILE.openfile.sh} |   8 +-
 ...=> TEST-23-UNIT-FILE.percentj-wantedby.sh} |   4 +-
 .../TEST-23-UNIT-FILE.runtime-bind-paths.sh   |  43 ++++++
 ...e-23.service => TEST-23-UNIT-FILE.service} |   2 +-
 .../{testsuite-23.sh => TEST-23-UNIT-FILE.sh} |   0
 .../TEST-23-UNIT-FILE.start-stop-no-reload.sh |  93 ++++++++++++
 ...tedir.sh => TEST-23-UNIT-FILE.statedir.sh} |   0
 ...h => TEST-23-UNIT-FILE.success-failure.sh} |   0
 ...exec.sh => TEST-23-UNIT-FILE.type-exec.sh} |   0
 ...e-23.utmp.sh => TEST-23-UNIT-FILE.utmp.sh} |   0
 ...=> TEST-23-UNIT-FILE.verify-unit-files.sh} |   0
 ....whoami.sh => TEST-23-UNIT-FILE.whoami.sh} |   6 +-
 ...-24.service => TEST-24-CRYPTSETUP.service} |   0
 ...{testsuite-24.sh => TEST-24-CRYPTSETUP.sh} |   0
 ...uite-25.service => TEST-25-IMPORT.service} |   0
 .../{testsuite-25.sh => TEST-25-IMPORT.sh}    |   0
 ...e-26.service => TEST-26-SYSTEMCTL.service} |   0
 .../{testsuite-26.sh => TEST-26-SYSTEMCTL.sh} |   0
 ...te-29.service => TEST-29-PORTABLE.service} |   0
 .../{testsuite-29.sh => TEST-29-PORTABLE.sh}  |   0
 ....service => TEST-30-ONCLOCKCHANGE.service} |   0
 ...stsuite-30.sh => TEST-30-ONCLOCKCHANGE.sh} |   0
 ...ice => TEST-31-DEVICE-ENUMERATION.service} |   0
 ...te-31.sh => TEST-31-DEVICE-ENUMERATION.sh} |   0
 ...e-32.service => TEST-32-OOMPOLICY.service} |   0
 .../{testsuite-32.sh => TEST-32-OOMPOLICY.sh} |   2 +-
 ...ice => TEST-34-DYNAMICUSERMIGRATE.service} |   0
 ...te-34.sh => TEST-34-DYNAMICUSERMIGRATE.sh} |   0
 ...suite-35.service => TEST-35-LOGIN.service} |   0
 .../{testsuite-35.sh => TEST-35-LOGIN.sh}     |   0
 ...-36.service => TEST-36-NUMAPOLICY.service} |   0
 ...{testsuite-36.sh => TEST-36-NUMAPOLICY.sh} |   0
 ....service => TEST-38-FREEZER-sleep.service} |   0
 ...ite-38.service => TEST-38-FREEZER.service} |   0
 .../{testsuite-38.sh => TEST-38-FREEZER.sh}   |   2 +-
 ...ice => TEST-43-PRIVATEUSER-UNPRIV.service} |   0
 ...te-43.sh => TEST-43-PRIVATEUSER-UNPRIV.sh} |   0
 ....service => TEST-44-LOG-NAMESPACE.service} |   2 +-
 ...stsuite-44.sh => TEST-44-LOG-NAMESPACE.sh} |   0
 ...te-45.service => TEST-45-TIMEDATE.service} |   0
 .../{testsuite-45.sh => TEST-45-TIMEDATE.sh}  |   0
 ...suite-46.service => TEST-46-HOMED.service} |   0
 .../{testsuite-46.sh => TEST-46-HOMED.sh}     |   0
 ...suite-50.DDI.sh => TEST-50-DISSECT.DDI.sh} |   0
 ....dissect.sh => TEST-50-DISSECT.dissect.sh} |   0
 ...ountfsd.sh => TEST-50-DISSECT.mountfsd.sh} |   0
 ...ite-50.service => TEST-50-DISSECT.service} |   0
 .../{testsuite-50.sh => TEST-50-DISSECT.sh}   |   2 +-
 ...50.sysext.sh => TEST-50-DISSECT.sysext.sh} |   0
 ...ice => TEST-52-HONORFIRSTSHUTDOWN.service} |   2 +-
 ...te-52.sh => TEST-52-HONORFIRSTSHUTDOWN.sh} |   0
 ...53.service => TEST-53-ISSUE-16347.service} |   0
 ...testsuite-53.sh => TEST-53-ISSUE-16347.sh} |   0
 ...suite-64.service => TEST-54-CREDS.service} |   2 +-
 .../{testsuite-54.sh => TEST-54-CREDS.sh}     |   0
 ...service => TEST-55-OOMD-testbloat.service} |   2 +-
 ...service => TEST-55-OOMD-testchill.service} |   2 +-
 ...service => TEST-55-OOMD-testmunch.service} |   2 +-
 ...load.slice => TEST-55-OOMD-workload.slice} |   0
 ...tsuite-55.service => TEST-55-OOMD.service} |   2 +-
 .../{testsuite-55.sh => TEST-55-OOMD.sh}      |  56 ++++----
 ...uite-58.service => TEST-58-REPART.service} |   0
 .../{testsuite-58.sh => TEST-58-REPART.sh}    |   2 +-
 ...vice => TEST-59-RELOADING-RESTART.service} |   0
 ...ite-59.sh => TEST-59-RELOADING-RESTART.sh} |   0
 ...ervice => TEST-60-MOUNT-RATELIMIT.service} |   0
 ...suite-60.sh => TEST-60-MOUNT-RATELIMIT.sh} |  10 +-
 ...vice => TEST-62-RESTRICT-IFACES-1.service} |   0
 ...vice => TEST-62-RESTRICT-IFACES-2.service} |   0
 ...vice => TEST-62-RESTRICT-IFACES-3.service} |   0
 ...vice => TEST-62-RESTRICT-IFACES-4.service} |   0
 ...vice => TEST-62-RESTRICT-IFACES-5.service} |   0
 ...vice => TEST-62-RESTRICT-IFACES-6.service} |   0
 ...ervice => TEST-62-RESTRICT-IFACES.service} |   0
 ...suite-62.sh => TEST-62-RESTRICT-IFACES.sh} |  10 +-
 ...tsuite-63.service => TEST-63-PATH.service} |   0
 .../{testsuite-63.sh => TEST-63-PATH.sh}      |   0
 ...4.service => TEST-64-UDEV-STORAGE.service} |   2 +-
 ...estsuite-64.sh => TEST-64-UDEV-STORAGE.sh} |   0
 ...ite-65.service => TEST-65-ANALYZE.service} |   0
 .../{testsuite-65.sh => TEST-65-ANALYZE.sh}   |   0
 ...DEVICE-ISOLATION-device-isolation.service} |   4 +-
 ...uite-66.sh => TEST-66-DEVICE-ISOLATION.sh} |   6 +-
 test/units/TEST-66-DEVICEISOLATION.service    |   8 ++
 ...e-67.service => TEST-67-INTEGRITY.service} |   0
 .../{testsuite-67.sh => TEST-67-INTEGRITY.sh} |   0
 ... => TEST-68-PROPAGATE-EXIT-STATUS.service} |   0
 ...68.sh => TEST-68-PROPAGATE-EXIT-STATUS.sh} |   0
 ...te-69.service => TEST-69-SHUTDOWN.service} |   0
 ...uite-70.creds.sh => TEST-70-TPM2.creds.sh} |   0
 ...tenroll.sh => TEST-70-TPM2.cryptenroll.sh} |   0
 ...yptsetup.sh => TEST-70-TPM2.cryptsetup.sh} |   0
 ...-70.measure.sh => TEST-70-TPM2.measure.sh} |   0
 ...pcrextend.sh => TEST-70-TPM2.pcrextend.sh} |   0
 ...-70.pcrlock.sh => TEST-70-TPM2.pcrlock.sh} |   0
 ...tsuite-70.service => TEST-70-TPM2.service} |   0
 .../{testsuite-70.sh => TEST-70-TPM2.sh}      |   0
 ...m2-setup.sh => TEST-70-TPM2.tpm2-setup.sh} |   0
 ...te-71.service => TEST-71-HOSTNAME.service} |   0
 .../{testsuite-71.sh => TEST-71-HOSTNAME.sh}  |   0
 ...e-72.service => TEST-72-SYSUPDATE.service} |   0
 .../{testsuite-72.sh => TEST-72-SYSUPDATE.sh} |   0
 ...uite-73.service => TEST-73-LOCALE.service} |   0
 .../{testsuite-73.sh => TEST-73-LOCALE.sh}    |   0
 ....sh => TEST-74-AUX-UTILS.battery-check.sh} |   0
 ...ootctl.sh => TEST-74-AUX-UTILS.bootctl.sh} |   0
 ....busctl.sh => TEST-74-AUX-UTILS.busctl.sh} |   0
 ...apsule.sh => TEST-74-AUX-UTILS.capsule.sh} |   0
 ...e-74.cgls.sh => TEST-74-AUX-UTILS.cgls.sh} |   0
 ...74.cgtop.sh => TEST-74-AUX-UTILS.cgtop.sh} |   0
 ...edump.sh => TEST-74-AUX-UTILS.coredump.sh} |   2 +-
 ...74.delta.sh => TEST-74-AUX-UTILS.delta.sh} |   0
 ....escape.sh => TEST-74-AUX-UTILS.escape.sh} |   0
 ...boot.sh => TEST-74-AUX-UTILS.firstboot.sh} |   0
 ...74.id128.sh => TEST-74-AUX-UTILS.id128.sh} |   0
 ... => TEST-74-AUX-UTILS.machine-id-setup.sh} |   0
 ...d.sh => TEST-74-AUX-UTILS.modules-load.sh} |   0
 ...74.mount.sh => TEST-74-AUX-UTILS.mount.sh} |   0
 ...=> TEST-74-AUX-UTILS.network-generator.sh} |   0
 ...ctl.sh => TEST-74-AUX-UTILS.networkctl.sh} |   0
 ...e-74.path.sh => TEST-74-AUX-UTILS.path.sh} |   0
 ....pstore.sh => TEST-74-AUX-UTILS.pstore.sh} |   0
 ...ite-74.run.sh => TEST-74-AUX-UTILS.run.sh} |   0
 ...e-74.service => TEST-74-AUX-UTILS.service} |   0
 .../{testsuite-74.sh => TEST-74-AUX-UTILS.sh} |   0
 ....socket.sh => TEST-74-AUX-UTILS.socket.sh} |   0
 ...ite-74.ssh.sh => TEST-74-AUX-UTILS.ssh.sh} |   0
 ...ctl.sh => TEST-74-AUX-UTILS.varlinkctl.sh} |   0
 ...74.vpick.sh => TEST-74-AUX-UTILS.vpick.sh} |   0
 test/units/TEST-75-RESOLVED.service           |   8 ++
 .../{testsuite-75.sh => TEST-75-RESOLVED.sh}  |   0
 ...uite-76.service => TEST-76-SYSCTL.service} |   0
 .../{testsuite-76.sh => TEST-76-SYSCTL.sh}    |   0
 ...te-78.service => TEST-78-SIGQUEUE.service} |   0
 .../{testsuite-78.sh => TEST-78-SIGQUEUE.sh}  |   0
 ...te-79.service => TEST-79-MEMPRESS.service} |   0
 .../{testsuite-79.sh => TEST-79-MEMPRESS.sh}  |   2 +-
 ...0.service => TEST-80-NOTIFYACCESS.service} |   0
 ...estsuite-80.sh => TEST-80-NOTIFYACCESS.sh} |   0
 ... => TEST-81-GENERATORS.debug-generator.sh} |   0
 ...-81-GENERATORS.environment-d-generator.sh} |   0
 ... => TEST-81-GENERATORS.fstab-generator.sh} |   0
 ... => TEST-81-GENERATORS.getty-generator.sh} |   0
 ...sh => TEST-81-GENERATORS.run-generator.sh} |   0
 ...-81.service => TEST-81-GENERATORS.service} |   0
 ...{testsuite-81.sh => TEST-81-GENERATORS.sh} |   0
 ...-81-GENERATORS.system-update-generator.sh} |   0
 ...-82.service => TEST-82-SOFTREBOOT.service} |   0
 ...{testsuite-82.sh => TEST-82-SOFTREBOOT.sh} |  60 ++++----
 ...suite-83.service => TEST-83-BTRFS.service} |   0
 .../{testsuite-83.sh => TEST-83-BTRFS.sh}     |   0
 ...e-84.service => TEST-84-STORAGETM.service} |   0
 .../{testsuite-84.sh => TEST-84-STORAGETM.sh} |   0
 test/units/test-control.sh                    |   2 +-
 test/units/testsuite-23-short-lived.sh        |  18 ---
 test/units/testsuite-23.JoinsNamespaceOf.sh   |  31 ----
 test/units/testsuite-23.Upholds.sh            |  99 -------------
 test/units/testsuite-23.runtime-bind-paths.sh |  43 ------
 .../testsuite-23.start-stop-no-reload.sh      |  93 ------------
 test/units/testsuite-66.service               |   8 --
 test/units/testsuite-75.service               |   8 --
 test/units/util.sh                            |   4 +-
 395 files changed, 592 insertions(+), 588 deletions(-)
 rename test/{testsuite-03.units => TEST-03-JOBS/TEST-03-JOBS.units}/always-activating.service (100%)
 rename test/{testsuite-03.units => TEST-03-JOBS/TEST-03-JOBS.units}/always-activating.socket (100%)
 rename test/{testsuite-03.units => TEST-03-JOBS/TEST-03-JOBS.units}/fails-on-restart-restartdirect.service (100%)
 rename test/{testsuite-03.units => TEST-03-JOBS/TEST-03-JOBS.units}/fails-on-restart-restartdirect.target (100%)
 rename test/{testsuite-03.units => TEST-03-JOBS/TEST-03-JOBS.units}/fails-on-restart.service (100%)
 rename test/{testsuite-03.units => TEST-03-JOBS/TEST-03-JOBS.units}/fails-on-restart.target (100%)
 rename test/{testsuite-03.units => TEST-03-JOBS/TEST-03-JOBS.units}/hello-after-sleep.target (100%)
 rename test/{testsuite-03.units => TEST-03-JOBS/TEST-03-JOBS.units}/hello.service (100%)
 rename test/{testsuite-03.units => TEST-03-JOBS/TEST-03-JOBS.units}/propagatestopto-and-pullin.target (100%)
 rename test/{testsuite-03.units => TEST-03-JOBS/TEST-03-JOBS.units}/propagatestopto-indirect.target (100%)
 rename test/{testsuite-03.units => TEST-03-JOBS/TEST-03-JOBS.units}/propagatestopto-only.target (100%)
 rename test/{testsuite-03.units => TEST-03-JOBS/TEST-03-JOBS.units}/sleep-infinity-simple.service (100%)
 rename test/{testsuite-03.units => TEST-03-JOBS/TEST-03-JOBS.units}/sleep.service (100%)
 rename test/{testsuite-03.units => TEST-03-JOBS/TEST-03-JOBS.units}/succeeds-on-restart-restartdirect.service (66%)
 rename test/{testsuite-03.units => TEST-03-JOBS/TEST-03-JOBS.units}/succeeds-on-restart-restartdirect.target (100%)
 rename test/{testsuite-03.units => TEST-03-JOBS/TEST-03-JOBS.units}/succeeds-on-restart.service (66%)
 rename test/{testsuite-03.units => TEST-03-JOBS/TEST-03-JOBS.units}/succeeds-on-restart.sh (100%)
 rename test/{testsuite-03.units => TEST-03-JOBS/TEST-03-JOBS.units}/succeeds-on-restart.target (100%)
 rename test/{testsuite-03.units => TEST-03-JOBS/TEST-03-JOBS.units}/unstoppable.service (100%)
 rename test/{testsuite-04.units => TEST-04-JOURNAL/TEST-04-JOURNAL.units}/delegated-cgroup-filtering.service (100%)
 rename test/{testsuite-04.units => TEST-04-JOURNAL/TEST-04-JOURNAL.units}/forever-print-hola.service (100%)
 rename test/{testsuite-04.units => TEST-04-JOURNAL/TEST-04-JOURNAL.units}/logs-filtering.service (100%)
 rename test/{testsuite-04.units => TEST-04-JOURNAL/TEST-04-JOURNAL.units}/silent-success.service (100%)
 rename test/{testsuite-04.units => TEST-04-JOURNAL/TEST-04-JOURNAL.units}/verbose-success.service (100%)
 rename test/{testsuite-06.units => TEST-06-SELINUX/TEST-06-SELINUX.units}/hola.service (100%)
 rename test/{testsuite-07.units => TEST-07-PID1/TEST-07-PID1.units}/issue14566-repro.service (67%)
 rename test/{testsuite-07.units => TEST-07-PID1/TEST-07-PID1.units}/issue14566-repro.sh (100%)
 rename test/{testsuite-07.units => TEST-07-PID1/TEST-07-PID1.units}/issue16115-repro-1.service (100%)
 rename test/{testsuite-07.units => TEST-07-PID1/TEST-07-PID1.units}/issue16115-repro-2.service (100%)
 rename test/{testsuite-07.units => TEST-07-PID1/TEST-07-PID1.units}/issue16115-repro-3.service (100%)
 rename test/{testsuite-07.units => TEST-07-PID1/TEST-07-PID1.units}/issue2467.service (100%)
 rename test/{testsuite-07.units => TEST-07-PID1/TEST-07-PID1.units}/issue2467.socket (100%)
 rename test/{testsuite-07.units => TEST-07-PID1/TEST-07-PID1.units}/issue2730-alias.mount (100%)
 rename test/{testsuite-07.units => TEST-07-PID1/TEST-07-PID1.units}/issue2730.mount (100%)
 rename test/{testsuite-07.units => TEST-07-PID1/TEST-07-PID1.units}/issue27953.service (100%)
 rename test/{testsuite-07.units => TEST-07-PID1/TEST-07-PID1.units}/issue3166-fail-on-restart.service (100%)
 rename test/{testsuite-07.units => TEST-07-PID1/TEST-07-PID1.units}/local-fs.target.wants/issue2730.mount (100%)
 rename test/{testsuite-07.units => TEST-07-PID1/TEST-07-PID1.units}/pass-fds-to-exec-no.socket (100%)
 rename test/{testsuite-07.units => TEST-07-PID1/TEST-07-PID1.units}/pass-fds-to-exec-yes.socket (100%)
 rename test/{testsuite-16.units => TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units}/extend-timeout.sh (100%)
 rename test/{testsuite-16.units => TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units}/fail-runtime.service (86%)
 rename test/{testsuite-16.units => TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units}/fail-start.service (86%)
 rename test/{testsuite-16.units => TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units}/fail-stop.service (90%)
 rename test/{testsuite-16.units => TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units}/success-all.service (87%)
 rename test/{testsuite-16.units => TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units}/success-runtime.service (84%)
 rename test/{testsuite-16.units => TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units}/success-start.service (85%)
 rename test/{testsuite-16.units => TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units}/success-stop.service (85%)
 rename test/{testsuite-23.units/testsuite-23-binds-to.service => TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-binds-to.service} (52%)
 rename test/{testsuite-23.units/testsuite-23-bound-by.service => TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-bound-by.service} (100%)
 rename test/{testsuite-23.units/testsuite-23-fail.service => TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-fail.service} (70%)
 rename test/{testsuite-23.units/testsuite-23-joins-namespace-of-1.service => TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-1.service} (100%)
 rename test/{testsuite-23.units/testsuite-23-joins-namespace-of-2.service => TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-2.service} (73%)
 rename test/{testsuite-23.units/testsuite-23-joins-namespace-of-3.service => TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-3.service} (73%)
 rename test/{testsuite-23.units/testsuite-23-joins-namespace-of-4.service => TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-4.service} (77%)
 rename test/{testsuite-23.units/testsuite-23-joins-namespace-of-5.service => TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-5.service} (100%)
 rename test/{testsuite-23.units/testsuite-23-joins-namespace-of-6.service => TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-6.service} (77%)
 rename test/{testsuite-23.units/testsuite-23-joins-namespace-of-7.service => TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-7.service} (77%)
 rename test/{testsuite-23.units/testsuite-23-joins-namespace-of-8.service => TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-8.service} (100%)
 rename test/{testsuite-23.units/testsuite-23-joins-namespace-of-9.service => TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-9.service} (77%)
 rename test/{testsuite-23.units/testsuite-23-namespaced.service => TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-namespaced.service} (88%)
 rename test/{testsuite-23.units/testsuite-23-non-namespaced.service => TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-non-namespaced.service} (100%)
 rename test/{testsuite-23.units/testsuite-23-oneshot-restartforce.sh => TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-oneshot-restartforce.sh} (100%)
 rename test/{testsuite-23.units/testsuite-23-openfile-server.socket => TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-openfile-server.socket} (100%)
 rename test/{testsuite-23.units/testsuite-23-openfile-server@.service => TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-openfile-server@.service} (100%)
 create mode 100644 test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-prop-stop-one.service
 rename test/{testsuite-23.units/testsuite-23-prop-stop-two.service => TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-prop-stop-two.service} (100%)
 rename test/{testsuite-23.units/testsuite-23-retry-fail.service => TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-retry-fail.service} (60%)
 rename test/{testsuite-23.units/testsuite-23-retry-upheld.service => TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-retry-upheld.service} (60%)
 rename test/{testsuite-23.units/testsuite-23-retry-uphold.service => TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-retry-uphold.service} (70%)
 rename test/{testsuite-23.units/testsuite-23-short-lived.service => TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-short-lived.service} (74%)
 rename test/{testsuite-23.units/testsuite-23-specifier-j-depends-wants.service => TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-specifier-j-depends-wants.service} (100%)
 rename test/{testsuite-23.units/testsuite-23-specifier-j-wants.service => TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-specifier-j-wants.service} (65%)
 rename test/{testsuite-23.units/testsuite-23-success.service => TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-success.service} (72%)
 rename test/{testsuite-23.units/testsuite-23-upheldby-install.service => TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-upheldby-install.service} (76%)
 rename test/{testsuite-23.units/testsuite-23-uphold.service => TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-uphold.service} (71%)
 rename test/{testsuite-30.units => TEST-30-ONCLOCKCHANGE/TEST-30-ONCLOCKCHANGE.units}/systemd-timedated.service.d/watchdog.conf (100%)
 rename test/{testsuite-52.units => TEST-52-HONORFIRSTSHUTDOWN/TEST-52-HONORFIRSTSHUTDOWN.units}/test-honor-first-shutdown.service (73%)
 rename test/{testsuite-52.units => TEST-52-HONORFIRSTSHUTDOWN/TEST-52-HONORFIRSTSHUTDOWN.units}/test-honor-first-shutdown.sh (100%)
 rename test/{testsuite-63.units => TEST-63-PATH/TEST-63-PATH.units}/test63-glob.path (100%)
 rename test/{testsuite-63.units => TEST-63-PATH/TEST-63-PATH.units}/test63-glob.service (100%)
 rename test/{testsuite-63.units => TEST-63-PATH/TEST-63-PATH.units}/test63-issue-24577-dep.service (100%)
 rename test/{testsuite-63.units => TEST-63-PATH/TEST-63-PATH.units}/test63-issue-24577.path (100%)
 rename test/{testsuite-63.units => TEST-63-PATH/TEST-63-PATH.units}/test63-issue-24577.service (100%)
 rename test/{testsuite-63.units => TEST-63-PATH/TEST-63-PATH.units}/test63-pr-30768.path (100%)
 rename test/{testsuite-63.units => TEST-63-PATH/TEST-63-PATH.units}/test63-pr-30768.service (100%)
 rename test/{testsuite-63.units => TEST-63-PATH/TEST-63-PATH.units}/test63.path (100%)
 rename test/{testsuite-63.units => TEST-63-PATH/TEST-63-PATH.units}/test63.service (100%)
 rename test/{testsuite-80.units => TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units}/fdstore-nopin.service (54%)
 rename test/{testsuite-80.units => TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units}/fdstore-pin.service (53%)
 rename test/{testsuite-80.units => TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units}/fdstore-pin.sh (100%)
 rename test/{testsuite-80.units => TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units}/fdstore-pin.target (100%)
 create mode 100644 test/TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units/notify.service
 rename test/{testsuite-80.units => TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units}/test.sh (100%)
 delete mode 100644 test/testsuite-23.units/testsuite-23-prop-stop-one.service
 delete mode 100644 test/testsuite-80.units/notify.service
 rename test/units/{testsuite-01.service => TEST-01-BASIC.service} (100%)
 rename test/units/{testsuite-01.sh => TEST-01-BASIC.sh} (100%)
 rename test/units/{testsuite-02.service => TEST-02-UNITTESTS.service} (100%)
 rename test/units/{testsuite-02.sh => TEST-02-UNITTESTS.sh} (100%)
 rename test/units/{testsuite-03.service => TEST-03-JOBS.service} (100%)
 rename test/units/{testsuite-03.sh => TEST-03-JOBS.sh} (100%)
 rename test/units/{testsuite-04.LogFilterPatterns.sh => TEST-04-JOURNAL.LogFilterPatterns.sh} (100%)
 rename test/units/{testsuite-04.SYSTEMD_JOURNAL_COMPRESS.sh => TEST-04-JOURNAL.SYSTEMD_JOURNAL_COMPRESS.sh} (100%)
 rename test/units/{testsuite-04.bsod.sh => TEST-04-JOURNAL.bsod.sh} (100%)
 rename test/units/{testsuite-04.cat.sh => TEST-04-JOURNAL.cat.sh} (100%)
 rename test/units/{testsuite-04.corrupted-journals.sh => TEST-04-JOURNAL.corrupted-journals.sh} (100%)
 rename test/units/{testsuite-04.fss.sh => TEST-04-JOURNAL.fss.sh} (100%)
 rename test/units/{testsuite-04.journal-append.sh => TEST-04-JOURNAL.journal-append.sh} (100%)
 rename test/units/{testsuite-04.journal-corrupt.sh => TEST-04-JOURNAL.journal-corrupt.sh} (100%)
 rename test/units/{testsuite-04.journal-gatewayd.sh => TEST-04-JOURNAL.journal-gatewayd.sh} (100%)
 rename test/units/{testsuite-04.journal-remote.sh => TEST-04-JOURNAL.journal-remote.sh} (100%)
 rename test/units/{testsuite-04.journal.sh => TEST-04-JOURNAL.journal.sh} (100%)
 rename test/units/{testsuite-04.service => TEST-04-JOURNAL.service} (100%)
 rename test/units/{testsuite-04.sh => TEST-04-JOURNAL.sh} (100%)
 rename test/units/{testsuite-05.effective-limit.sh => TEST-05-RLIMITS.effective-limit.sh} (100%)
 rename test/units/{testsuite-05.rlimit.sh => TEST-05-RLIMITS.rlimit.sh} (77%)
 rename test/units/{testsuite-19.service => TEST-05-RLIMITS.service} (85%)
 rename test/units/{testsuite-05.sh => TEST-05-RLIMITS.sh} (100%)
 rename test/units/{testsuite-06.service => TEST-06-SELINUX.service} (100%)
 rename test/units/{testsuite-06.sh => TEST-06-SELINUX.sh} (100%)
 rename test/units/{testsuite-07.aux-scope.sh => TEST-07-PID1.aux-scope.sh} (100%)
 rename test/units/{testsuite-07.exec-context.sh => TEST-07-PID1.exec-context.sh} (100%)
 rename test/units/{testsuite-07.exec-deserialization.sh => TEST-07-PID1.exec-deserialization.sh} (100%)
 rename test/units/{testsuite-07.exec-timestamps.sh => TEST-07-PID1.exec-timestamps.sh} (100%)
 rename test/units/{testsuite-07.issue-14566.sh => TEST-07-PID1.issue-14566.sh} (100%)
 rename test/units/{testsuite-07.issue-16115.sh => TEST-07-PID1.issue-16115.sh} (100%)
 rename test/units/{testsuite-07.issue-1981.sh => TEST-07-PID1.issue-1981.sh} (100%)
 rename test/units/{testsuite-07.issue-2467.sh => TEST-07-PID1.issue-2467.sh} (100%)
 rename test/units/{testsuite-07.issue-27953.sh => TEST-07-PID1.issue-27953.sh} (100%)
 rename test/units/{testsuite-07.issue-30412.sh => TEST-07-PID1.issue-30412.sh} (100%)
 rename test/units/{testsuite-07.issue-3166.sh => TEST-07-PID1.issue-3166.sh} (100%)
 rename test/units/{testsuite-07.issue-3171.sh => TEST-07-PID1.issue-3171.sh} (100%)
 rename test/units/{testsuite-07.main-PID-change.sh => TEST-07-PID1.main-PID-change.sh} (88%)
 rename test/units/{testsuite-07.mount-invalid-chars.sh => TEST-07-PID1.mount-invalid-chars.sh} (100%)
 rename test/units/{testsuite-07.poll-limit.sh => TEST-07-PID1.poll-limit.sh} (100%)
 rename test/units/{testsuite-07.pr-31351.sh => TEST-07-PID1.pr-31351.sh} (100%)
 rename test/units/{testsuite-07.private-network.sh => TEST-07-PID1.private-network.sh} (100%)
 rename test/units/{testsuite-07.service => TEST-07-PID1.service} (100%)
 rename test/units/{testsuite-07.sh => TEST-07-PID1.sh} (100%)
 rename test/units/{testsuite-07.socket-pass-fds.sh => TEST-07-PID1.socket-pass-fds.sh} (100%)
 rename test/units/{testsuite-07.type-exec-parallel.sh => TEST-07-PID1.type-exec-parallel.sh} (100%)
 rename test/units/{testsuite-08.service => TEST-08-INITRD.service} (100%)
 rename test/units/{testsuite-08.sh => TEST-08-INITRD.sh} (100%)
 rename test/units/{testsuite-09.journal.sh => TEST-09-REBOOT.journal.sh} (100%)
 rename test/units/{testsuite-09.service => TEST-09-REBOOT.service} (100%)
 rename test/units/{testsuite-09.sh => TEST-09-REBOOT.sh} (100%)
 rename test/units/{testsuite-13.importctl.sh => TEST-13-NSPAWN.importctl.sh} (100%)
 rename test/units/{testsuite-13.machinectl.sh => TEST-13-NSPAWN.machinectl.sh} (100%)
 rename test/units/{testsuite-13.nspawn-oci.sh => TEST-13-NSPAWN.nspawn-oci.sh} (99%)
 rename test/units/{testsuite-13.nspawn.sh => TEST-13-NSPAWN.nspawn.sh} (96%)
 rename test/units/{testsuite-13.nss-mymachines.sh => TEST-13-NSPAWN.nss-mymachines.sh} (100%)
 rename test/units/{testsuite-13.service => TEST-13-NSPAWN.service} (100%)
 rename test/units/{testsuite-13.sh => TEST-13-NSPAWN.sh} (100%)
 rename test/units/{testsuite-15.service => TEST-15-DROPIN.service} (100%)
 rename test/units/{testsuite-15.sh => TEST-15-DROPIN.sh} (98%)
 rename test/units/{testsuite-16.service => TEST-16-EXTEND-TIMEOUT.service} (100%)
 rename test/units/{testsuite-16.sh => TEST-16-EXTEND-TIMEOUT.sh} (100%)
 rename test/units/{testsuite-17.00.sh => TEST-17-UDEV.00.sh} (100%)
 rename test/units/{testsuite-17.01.sh => TEST-17-UDEV.01.sh} (100%)
 rename test/units/{testsuite-17.02.sh => TEST-17-UDEV.02.sh} (100%)
 rename test/units/{testsuite-17.03.sh => TEST-17-UDEV.03.sh} (100%)
 rename test/units/{testsuite-17.04.sh => TEST-17-UDEV.04.sh} (100%)
 rename test/units/{testsuite-17.05.sh => TEST-17-UDEV.05.sh} (100%)
 rename test/units/{testsuite-17.06.sh => TEST-17-UDEV.06.sh} (100%)
 rename test/units/{testsuite-17.07.sh => TEST-17-UDEV.07.sh} (100%)
 rename test/units/{testsuite-17.08.sh => TEST-17-UDEV.08.sh} (100%)
 rename test/units/{testsuite-17.09.sh => TEST-17-UDEV.09.sh} (100%)
 rename test/units/{testsuite-17.10.sh => TEST-17-UDEV.10.sh} (100%)
 rename test/units/{testsuite-17.11.sh => TEST-17-UDEV.11.sh} (100%)
 rename test/units/{testsuite-17.12.sh => TEST-17-UDEV.12.sh} (100%)
 rename test/units/{testsuite-17.13.sh => TEST-17-UDEV.13.sh} (100%)
 rename test/units/{testsuite-17.credentials.sh => TEST-17-UDEV.credentials.sh} (100%)
 rename test/units/{testsuite-17.link-property.sh => TEST-17-UDEV.link-property.sh} (100%)
 rename test/units/{testsuite-17.service => TEST-17-UDEV.service} (100%)
 rename test/units/{testsuite-17.sh => TEST-17-UDEV.sh} (100%)
 rename test/units/{testsuite-18.service => TEST-18-FAILUREACTION.service} (100%)
 rename test/units/{testsuite-18.sh => TEST-18-FAILUREACTION.sh} (100%)
 rename test/units/{testsuite-19.ExitType-cgroup.sh => TEST-19-CGROUP.ExitType-cgroup.sh} (100%)
 rename test/units/{testsuite-19.cleanup-slice.sh => TEST-19-CGROUP.cleanup-slice.sh} (100%)
 rename test/units/{testsuite-19.delegate.sh => TEST-19-CGROUP.delegate.sh} (100%)
 rename test/units/{testsuite-05.service => TEST-19-CGROUP.service} (85%)
 rename test/units/{testsuite-19.sh => TEST-19-CGROUP.sh} (100%)
 rename test/units/{testsuite-21.service => TEST-21-DFUZZERE.service} (100%)
 rename test/units/{testsuite-21.sh => TEST-21-DFUZZERE.sh} (100%)
 rename test/units/{testsuite-22.01.sh => TEST-22-TMPFILES.01.sh} (100%)
 rename test/units/{testsuite-22.02.sh => TEST-22-TMPFILES.02.sh} (100%)
 rename test/units/{testsuite-22.03.sh => TEST-22-TMPFILES.03.sh} (100%)
 rename test/units/{testsuite-22.04.sh => TEST-22-TMPFILES.04.sh} (100%)
 rename test/units/{testsuite-22.05.sh => TEST-22-TMPFILES.05.sh} (100%)
 rename test/units/{testsuite-22.06.sh => TEST-22-TMPFILES.06.sh} (100%)
 rename test/units/{testsuite-22.07.sh => TEST-22-TMPFILES.07.sh} (100%)
 rename test/units/{testsuite-22.08.sh => TEST-22-TMPFILES.08.sh} (100%)
 rename test/units/{testsuite-22.09.sh => TEST-22-TMPFILES.09.sh} (100%)
 rename test/units/{testsuite-22.10.sh => TEST-22-TMPFILES.10.sh} (100%)
 rename test/units/{testsuite-22.11.sh => TEST-22-TMPFILES.11.sh} (100%)
 rename test/units/{testsuite-22.12.sh => TEST-22-TMPFILES.12.sh} (100%)
 rename test/units/{testsuite-22.13.sh => TEST-22-TMPFILES.13.sh} (100%)
 rename test/units/{testsuite-22.14.sh => TEST-22-TMPFILES.14.sh} (100%)
 rename test/units/{testsuite-22.15.sh => TEST-22-TMPFILES.15.sh} (100%)
 rename test/units/{testsuite-22.16.sh => TEST-22-TMPFILES.16.sh} (100%)
 rename test/units/{testsuite-22.17.sh => TEST-22-TMPFILES.17.sh} (100%)
 rename test/units/{testsuite-22.18.sh => TEST-22-TMPFILES.18.sh} (100%)
 rename test/units/{testsuite-22.19.sh => TEST-22-TMPFILES.19.sh} (100%)
 rename test/units/{testsuite-22.service => TEST-22-TMPFILES.service} (100%)
 rename test/units/{testsuite-22.sh => TEST-22-TMPFILES.sh} (100%)
 rename test/units/{testsuite-23-openfile-child.sh => TEST-23-UNIT-FILE-openfile-child.sh} (100%)
 create mode 100755 test/units/TEST-23-UNIT-FILE-short-lived.sh
 rename test/units/{testsuite-23.ExecReload.sh => TEST-23-UNIT-FILE.ExecReload.sh} (100%)
 rename test/units/{testsuite-23.ExecStopPost.sh => TEST-23-UNIT-FILE.ExecStopPost.sh} (100%)
 create mode 100755 test/units/TEST-23-UNIT-FILE.JoinsNamespaceOf.sh
 rename test/units/{testsuite-23.RuntimeDirectoryPreserve.sh => TEST-23-UNIT-FILE.RuntimeDirectoryPreserve.sh} (100%)
 rename test/units/{testsuite-23.StandardOutput.sh => TEST-23-UNIT-FILE.StandardOutput.sh} (80%)
 create mode 100755 test/units/TEST-23-UNIT-FILE.Upholds.sh
 rename test/units/{testsuite-23.clean-unit.sh => TEST-23-UNIT-FILE.clean-unit.sh} (100%)
 rename test/units/{testsuite-23.exec-command-ex.sh => TEST-23-UNIT-FILE.exec-command-ex.sh} (100%)
 rename test/units/{testsuite-23.oneshot-restart.sh => TEST-23-UNIT-FILE.oneshot-restart.sh} (90%)
 rename test/units/{testsuite-23.openfile.sh => TEST-23-UNIT-FILE.openfile.sh} (79%)
 rename test/units/{testsuite-23.percentj-wantedby.sh => TEST-23-UNIT-FILE.percentj-wantedby.sh} (69%)
 create mode 100755 test/units/TEST-23-UNIT-FILE.runtime-bind-paths.sh
 rename test/units/{testsuite-23.service => TEST-23-UNIT-FILE.service} (84%)
 rename test/units/{testsuite-23.sh => TEST-23-UNIT-FILE.sh} (100%)
 create mode 100755 test/units/TEST-23-UNIT-FILE.start-stop-no-reload.sh
 rename test/units/{testsuite-23.statedir.sh => TEST-23-UNIT-FILE.statedir.sh} (100%)
 rename test/units/{testsuite-23.success-failure.sh => TEST-23-UNIT-FILE.success-failure.sh} (100%)
 rename test/units/{testsuite-23.type-exec.sh => TEST-23-UNIT-FILE.type-exec.sh} (100%)
 rename test/units/{testsuite-23.utmp.sh => TEST-23-UNIT-FILE.utmp.sh} (100%)
 rename test/units/{testsuite-23.verify-unit-files.sh => TEST-23-UNIT-FILE.verify-unit-files.sh} (100%)
 rename test/units/{testsuite-23.whoami.sh => TEST-23-UNIT-FILE.whoami.sh} (66%)
 rename test/units/{testsuite-24.service => TEST-24-CRYPTSETUP.service} (100%)
 rename test/units/{testsuite-24.sh => TEST-24-CRYPTSETUP.sh} (100%)
 rename test/units/{testsuite-25.service => TEST-25-IMPORT.service} (100%)
 rename test/units/{testsuite-25.sh => TEST-25-IMPORT.sh} (100%)
 rename test/units/{testsuite-26.service => TEST-26-SYSTEMCTL.service} (100%)
 rename test/units/{testsuite-26.sh => TEST-26-SYSTEMCTL.sh} (100%)
 rename test/units/{testsuite-29.service => TEST-29-PORTABLE.service} (100%)
 rename test/units/{testsuite-29.sh => TEST-29-PORTABLE.sh} (100%)
 rename test/units/{testsuite-30.service => TEST-30-ONCLOCKCHANGE.service} (100%)
 rename test/units/{testsuite-30.sh => TEST-30-ONCLOCKCHANGE.sh} (100%)
 rename test/units/{testsuite-31.service => TEST-31-DEVICE-ENUMERATION.service} (100%)
 rename test/units/{testsuite-31.sh => TEST-31-DEVICE-ENUMERATION.sh} (100%)
 rename test/units/{testsuite-32.service => TEST-32-OOMPOLICY.service} (100%)
 rename test/units/{testsuite-32.sh => TEST-32-OOMPOLICY.sh} (92%)
 rename test/units/{testsuite-34.service => TEST-34-DYNAMICUSERMIGRATE.service} (100%)
 rename test/units/{testsuite-34.sh => TEST-34-DYNAMICUSERMIGRATE.sh} (100%)
 rename test/units/{testsuite-35.service => TEST-35-LOGIN.service} (100%)
 rename test/units/{testsuite-35.sh => TEST-35-LOGIN.sh} (100%)
 rename test/units/{testsuite-36.service => TEST-36-NUMAPOLICY.service} (100%)
 rename test/units/{testsuite-36.sh => TEST-36-NUMAPOLICY.sh} (100%)
 rename test/units/{testsuite-38-sleep.service => TEST-38-FREEZER-sleep.service} (100%)
 rename test/units/{testsuite-38.service => TEST-38-FREEZER.service} (100%)
 rename test/units/{testsuite-38.sh => TEST-38-FREEZER.sh} (99%)
 rename test/units/{testsuite-43.service => TEST-43-PRIVATEUSER-UNPRIV.service} (100%)
 rename test/units/{testsuite-43.sh => TEST-43-PRIVATEUSER-UNPRIV.sh} (100%)
 rename test/units/{testsuite-44.service => TEST-44-LOG-NAMESPACE.service} (90%)
 rename test/units/{testsuite-44.sh => TEST-44-LOG-NAMESPACE.sh} (100%)
 rename test/units/{testsuite-45.service => TEST-45-TIMEDATE.service} (100%)
 rename test/units/{testsuite-45.sh => TEST-45-TIMEDATE.sh} (100%)
 rename test/units/{testsuite-46.service => TEST-46-HOMED.service} (100%)
 rename test/units/{testsuite-46.sh => TEST-46-HOMED.sh} (100%)
 rename test/units/{testsuite-50.DDI.sh => TEST-50-DISSECT.DDI.sh} (100%)
 rename test/units/{testsuite-50.dissect.sh => TEST-50-DISSECT.dissect.sh} (100%)
 rename test/units/{testsuite-50.mountfsd.sh => TEST-50-DISSECT.mountfsd.sh} (100%)
 rename test/units/{testsuite-50.service => TEST-50-DISSECT.service} (100%)
 rename test/units/{testsuite-50.sh => TEST-50-DISSECT.sh} (99%)
 rename test/units/{testsuite-50.sysext.sh => TEST-50-DISSECT.sysext.sh} (100%)
 rename test/units/{testsuite-52.service => TEST-52-HONORFIRSTSHUTDOWN.service} (76%)
 rename test/units/{testsuite-52.sh => TEST-52-HONORFIRSTSHUTDOWN.sh} (100%)
 rename test/units/{testsuite-53.service => TEST-53-ISSUE-16347.service} (100%)
 rename test/units/{testsuite-53.sh => TEST-53-ISSUE-16347.sh} (100%)
 rename test/units/{testsuite-64.service => TEST-54-CREDS.service} (86%)
 rename test/units/{testsuite-54.sh => TEST-54-CREDS.sh} (100%)
 rename test/units/{testsuite-55-testbloat.service => TEST-55-OOMD-testbloat.service} (90%)
 rename test/units/{testsuite-55-testchill.service => TEST-55-OOMD-testchill.service} (79%)
 rename test/units/{testsuite-55-testmunch.service => TEST-55-OOMD-testmunch.service} (85%)
 rename test/units/{testsuite-55-workload.slice => TEST-55-OOMD-workload.slice} (100%)
 rename test/units/{testsuite-55.service => TEST-55-OOMD.service} (88%)
 rename test/units/{testsuite-55.sh => TEST-55-OOMD.sh} (74%)
 rename test/units/{testsuite-58.service => TEST-58-REPART.service} (100%)
 rename test/units/{testsuite-58.sh => TEST-58-REPART.sh} (99%)
 rename test/units/{testsuite-59.service => TEST-59-RELOADING-RESTART.service} (100%)
 rename test/units/{testsuite-59.sh => TEST-59-RELOADING-RESTART.sh} (100%)
 rename test/units/{testsuite-60.service => TEST-60-MOUNT-RATELIMIT.service} (100%)
 rename test/units/{testsuite-60.sh => TEST-60-MOUNT-RATELIMIT.sh} (96%)
 rename test/units/{testsuite-62-1.service => TEST-62-RESTRICT-IFACES-1.service} (100%)
 rename test/units/{testsuite-62-2.service => TEST-62-RESTRICT-IFACES-2.service} (100%)
 rename test/units/{testsuite-62-3.service => TEST-62-RESTRICT-IFACES-3.service} (100%)
 rename test/units/{testsuite-62-4.service => TEST-62-RESTRICT-IFACES-4.service} (100%)
 rename test/units/{testsuite-62-5.service => TEST-62-RESTRICT-IFACES-5.service} (100%)
 rename test/units/{testsuite-62-6.service => TEST-62-RESTRICT-IFACES-6.service} (100%)
 rename test/units/{testsuite-62.service => TEST-62-RESTRICT-IFACES.service} (100%)
 rename test/units/{testsuite-62.sh => TEST-62-RESTRICT-IFACES.sh} (81%)
 rename test/units/{testsuite-63.service => TEST-63-PATH.service} (100%)
 rename test/units/{testsuite-63.sh => TEST-63-PATH.sh} (100%)
 rename test/units/{testsuite-54.service => TEST-64-UDEV-STORAGE.service} (83%)
 rename test/units/{testsuite-64.sh => TEST-64-UDEV-STORAGE.sh} (100%)
 rename test/units/{testsuite-65.service => TEST-65-ANALYZE.service} (100%)
 rename test/units/{testsuite-65.sh => TEST-65-ANALYZE.sh} (100%)
 rename test/units/{testsuite-66-deviceisolation.service => TEST-66-DEVICE-ISOLATION-device-isolation.service} (66%)
 rename test/units/{testsuite-66.sh => TEST-66-DEVICE-ISOLATION.sh} (64%)
 create mode 100644 test/units/TEST-66-DEVICEISOLATION.service
 rename test/units/{testsuite-67.service => TEST-67-INTEGRITY.service} (100%)
 rename test/units/{testsuite-67.sh => TEST-67-INTEGRITY.sh} (100%)
 rename test/units/{testsuite-68.service => TEST-68-PROPAGATE-EXIT-STATUS.service} (100%)
 rename test/units/{testsuite-68.sh => TEST-68-PROPAGATE-EXIT-STATUS.sh} (100%)
 rename test/units/{testsuite-69.service => TEST-69-SHUTDOWN.service} (100%)
 rename test/units/{testsuite-70.creds.sh => TEST-70-TPM2.creds.sh} (100%)
 rename test/units/{testsuite-70.cryptenroll.sh => TEST-70-TPM2.cryptenroll.sh} (100%)
 rename test/units/{testsuite-70.cryptsetup.sh => TEST-70-TPM2.cryptsetup.sh} (100%)
 rename test/units/{testsuite-70.measure.sh => TEST-70-TPM2.measure.sh} (100%)
 rename test/units/{testsuite-70.pcrextend.sh => TEST-70-TPM2.pcrextend.sh} (100%)
 rename test/units/{testsuite-70.pcrlock.sh => TEST-70-TPM2.pcrlock.sh} (100%)
 rename test/units/{testsuite-70.service => TEST-70-TPM2.service} (100%)
 rename test/units/{testsuite-70.sh => TEST-70-TPM2.sh} (100%)
 rename test/units/{testsuite-70.tpm2-setup.sh => TEST-70-TPM2.tpm2-setup.sh} (100%)
 rename test/units/{testsuite-71.service => TEST-71-HOSTNAME.service} (100%)
 rename test/units/{testsuite-71.sh => TEST-71-HOSTNAME.sh} (100%)
 rename test/units/{testsuite-72.service => TEST-72-SYSUPDATE.service} (100%)
 rename test/units/{testsuite-72.sh => TEST-72-SYSUPDATE.sh} (100%)
 rename test/units/{testsuite-73.service => TEST-73-LOCALE.service} (100%)
 rename test/units/{testsuite-73.sh => TEST-73-LOCALE.sh} (100%)
 rename test/units/{testsuite-74.battery-check.sh => TEST-74-AUX-UTILS.battery-check.sh} (100%)
 rename test/units/{testsuite-74.bootctl.sh => TEST-74-AUX-UTILS.bootctl.sh} (100%)
 rename test/units/{testsuite-74.busctl.sh => TEST-74-AUX-UTILS.busctl.sh} (100%)
 rename test/units/{testsuite-74.capsule.sh => TEST-74-AUX-UTILS.capsule.sh} (100%)
 rename test/units/{testsuite-74.cgls.sh => TEST-74-AUX-UTILS.cgls.sh} (100%)
 rename test/units/{testsuite-74.cgtop.sh => TEST-74-AUX-UTILS.cgtop.sh} (100%)
 rename test/units/{testsuite-74.coredump.sh => TEST-74-AUX-UTILS.coredump.sh} (99%)
 rename test/units/{testsuite-74.delta.sh => TEST-74-AUX-UTILS.delta.sh} (100%)
 rename test/units/{testsuite-74.escape.sh => TEST-74-AUX-UTILS.escape.sh} (100%)
 rename test/units/{testsuite-74.firstboot.sh => TEST-74-AUX-UTILS.firstboot.sh} (100%)
 rename test/units/{testsuite-74.id128.sh => TEST-74-AUX-UTILS.id128.sh} (100%)
 rename test/units/{testsuite-74.machine-id-setup.sh => TEST-74-AUX-UTILS.machine-id-setup.sh} (100%)
 rename test/units/{testsuite-74.modules-load.sh => TEST-74-AUX-UTILS.modules-load.sh} (100%)
 rename test/units/{testsuite-74.mount.sh => TEST-74-AUX-UTILS.mount.sh} (100%)
 rename test/units/{testsuite-74.network-generator.sh => TEST-74-AUX-UTILS.network-generator.sh} (100%)
 rename test/units/{testsuite-74.networkctl.sh => TEST-74-AUX-UTILS.networkctl.sh} (100%)
 rename test/units/{testsuite-74.path.sh => TEST-74-AUX-UTILS.path.sh} (100%)
 rename test/units/{testsuite-74.pstore.sh => TEST-74-AUX-UTILS.pstore.sh} (100%)
 rename test/units/{testsuite-74.run.sh => TEST-74-AUX-UTILS.run.sh} (100%)
 rename test/units/{testsuite-74.service => TEST-74-AUX-UTILS.service} (100%)
 rename test/units/{testsuite-74.sh => TEST-74-AUX-UTILS.sh} (100%)
 rename test/units/{testsuite-74.socket.sh => TEST-74-AUX-UTILS.socket.sh} (100%)
 rename test/units/{testsuite-74.ssh.sh => TEST-74-AUX-UTILS.ssh.sh} (100%)
 rename test/units/{testsuite-74.varlinkctl.sh => TEST-74-AUX-UTILS.varlinkctl.sh} (100%)
 rename test/units/{testsuite-74.vpick.sh => TEST-74-AUX-UTILS.vpick.sh} (100%)
 create mode 100644 test/units/TEST-75-RESOLVED.service
 rename test/units/{testsuite-75.sh => TEST-75-RESOLVED.sh} (100%)
 rename test/units/{testsuite-76.service => TEST-76-SYSCTL.service} (100%)
 rename test/units/{testsuite-76.sh => TEST-76-SYSCTL.sh} (100%)
 rename test/units/{testsuite-78.service => TEST-78-SIGQUEUE.service} (100%)
 rename test/units/{testsuite-78.sh => TEST-78-SIGQUEUE.sh} (100%)
 rename test/units/{testsuite-79.service => TEST-79-MEMPRESS.service} (100%)
 rename test/units/{testsuite-79.sh => TEST-79-MEMPRESS.sh} (94%)
 rename test/units/{testsuite-80.service => TEST-80-NOTIFYACCESS.service} (100%)
 rename test/units/{testsuite-80.sh => TEST-80-NOTIFYACCESS.sh} (100%)
 rename test/units/{testsuite-81.debug-generator.sh => TEST-81-GENERATORS.debug-generator.sh} (100%)
 rename test/units/{testsuite-81.environment-d-generator.sh => TEST-81-GENERATORS.environment-d-generator.sh} (100%)
 rename test/units/{testsuite-81.fstab-generator.sh => TEST-81-GENERATORS.fstab-generator.sh} (100%)
 rename test/units/{testsuite-81.getty-generator.sh => TEST-81-GENERATORS.getty-generator.sh} (100%)
 rename test/units/{testsuite-81.run-generator.sh => TEST-81-GENERATORS.run-generator.sh} (100%)
 rename test/units/{testsuite-81.service => TEST-81-GENERATORS.service} (100%)
 rename test/units/{testsuite-81.sh => TEST-81-GENERATORS.sh} (100%)
 rename test/units/{testsuite-81.system-update-generator.sh => TEST-81-GENERATORS.system-update-generator.sh} (100%)
 rename test/units/{testsuite-82.service => TEST-82-SOFTREBOOT.service} (100%)
 rename test/units/{testsuite-82.sh => TEST-82-SOFTREBOOT.sh} (79%)
 rename test/units/{testsuite-83.service => TEST-83-BTRFS.service} (100%)
 rename test/units/{testsuite-83.sh => TEST-83-BTRFS.sh} (100%)
 rename test/units/{testsuite-84.service => TEST-84-STORAGETM.service} (100%)
 rename test/units/{testsuite-84.sh => TEST-84-STORAGETM.sh} (100%)
 delete mode 100755 test/units/testsuite-23-short-lived.sh
 delete mode 100755 test/units/testsuite-23.JoinsNamespaceOf.sh
 delete mode 100755 test/units/testsuite-23.Upholds.sh
 delete mode 100755 test/units/testsuite-23.runtime-bind-paths.sh
 delete mode 100755 test/units/testsuite-23.start-stop-no-reload.sh
 delete mode 100644 test/units/testsuite-66.service
 delete mode 100644 test/units/testsuite-75.service

diff --git a/mkosi.images/system/mkosi.conf b/mkosi.images/system/mkosi.conf
index f7f32a07e6e..7f1c5f571ee 100644
--- a/mkosi.images/system/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf
@@ -20,7 +20,7 @@ ExtraTrees=
         %O/minimal-1.root-%a.raw:/usr/share/minimal_1.raw
         %O/minimal-1.root-%a-verity.raw:/usr/share/minimal_1.verity
         %O/minimal-1.root-%a-verity-sig.raw:/usr/share/minimal_1.verity.sig
-        %O/minimal-base:/usr/share/testsuite-13-container-template
+        %O/minimal-base:/usr/share/TEST-13-NSPAWN-container-template
 
 Packages=
         acl
diff --git a/test/testsuite-03.units/always-activating.service b/test/TEST-03-JOBS/TEST-03-JOBS.units/always-activating.service
similarity index 100%
rename from test/testsuite-03.units/always-activating.service
rename to test/TEST-03-JOBS/TEST-03-JOBS.units/always-activating.service
diff --git a/test/testsuite-03.units/always-activating.socket b/test/TEST-03-JOBS/TEST-03-JOBS.units/always-activating.socket
similarity index 100%
rename from test/testsuite-03.units/always-activating.socket
rename to test/TEST-03-JOBS/TEST-03-JOBS.units/always-activating.socket
diff --git a/test/testsuite-03.units/fails-on-restart-restartdirect.service b/test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart-restartdirect.service
similarity index 100%
rename from test/testsuite-03.units/fails-on-restart-restartdirect.service
rename to test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart-restartdirect.service
diff --git a/test/testsuite-03.units/fails-on-restart-restartdirect.target b/test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart-restartdirect.target
similarity index 100%
rename from test/testsuite-03.units/fails-on-restart-restartdirect.target
rename to test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart-restartdirect.target
diff --git a/test/testsuite-03.units/fails-on-restart.service b/test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart.service
similarity index 100%
rename from test/testsuite-03.units/fails-on-restart.service
rename to test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart.service
diff --git a/test/testsuite-03.units/fails-on-restart.target b/test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart.target
similarity index 100%
rename from test/testsuite-03.units/fails-on-restart.target
rename to test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart.target
diff --git a/test/testsuite-03.units/hello-after-sleep.target b/test/TEST-03-JOBS/TEST-03-JOBS.units/hello-after-sleep.target
similarity index 100%
rename from test/testsuite-03.units/hello-after-sleep.target
rename to test/TEST-03-JOBS/TEST-03-JOBS.units/hello-after-sleep.target
diff --git a/test/testsuite-03.units/hello.service b/test/TEST-03-JOBS/TEST-03-JOBS.units/hello.service
similarity index 100%
rename from test/testsuite-03.units/hello.service
rename to test/TEST-03-JOBS/TEST-03-JOBS.units/hello.service
diff --git a/test/testsuite-03.units/propagatestopto-and-pullin.target b/test/TEST-03-JOBS/TEST-03-JOBS.units/propagatestopto-and-pullin.target
similarity index 100%
rename from test/testsuite-03.units/propagatestopto-and-pullin.target
rename to test/TEST-03-JOBS/TEST-03-JOBS.units/propagatestopto-and-pullin.target
diff --git a/test/testsuite-03.units/propagatestopto-indirect.target b/test/TEST-03-JOBS/TEST-03-JOBS.units/propagatestopto-indirect.target
similarity index 100%
rename from test/testsuite-03.units/propagatestopto-indirect.target
rename to test/TEST-03-JOBS/TEST-03-JOBS.units/propagatestopto-indirect.target
diff --git a/test/testsuite-03.units/propagatestopto-only.target b/test/TEST-03-JOBS/TEST-03-JOBS.units/propagatestopto-only.target
similarity index 100%
rename from test/testsuite-03.units/propagatestopto-only.target
rename to test/TEST-03-JOBS/TEST-03-JOBS.units/propagatestopto-only.target
diff --git a/test/testsuite-03.units/sleep-infinity-simple.service b/test/TEST-03-JOBS/TEST-03-JOBS.units/sleep-infinity-simple.service
similarity index 100%
rename from test/testsuite-03.units/sleep-infinity-simple.service
rename to test/TEST-03-JOBS/TEST-03-JOBS.units/sleep-infinity-simple.service
diff --git a/test/testsuite-03.units/sleep.service b/test/TEST-03-JOBS/TEST-03-JOBS.units/sleep.service
similarity index 100%
rename from test/testsuite-03.units/sleep.service
rename to test/TEST-03-JOBS/TEST-03-JOBS.units/sleep.service
diff --git a/test/testsuite-03.units/succeeds-on-restart-restartdirect.service b/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart-restartdirect.service
similarity index 66%
rename from test/testsuite-03.units/succeeds-on-restart-restartdirect.service
rename to test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart-restartdirect.service
index b05f2f8dcf7..a2b9c339ad2 100644
--- a/test/testsuite-03.units/succeeds-on-restart-restartdirect.service
+++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart-restartdirect.service
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Service]
 Type=oneshot
-ExecStart=/usr/lib/systemd/tests/testdata/testsuite-03.units/succeeds-on-restart.sh
+ExecStart=/usr/lib/systemd/tests/testdata/TEST-03-JOBS.units/succeeds-on-restart.sh
 Restart=on-failure
 RestartMode=direct
diff --git a/test/testsuite-03.units/succeeds-on-restart-restartdirect.target b/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart-restartdirect.target
similarity index 100%
rename from test/testsuite-03.units/succeeds-on-restart-restartdirect.target
rename to test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart-restartdirect.target
diff --git a/test/testsuite-03.units/succeeds-on-restart.service b/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart.service
similarity index 66%
rename from test/testsuite-03.units/succeeds-on-restart.service
rename to test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart.service
index d7b3c7a210b..d0e9c2bc845 100644
--- a/test/testsuite-03.units/succeeds-on-restart.service
+++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart.service
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Service]
 Type=oneshot
-ExecStart=/usr/lib/systemd/tests/testdata/testsuite-03.units/succeeds-on-restart.sh
+ExecStart=/usr/lib/systemd/tests/testdata/TEST-03-JOBS.units/succeeds-on-restart.sh
 Restart=on-failure
 RestartMode=normal
diff --git a/test/testsuite-03.units/succeeds-on-restart.sh b/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart.sh
similarity index 100%
rename from test/testsuite-03.units/succeeds-on-restart.sh
rename to test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart.sh
diff --git a/test/testsuite-03.units/succeeds-on-restart.target b/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart.target
similarity index 100%
rename from test/testsuite-03.units/succeeds-on-restart.target
rename to test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart.target
diff --git a/test/testsuite-03.units/unstoppable.service b/test/TEST-03-JOBS/TEST-03-JOBS.units/unstoppable.service
similarity index 100%
rename from test/testsuite-03.units/unstoppable.service
rename to test/TEST-03-JOBS/TEST-03-JOBS.units/unstoppable.service
diff --git a/test/TEST-03-JOBS/meson.build b/test/TEST-03-JOBS/meson.build
index 8dec5f37e73..3484d21ba2f 100644
--- a/test/TEST-03-JOBS/meson.build
+++ b/test/TEST-03-JOBS/meson.build
@@ -5,3 +5,5 @@ integration_tests += [
                 'name' : fs.name(meson.current_source_dir()),
         },
 ]
+
+testdata_subdirs += [meson.current_source_dir() / 'TEST-03-JOBS.units']
diff --git a/test/testsuite-04.units/delegated-cgroup-filtering.service b/test/TEST-04-JOURNAL/TEST-04-JOURNAL.units/delegated-cgroup-filtering.service
similarity index 100%
rename from test/testsuite-04.units/delegated-cgroup-filtering.service
rename to test/TEST-04-JOURNAL/TEST-04-JOURNAL.units/delegated-cgroup-filtering.service
diff --git a/test/testsuite-04.units/forever-print-hola.service b/test/TEST-04-JOURNAL/TEST-04-JOURNAL.units/forever-print-hola.service
similarity index 100%
rename from test/testsuite-04.units/forever-print-hola.service
rename to test/TEST-04-JOURNAL/TEST-04-JOURNAL.units/forever-print-hola.service
diff --git a/test/testsuite-04.units/logs-filtering.service b/test/TEST-04-JOURNAL/TEST-04-JOURNAL.units/logs-filtering.service
similarity index 100%
rename from test/testsuite-04.units/logs-filtering.service
rename to test/TEST-04-JOURNAL/TEST-04-JOURNAL.units/logs-filtering.service
diff --git a/test/testsuite-04.units/silent-success.service b/test/TEST-04-JOURNAL/TEST-04-JOURNAL.units/silent-success.service
similarity index 100%
rename from test/testsuite-04.units/silent-success.service
rename to test/TEST-04-JOURNAL/TEST-04-JOURNAL.units/silent-success.service
diff --git a/test/testsuite-04.units/verbose-success.service b/test/TEST-04-JOURNAL/TEST-04-JOURNAL.units/verbose-success.service
similarity index 100%
rename from test/testsuite-04.units/verbose-success.service
rename to test/TEST-04-JOURNAL/TEST-04-JOURNAL.units/verbose-success.service
diff --git a/test/TEST-04-JOURNAL/meson.build b/test/TEST-04-JOURNAL/meson.build
index 184f70ab720..5a0b073c02b 100644
--- a/test/TEST-04-JOURNAL/meson.build
+++ b/test/TEST-04-JOURNAL/meson.build
@@ -8,3 +8,5 @@ integration_tests += [
                 'storage' : 'persistent',
         },
 ]
+
+testdata_subdirs += [meson.current_source_dir() / 'TEST-04-JOURNAL.units']
diff --git a/test/TEST-04-JOURNAL/test.sh b/test/TEST-04-JOURNAL/test.sh
index f8f3a4b3e32..a7aa71fce32 100755
--- a/test/TEST-04-JOURNAL/test.sh
+++ b/test/TEST-04-JOURNAL/test.sh
@@ -20,7 +20,7 @@ test_append_files() {
     # Since we nuke the journal repeatedly during this test, let's redirect
     # stdout/stderr to the console as well to make the test a bit more debug-able.
     if ! get_bool "${INTERACTIVE_DEBUG:-}"; then
-        dropin_dir="${workspace:?}/etc/systemd/system/testsuite-04.service.d/"
+        dropin_dir="${workspace:?}/etc/systemd/system/TEST-04-JOURNAL.service.d/"
         mkdir -p "$dropin_dir"
         printf '[Service]\nStandardOutput=journal+console\nStandardError=journal+console' >"$dropin_dir/99-stdout.conf"
     fi
diff --git a/test/testsuite-06.units/hola.service b/test/TEST-06-SELINUX/TEST-06-SELINUX.units/hola.service
similarity index 100%
rename from test/testsuite-06.units/hola.service
rename to test/TEST-06-SELINUX/TEST-06-SELINUX.units/hola.service
diff --git a/test/TEST-06-SELINUX/meson.build b/test/TEST-06-SELINUX/meson.build
index 408e41ff287..e3cf0030c50 100644
--- a/test/TEST-06-SELINUX/meson.build
+++ b/test/TEST-06-SELINUX/meson.build
@@ -10,3 +10,5 @@ integration_tests += [
                 'firmware' : 'uefi',
         },
 ]
+
+testdata_subdirs += [meson.current_source_dir() / 'TEST-06-SELINUX.units']
diff --git a/test/testsuite-07.units/issue14566-repro.service b/test/TEST-07-PID1/TEST-07-PID1.units/issue14566-repro.service
similarity index 67%
rename from test/testsuite-07.units/issue14566-repro.service
rename to test/TEST-07-PID1/TEST-07-PID1.units/issue14566-repro.service
index 56805963b41..757f978101e 100644
--- a/test/testsuite-07.units/issue14566-repro.service
+++ b/test/TEST-07-PID1/TEST-07-PID1.units/issue14566-repro.service
@@ -3,6 +3,6 @@
 Description=Issue 14566 Repro
 
 [Service]
-ExecStart=/usr/lib/systemd/tests/testdata/testsuite-07.units/%N.sh
+ExecStart=/usr/lib/systemd/tests/testdata/TEST-07-PID1.units/%N.sh
 ExecStopPost=/bin/true
 KillMode=mixed
diff --git a/test/testsuite-07.units/issue14566-repro.sh b/test/TEST-07-PID1/TEST-07-PID1.units/issue14566-repro.sh
similarity index 100%
rename from test/testsuite-07.units/issue14566-repro.sh
rename to test/TEST-07-PID1/TEST-07-PID1.units/issue14566-repro.sh
diff --git a/test/testsuite-07.units/issue16115-repro-1.service b/test/TEST-07-PID1/TEST-07-PID1.units/issue16115-repro-1.service
similarity index 100%
rename from test/testsuite-07.units/issue16115-repro-1.service
rename to test/TEST-07-PID1/TEST-07-PID1.units/issue16115-repro-1.service
diff --git a/test/testsuite-07.units/issue16115-repro-2.service b/test/TEST-07-PID1/TEST-07-PID1.units/issue16115-repro-2.service
similarity index 100%
rename from test/testsuite-07.units/issue16115-repro-2.service
rename to test/TEST-07-PID1/TEST-07-PID1.units/issue16115-repro-2.service
diff --git a/test/testsuite-07.units/issue16115-repro-3.service b/test/TEST-07-PID1/TEST-07-PID1.units/issue16115-repro-3.service
similarity index 100%
rename from test/testsuite-07.units/issue16115-repro-3.service
rename to test/TEST-07-PID1/TEST-07-PID1.units/issue16115-repro-3.service
diff --git a/test/testsuite-07.units/issue2467.service b/test/TEST-07-PID1/TEST-07-PID1.units/issue2467.service
similarity index 100%
rename from test/testsuite-07.units/issue2467.service
rename to test/TEST-07-PID1/TEST-07-PID1.units/issue2467.service
diff --git a/test/testsuite-07.units/issue2467.socket b/test/TEST-07-PID1/TEST-07-PID1.units/issue2467.socket
similarity index 100%
rename from test/testsuite-07.units/issue2467.socket
rename to test/TEST-07-PID1/TEST-07-PID1.units/issue2467.socket
diff --git a/test/testsuite-07.units/issue2730-alias.mount b/test/TEST-07-PID1/TEST-07-PID1.units/issue2730-alias.mount
similarity index 100%
rename from test/testsuite-07.units/issue2730-alias.mount
rename to test/TEST-07-PID1/TEST-07-PID1.units/issue2730-alias.mount
diff --git a/test/testsuite-07.units/issue2730.mount b/test/TEST-07-PID1/TEST-07-PID1.units/issue2730.mount
similarity index 100%
rename from test/testsuite-07.units/issue2730.mount
rename to test/TEST-07-PID1/TEST-07-PID1.units/issue2730.mount
diff --git a/test/testsuite-07.units/issue27953.service b/test/TEST-07-PID1/TEST-07-PID1.units/issue27953.service
similarity index 100%
rename from test/testsuite-07.units/issue27953.service
rename to test/TEST-07-PID1/TEST-07-PID1.units/issue27953.service
diff --git a/test/testsuite-07.units/issue3166-fail-on-restart.service b/test/TEST-07-PID1/TEST-07-PID1.units/issue3166-fail-on-restart.service
similarity index 100%
rename from test/testsuite-07.units/issue3166-fail-on-restart.service
rename to test/TEST-07-PID1/TEST-07-PID1.units/issue3166-fail-on-restart.service
diff --git a/test/testsuite-07.units/local-fs.target.wants/issue2730.mount b/test/TEST-07-PID1/TEST-07-PID1.units/local-fs.target.wants/issue2730.mount
similarity index 100%
rename from test/testsuite-07.units/local-fs.target.wants/issue2730.mount
rename to test/TEST-07-PID1/TEST-07-PID1.units/local-fs.target.wants/issue2730.mount
diff --git a/test/testsuite-07.units/pass-fds-to-exec-no.socket b/test/TEST-07-PID1/TEST-07-PID1.units/pass-fds-to-exec-no.socket
similarity index 100%
rename from test/testsuite-07.units/pass-fds-to-exec-no.socket
rename to test/TEST-07-PID1/TEST-07-PID1.units/pass-fds-to-exec-no.socket
diff --git a/test/testsuite-07.units/pass-fds-to-exec-yes.socket b/test/TEST-07-PID1/TEST-07-PID1.units/pass-fds-to-exec-yes.socket
similarity index 100%
rename from test/testsuite-07.units/pass-fds-to-exec-yes.socket
rename to test/TEST-07-PID1/TEST-07-PID1.units/pass-fds-to-exec-yes.socket
diff --git a/test/TEST-07-PID1/meson.build b/test/TEST-07-PID1/meson.build
index 8dec5f37e73..76ed3e75814 100644
--- a/test/TEST-07-PID1/meson.build
+++ b/test/TEST-07-PID1/meson.build
@@ -5,3 +5,5 @@ integration_tests += [
                 'name' : fs.name(meson.current_source_dir()),
         },
 ]
+
+testdata_subdirs += [meson.current_source_dir() / 'TEST-07-PID1.units']
diff --git a/test/TEST-08-INITRD/test.sh b/test/TEST-08-INITRD/test.sh
index 3ad60f1a949..badb6cb31a1 100755
--- a/test/TEST-08-INITRD/test.sh
+++ b/test/TEST-08-INITRD/test.sh
@@ -80,7 +80,7 @@ check_result_qemu_hook() {
 
 # Setup a one shot service in initrd that creates a dummy bind mount under /run
 # to check if the mount persists though the initrd transition. The "check" part
-# is in the respective testsuite-08.sh script.
+# is in the respective TEST-08-INITRD.sh script.
 #
 # See: https://github.com/systemd/systemd/issues/28452
 run_qemu_hook() {
diff --git a/test/TEST-13-NSPAWN/test.sh b/test/TEST-13-NSPAWN/test.sh
index 744e793ac2e..9a0404f4b0c 100755
--- a/test/TEST-13-NSPAWN/test.sh
+++ b/test/TEST-13-NSPAWN/test.sh
@@ -13,7 +13,7 @@ TEST_FORCE_NEWIMAGE=1
 
 test_append_files() {
     local workspace="${1:?}"
-    local container="$workspace/usr/share/testsuite-13-container-template"
+    local container="$workspace/usr/share/TEST-13-NSPAWN-container-template"
 
     # For virtual wlan interface.
     instmods mac80211_hwsim
diff --git a/test/testsuite-16.units/extend-timeout.sh b/test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units/extend-timeout.sh
similarity index 100%
rename from test/testsuite-16.units/extend-timeout.sh
rename to test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units/extend-timeout.sh
diff --git a/test/testsuite-16.units/fail-runtime.service b/test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units/fail-runtime.service
similarity index 86%
rename from test/testsuite-16.units/fail-runtime.service
rename to test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units/fail-runtime.service
index 1d74963a30b..7380994dbd3 100644
--- a/test/testsuite-16.units/fail-runtime.service
+++ b/test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units/fail-runtime.service
@@ -10,4 +10,4 @@ TimeoutStartSec=4
 TimeoutStopSec=4
 RuntimeMaxSec=10
 Environment=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
+ExecStart=/usr/lib/systemd/tests/testdata/TEST-16-EXTEND-TIMEOUT.units/extend-timeout.sh
diff --git a/test/testsuite-16.units/fail-start.service b/test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units/fail-start.service
similarity index 86%
rename from test/testsuite-16.units/fail-start.service
rename to test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units/fail-start.service
index 38aebf2a8ff..984d8f98643 100644
--- a/test/testsuite-16.units/fail-start.service
+++ b/test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units/fail-start.service
@@ -11,4 +11,4 @@ TimeoutStartSec=10
 TimeoutStopSec=4
 RuntimeMaxSec=4
 Environment=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
+ExecStart=/usr/lib/systemd/tests/testdata/TEST-16-EXTEND-TIMEOUT.units/extend-timeout.sh
diff --git a/test/testsuite-16.units/fail-stop.service b/test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units/fail-stop.service
similarity index 90%
rename from test/testsuite-16.units/fail-stop.service
rename to test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units/fail-stop.service
index 1910ac9ff44..4293d7e8bdc 100644
--- a/test/testsuite-16.units/fail-stop.service
+++ b/test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units/fail-stop.service
@@ -10,7 +10,7 @@ TimeoutStartSec=4
 TimeoutStopSec=10
 RuntimeMaxSec=4
 Environment=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
+ExecStart=/usr/lib/systemd/tests/testdata/TEST-16-EXTEND-TIMEOUT.units/extend-timeout.sh
 # 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/testsuite-16.units/success-all.service b/test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units/success-all.service
similarity index 87%
rename from test/testsuite-16.units/success-all.service
rename to test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units/success-all.service
index 1fdc363f696..7f26084c7a3 100644
--- a/test/testsuite-16.units/success-all.service
+++ b/test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units/success-all.service
@@ -12,4 +12,4 @@ TimeoutStartSec=4
 TimeoutStopSec=4
 RuntimeMaxSec=4
 Environment=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
+ExecStart=/usr/lib/systemd/tests/testdata/TEST-16-EXTEND-TIMEOUT.units/extend-timeout.sh
diff --git a/test/testsuite-16.units/success-runtime.service b/test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units/success-runtime.service
similarity index 84%
rename from test/testsuite-16.units/success-runtime.service
rename to test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units/success-runtime.service
index 2f5744d15ec..33a36f3ba22 100644
--- a/test/testsuite-16.units/success-runtime.service
+++ b/test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units/success-runtime.service
@@ -11,4 +11,4 @@ TimeoutStartSec=4
 TimeoutStopSec=4
 RuntimeMaxSec=8
 Environment=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
+ExecStart=/usr/lib/systemd/tests/testdata/TEST-16-EXTEND-TIMEOUT.units/extend-timeout.sh
diff --git a/test/testsuite-16.units/success-start.service b/test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units/success-start.service
similarity index 85%
rename from test/testsuite-16.units/success-start.service
rename to test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units/success-start.service
index be518e98703..0453b34ff3e 100644
--- a/test/testsuite-16.units/success-start.service
+++ b/test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units/success-start.service
@@ -10,4 +10,4 @@ TimeoutStartSec=8
 TimeoutStopSec=4
 RuntimeMaxSec=4
 Environment=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
+ExecStart=/usr/lib/systemd/tests/testdata/TEST-16-EXTEND-TIMEOUT.units/extend-timeout.sh
diff --git a/test/testsuite-16.units/success-stop.service b/test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units/success-stop.service
similarity index 85%
rename from test/testsuite-16.units/success-stop.service
rename to test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units/success-stop.service
index 2bd3e3e3ba3..3719f54fd7b 100644
--- a/test/testsuite-16.units/success-stop.service
+++ b/test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units/success-stop.service
@@ -10,4 +10,4 @@ TimeoutStartSec=4
 TimeoutStopSec=8
 RuntimeMaxSec=4
 Environment=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
+ExecStart=/usr/lib/systemd/tests/testdata/TEST-16-EXTEND-TIMEOUT.units/extend-timeout.sh
diff --git a/test/TEST-16-EXTEND-TIMEOUT/meson.build b/test/TEST-16-EXTEND-TIMEOUT/meson.build
index 8dec5f37e73..75cf2029f98 100644
--- a/test/TEST-16-EXTEND-TIMEOUT/meson.build
+++ b/test/TEST-16-EXTEND-TIMEOUT/meson.build
@@ -5,3 +5,5 @@ integration_tests += [
                 'name' : fs.name(meson.current_source_dir()),
         },
 ]
+
+testdata_subdirs += [meson.current_source_dir() / 'TEST-16-EXTEND-TIMEOUT.units']
diff --git a/test/testsuite-23.units/testsuite-23-binds-to.service b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-binds-to.service
similarity index 52%
rename from test/testsuite-23.units/testsuite-23-binds-to.service
rename to test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-binds-to.service
index 9a3e31b0804..022c37e5472 100644
--- a/test/testsuite-23.units/testsuite-23-binds-to.service
+++ b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-binds-to.service
@@ -1,10 +1,10 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
 Description=Unit with BindsTo=
-BindsTo=testsuite-23-bound-by.service
-After=testsuite-23-bound-by.service
+BindsTo=TEST-23-UNIT-FILE-bound-by.service
+After=TEST-23-UNIT-FILE-bound-by.service
 
 [Service]
 ExecStart=sleep infinity
 # --kill-who= (no 'm') to check that the short form is accepted
-ExecStopPost=systemctl kill --kill-whom=main -sRTMIN+1 testsuite-23.service
+ExecStopPost=systemctl kill --kill-whom=main -sRTMIN+1 TEST-23-UNIT-FILE.service
diff --git a/test/testsuite-23.units/testsuite-23-bound-by.service b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-bound-by.service
similarity index 100%
rename from test/testsuite-23.units/testsuite-23-bound-by.service
rename to test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-bound-by.service
diff --git a/test/testsuite-23.units/testsuite-23-fail.service b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-fail.service
similarity index 70%
rename from test/testsuite-23.units/testsuite-23-fail.service
rename to test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-fail.service
index 597810797d0..b78e6b438eb 100644
--- a/test/testsuite-23.units/testsuite-23-fail.service
+++ b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-fail.service
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
 Description=Failing unit
-OnFailure=testsuite-23-uphold.service
+OnFailure=TEST-23-UNIT-FILE-uphold.service
 
 [Service]
 ExecStart=false
diff --git a/test/testsuite-23.units/testsuite-23-joins-namespace-of-1.service b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-1.service
similarity index 100%
rename from test/testsuite-23.units/testsuite-23-joins-namespace-of-1.service
rename to test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-1.service
diff --git a/test/testsuite-23.units/testsuite-23-joins-namespace-of-2.service b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-2.service
similarity index 73%
rename from test/testsuite-23.units/testsuite-23-joins-namespace-of-2.service
rename to test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-2.service
index 36b4c272fd7..42dd44555a1 100644
--- a/test/testsuite-23.units/testsuite-23-joins-namespace-of-2.service
+++ b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-2.service
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
-JoinsNamespaceOf=testsuite-23-joins-namespace-of-1.service
+JoinsNamespaceOf=TEST-23-UNIT-FILE-joins-namespace-of-1.service
 
 [Service]
 Type=oneshot
diff --git a/test/testsuite-23.units/testsuite-23-joins-namespace-of-3.service b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-3.service
similarity index 73%
rename from test/testsuite-23.units/testsuite-23-joins-namespace-of-3.service
rename to test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-3.service
index 90944450202..f745481f78f 100644
--- a/test/testsuite-23.units/testsuite-23-joins-namespace-of-3.service
+++ b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-3.service
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
-JoinsNamespaceOf=testsuite-23-joins-namespace-of-1.service
+JoinsNamespaceOf=TEST-23-UNIT-FILE-joins-namespace-of-1.service
 
 [Service]
 Type=oneshot
diff --git a/test/testsuite-23.units/testsuite-23-joins-namespace-of-4.service b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-4.service
similarity index 77%
rename from test/testsuite-23.units/testsuite-23-joins-namespace-of-4.service
rename to test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-4.service
index a70f8fca998..a0ff403986f 100644
--- a/test/testsuite-23.units/testsuite-23-joins-namespace-of-4.service
+++ b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-4.service
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
-JoinsNamespaceOf=testsuite-23-joins-namespace-of-5.service
+JoinsNamespaceOf=TEST-23-UNIT-FILE-joins-namespace-of-5.service
 
 [Service]
 Type=notify
diff --git a/test/testsuite-23.units/testsuite-23-joins-namespace-of-5.service b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-5.service
similarity index 100%
rename from test/testsuite-23.units/testsuite-23-joins-namespace-of-5.service
rename to test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-5.service
diff --git a/test/testsuite-23.units/testsuite-23-joins-namespace-of-6.service b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-6.service
similarity index 77%
rename from test/testsuite-23.units/testsuite-23-joins-namespace-of-6.service
rename to test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-6.service
index dae533cc369..9227bdaa05f 100644
--- a/test/testsuite-23.units/testsuite-23-joins-namespace-of-6.service
+++ b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-6.service
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
-JoinsNamespaceOf=testsuite-23-joins-namespace-of-8.service
+JoinsNamespaceOf=TEST-23-UNIT-FILE-joins-namespace-of-8.service
 
 [Service]
 Type=notify
diff --git a/test/testsuite-23.units/testsuite-23-joins-namespace-of-7.service b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-7.service
similarity index 77%
rename from test/testsuite-23.units/testsuite-23-joins-namespace-of-7.service
rename to test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-7.service
index 60c083a3f43..a5d62c651d4 100644
--- a/test/testsuite-23.units/testsuite-23-joins-namespace-of-7.service
+++ b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-7.service
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
-JoinsNamespaceOf=testsuite-23-joins-namespace-of-8.service
+JoinsNamespaceOf=TEST-23-UNIT-FILE-joins-namespace-of-8.service
 
 [Service]
 Type=oneshot
diff --git a/test/testsuite-23.units/testsuite-23-joins-namespace-of-8.service b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-8.service
similarity index 100%
rename from test/testsuite-23.units/testsuite-23-joins-namespace-of-8.service
rename to test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-8.service
diff --git a/test/testsuite-23.units/testsuite-23-joins-namespace-of-9.service b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-9.service
similarity index 77%
rename from test/testsuite-23.units/testsuite-23-joins-namespace-of-9.service
rename to test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-9.service
index 6c64873b241..a30f92af809 100644
--- a/test/testsuite-23.units/testsuite-23-joins-namespace-of-9.service
+++ b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-joins-namespace-of-9.service
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
-JoinsNamespaceOf=testsuite-23-joins-namespace-of-8.service
+JoinsNamespaceOf=TEST-23-UNIT-FILE-joins-namespace-of-8.service
 
 [Service]
 Type=oneshot
diff --git a/test/testsuite-23.units/testsuite-23-namespaced.service b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-namespaced.service
similarity index 88%
rename from test/testsuite-23.units/testsuite-23-namespaced.service
rename to test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-namespaced.service
index 46c27ca5d83..82eb74c0bd8 100644
--- a/test/testsuite-23.units/testsuite-23-namespaced.service
+++ b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-namespaced.service
@@ -7,7 +7,7 @@ Type=notify
 RemainAfterExit=yes
 MountAPIVFS=yes
 PrivateTmp=yes
-BindPaths=/run/testsuite-23-marker-fixed:/tmp/testfile-marker-fixed
+BindPaths=/run/TEST-23-UNIT-FILE-marker-fixed:/tmp/testfile-marker-fixed
 InaccessiblePaths=/run/inaccessible
 ExecStartPre=grep -q -F MARKER_FIXED /tmp/testfile-marker-fixed
 ExecStart=sh -c 'systemd-notify --ready; until grep -q -F MARKER_RUNTIME /tmp/testfile-marker-runtime; do sleep 0.1; done; test ! -f /run/inaccessible/testfile-marker-fixed'
diff --git a/test/testsuite-23.units/testsuite-23-non-namespaced.service b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-non-namespaced.service
similarity index 100%
rename from test/testsuite-23.units/testsuite-23-non-namespaced.service
rename to test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-non-namespaced.service
diff --git a/test/testsuite-23.units/testsuite-23-oneshot-restartforce.sh b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-oneshot-restartforce.sh
similarity index 100%
rename from test/testsuite-23.units/testsuite-23-oneshot-restartforce.sh
rename to test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-oneshot-restartforce.sh
diff --git a/test/testsuite-23.units/testsuite-23-openfile-server.socket b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-openfile-server.socket
similarity index 100%
rename from test/testsuite-23.units/testsuite-23-openfile-server.socket
rename to test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-openfile-server.socket
diff --git a/test/testsuite-23.units/testsuite-23-openfile-server@.service b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-openfile-server@.service
similarity index 100%
rename from test/testsuite-23.units/testsuite-23-openfile-server@.service
rename to test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-openfile-server@.service
diff --git a/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-prop-stop-one.service b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-prop-stop-one.service
new file mode 100644
index 00000000000..0739aaf31d8
--- /dev/null
+++ b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-prop-stop-one.service
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+[Unit]
+Description=Stop Propagation Receiver
+Wants=TEST-23-UNIT-FILE-prop-stop-two.service
+After=TEST-23-UNIT-FILE-prop-stop-two.service
+StopPropagatedFrom=TEST-23-UNIT-FILE-prop-stop-two.service
+
+[Service]
+ExecStart=sleep infinity
+ExecStopPost=systemctl kill --kill-whom=main -sUSR2 TEST-23-UNIT-FILE.service
diff --git a/test/testsuite-23.units/testsuite-23-prop-stop-two.service b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-prop-stop-two.service
similarity index 100%
rename from test/testsuite-23.units/testsuite-23-prop-stop-two.service
rename to test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-prop-stop-two.service
diff --git a/test/testsuite-23.units/testsuite-23-retry-fail.service b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-retry-fail.service
similarity index 60%
rename from test/testsuite-23.units/testsuite-23-retry-fail.service
rename to test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-retry-fail.service
index 2e0972cbf0d..319757a44d1 100644
--- a/test/testsuite-23.units/testsuite-23-retry-fail.service
+++ b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-retry-fail.service
@@ -5,5 +5,5 @@ Description=Failed Dependency Unit
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=sh -c "if [ -f /tmp/testsuite-23-retry-fail ]; then exit 0; else exit 1; fi"
+ExecStart=sh -c "if [ -f /tmp/TEST-23-UNIT-FILE-retry-fail ]; then exit 0; else exit 1; fi"
 Restart=no
diff --git a/test/testsuite-23.units/testsuite-23-retry-upheld.service b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-retry-upheld.service
similarity index 60%
rename from test/testsuite-23.units/testsuite-23-retry-upheld.service
rename to test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-retry-upheld.service
index 3c20e4338c5..722a3b479bf 100644
--- a/test/testsuite-23.units/testsuite-23-retry-upheld.service
+++ b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-retry-upheld.service
@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
 Description=Upheld Unit
-Requires=testsuite-23-retry-fail.service
-After=testsuite-23-retry-fail.service
+Requires=TEST-23-UNIT-FILE-retry-fail.service
+After=TEST-23-UNIT-FILE-retry-fail.service
 
 [Service]
 Type=oneshot
diff --git a/test/testsuite-23.units/testsuite-23-retry-uphold.service b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-retry-uphold.service
similarity index 70%
rename from test/testsuite-23.units/testsuite-23-retry-uphold.service
rename to test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-retry-uphold.service
index 7f15f068b41..829ea5c39e7 100644
--- a/test/testsuite-23.units/testsuite-23-retry-uphold.service
+++ b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-retry-uphold.service
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
 Description=Upholding Unit
-Upholds=testsuite-23-retry-upheld.service
+Upholds=TEST-23-UNIT-FILE-retry-upheld.service
 
 [Service]
 ExecStart=sleep infinity
diff --git a/test/testsuite-23.units/testsuite-23-short-lived.service b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-short-lived.service
similarity index 74%
rename from test/testsuite-23.units/testsuite-23-short-lived.service
rename to test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-short-lived.service
index 2dcb2ae228e..ac9583f9169 100644
--- a/test/testsuite-23.units/testsuite-23-short-lived.service
+++ b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-short-lived.service
@@ -8,4 +8,4 @@ StartLimitBurst=15
 StartLimitIntervalSec=1h
 
 [Service]
-ExecStart=/usr/lib/systemd/tests/testdata/units/testsuite-23-short-lived.sh
+ExecStart=/usr/lib/systemd/tests/testdata/units/TEST-23-UNIT-FILE-short-lived.sh
diff --git a/test/testsuite-23.units/testsuite-23-specifier-j-depends-wants.service b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-specifier-j-depends-wants.service
similarity index 100%
rename from test/testsuite-23.units/testsuite-23-specifier-j-depends-wants.service
rename to test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-specifier-j-depends-wants.service
diff --git a/test/testsuite-23.units/testsuite-23-specifier-j-wants.service b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-specifier-j-wants.service
similarity index 65%
rename from test/testsuite-23.units/testsuite-23-specifier-j-wants.service
rename to test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-specifier-j-wants.service
index 9abb257df47..5aeee9f8d66 100644
--- a/test/testsuite-23.units/testsuite-23-specifier-j-wants.service
+++ b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-specifier-j-wants.service
@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
 Description=Wants with percent-j specifier
-Wants=testsuite-23-specifier-j-depends-%j.service
-After=testsuite-23-specifier-j-depends-%j.service
+Wants=TEST-23-UNIT-FILE-specifier-j-depends-%j.service
+After=TEST-23-UNIT-FILE-specifier-j-depends-%j.service
 
 [Service]
 Type=oneshot
diff --git a/test/testsuite-23.units/testsuite-23-success.service b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-success.service
similarity index 72%
rename from test/testsuite-23.units/testsuite-23-success.service
rename to test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-success.service
index 2ace6fa370c..1ae6271fcca 100644
--- a/test/testsuite-23.units/testsuite-23-success.service
+++ b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-success.service
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
 Description=Succeeding unit
-OnSuccess=testsuite-23-fail.service
+OnSuccess=TEST-23-UNIT-FILE-fail.service
 
 [Service]
 ExecStart=true
diff --git a/test/testsuite-23.units/testsuite-23-upheldby-install.service b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-upheldby-install.service
similarity index 76%
rename from test/testsuite-23.units/testsuite-23-upheldby-install.service
rename to test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-upheldby-install.service
index bcfacd21dd4..edb8fcb2e91 100644
--- a/test/testsuite-23.units/testsuite-23-upheldby-install.service
+++ b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-upheldby-install.service
@@ -6,4 +6,4 @@ Description=Unit that sets UpheldBy= through [Install]
 ExecStart=sleep infinity
 
 [Install]
-UpheldBy=testsuite-23-retry-uphold.service
+UpheldBy=TEST-23-UNIT-FILE-retry-uphold.service
diff --git a/test/testsuite-23.units/testsuite-23-uphold.service b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-uphold.service
similarity index 71%
rename from test/testsuite-23.units/testsuite-23-uphold.service
rename to test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-uphold.service
index 67f0ac88599..36c5dae7d30 100644
--- a/test/testsuite-23.units/testsuite-23-uphold.service
+++ b/test/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-uphold.service
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
 Description=Upholding Unit
-Upholds=testsuite-23-short-lived.service
+Upholds=TEST-23-UNIT-FILE-short-lived.service
 
 [Service]
 ExecStart=sleep infinity
diff --git a/test/TEST-23-UNIT-FILE/meson.build b/test/TEST-23-UNIT-FILE/meson.build
index 8dec5f37e73..3f44662ae3a 100644
--- a/test/TEST-23-UNIT-FILE/meson.build
+++ b/test/TEST-23-UNIT-FILE/meson.build
@@ -5,3 +5,5 @@ integration_tests += [
                 'name' : fs.name(meson.current_source_dir()),
         },
 ]
+
+testdata_subdirs += [meson.current_source_dir() / 'TEST-23-UNIT-FILE.units']
diff --git a/test/testsuite-30.units/systemd-timedated.service.d/watchdog.conf b/test/TEST-30-ONCLOCKCHANGE/TEST-30-ONCLOCKCHANGE.units/systemd-timedated.service.d/watchdog.conf
similarity index 100%
rename from test/testsuite-30.units/systemd-timedated.service.d/watchdog.conf
rename to test/TEST-30-ONCLOCKCHANGE/TEST-30-ONCLOCKCHANGE.units/systemd-timedated.service.d/watchdog.conf
diff --git a/test/TEST-30-ONCLOCKCHANGE/meson.build b/test/TEST-30-ONCLOCKCHANGE/meson.build
index 8dec5f37e73..174ec42867f 100644
--- a/test/TEST-30-ONCLOCKCHANGE/meson.build
+++ b/test/TEST-30-ONCLOCKCHANGE/meson.build
@@ -5,3 +5,5 @@ integration_tests += [
                 'name' : fs.name(meson.current_source_dir()),
         },
 ]
+
+testdata_subdirs += [meson.current_source_dir() / 'TEST-30-ONCLOCKCHANGE.units']
diff --git a/test/testsuite-52.units/test-honor-first-shutdown.service b/test/TEST-52-HONORFIRSTSHUTDOWN/TEST-52-HONORFIRSTSHUTDOWN.units/test-honor-first-shutdown.service
similarity index 73%
rename from test/testsuite-52.units/test-honor-first-shutdown.service
rename to test/TEST-52-HONORFIRSTSHUTDOWN/TEST-52-HONORFIRSTSHUTDOWN.units/test-honor-first-shutdown.service
index abcf578402c..bbeac3a74e6 100644
--- a/test/testsuite-52.units/test-honor-first-shutdown.service
+++ b/test/TEST-52-HONORFIRSTSHUTDOWN/TEST-52-HONORFIRSTSHUTDOWN.units/test-honor-first-shutdown.service
@@ -4,7 +4,7 @@ Description=Honor First Shutdown feature
 After=multi-user.target
 
 [Service]
-ExecStart=/usr/lib/systemd/tests/testdata/testsuite-52.units/%N.sh
+ExecStart=/usr/lib/systemd/tests/testdata/TEST-52-HONORFIRSTSHUTDOWN.units/%N.sh
 ExecStop=sh -c 'kill -KILL $MAINPID'
 FailureAction=reboot
 
diff --git a/test/testsuite-52.units/test-honor-first-shutdown.sh b/test/TEST-52-HONORFIRSTSHUTDOWN/TEST-52-HONORFIRSTSHUTDOWN.units/test-honor-first-shutdown.sh
similarity index 100%
rename from test/testsuite-52.units/test-honor-first-shutdown.sh
rename to test/TEST-52-HONORFIRSTSHUTDOWN/TEST-52-HONORFIRSTSHUTDOWN.units/test-honor-first-shutdown.sh
diff --git a/test/TEST-52-HONORFIRSTSHUTDOWN/meson.build b/test/TEST-52-HONORFIRSTSHUTDOWN/meson.build
index 8dec5f37e73..08503e88221 100644
--- a/test/TEST-52-HONORFIRSTSHUTDOWN/meson.build
+++ b/test/TEST-52-HONORFIRSTSHUTDOWN/meson.build
@@ -5,3 +5,5 @@ integration_tests += [
                 'name' : fs.name(meson.current_source_dir()),
         },
 ]
+
+testdata_subdirs += [meson.current_source_dir() / 'TEST-52-HONORFIRSTSHUTDOWN.units']
diff --git a/test/testsuite-63.units/test63-glob.path b/test/TEST-63-PATH/TEST-63-PATH.units/test63-glob.path
similarity index 100%
rename from test/testsuite-63.units/test63-glob.path
rename to test/TEST-63-PATH/TEST-63-PATH.units/test63-glob.path
diff --git a/test/testsuite-63.units/test63-glob.service b/test/TEST-63-PATH/TEST-63-PATH.units/test63-glob.service
similarity index 100%
rename from test/testsuite-63.units/test63-glob.service
rename to test/TEST-63-PATH/TEST-63-PATH.units/test63-glob.service
diff --git a/test/testsuite-63.units/test63-issue-24577-dep.service b/test/TEST-63-PATH/TEST-63-PATH.units/test63-issue-24577-dep.service
similarity index 100%
rename from test/testsuite-63.units/test63-issue-24577-dep.service
rename to test/TEST-63-PATH/TEST-63-PATH.units/test63-issue-24577-dep.service
diff --git a/test/testsuite-63.units/test63-issue-24577.path b/test/TEST-63-PATH/TEST-63-PATH.units/test63-issue-24577.path
similarity index 100%
rename from test/testsuite-63.units/test63-issue-24577.path
rename to test/TEST-63-PATH/TEST-63-PATH.units/test63-issue-24577.path
diff --git a/test/testsuite-63.units/test63-issue-24577.service b/test/TEST-63-PATH/TEST-63-PATH.units/test63-issue-24577.service
similarity index 100%
rename from test/testsuite-63.units/test63-issue-24577.service
rename to test/TEST-63-PATH/TEST-63-PATH.units/test63-issue-24577.service
diff --git a/test/testsuite-63.units/test63-pr-30768.path b/test/TEST-63-PATH/TEST-63-PATH.units/test63-pr-30768.path
similarity index 100%
rename from test/testsuite-63.units/test63-pr-30768.path
rename to test/TEST-63-PATH/TEST-63-PATH.units/test63-pr-30768.path
diff --git a/test/testsuite-63.units/test63-pr-30768.service b/test/TEST-63-PATH/TEST-63-PATH.units/test63-pr-30768.service
similarity index 100%
rename from test/testsuite-63.units/test63-pr-30768.service
rename to test/TEST-63-PATH/TEST-63-PATH.units/test63-pr-30768.service
diff --git a/test/testsuite-63.units/test63.path b/test/TEST-63-PATH/TEST-63-PATH.units/test63.path
similarity index 100%
rename from test/testsuite-63.units/test63.path
rename to test/TEST-63-PATH/TEST-63-PATH.units/test63.path
diff --git a/test/testsuite-63.units/test63.service b/test/TEST-63-PATH/TEST-63-PATH.units/test63.service
similarity index 100%
rename from test/testsuite-63.units/test63.service
rename to test/TEST-63-PATH/TEST-63-PATH.units/test63.service
diff --git a/test/TEST-63-PATH/meson.build b/test/TEST-63-PATH/meson.build
index 8dec5f37e73..4aa3afdf7a3 100644
--- a/test/TEST-63-PATH/meson.build
+++ b/test/TEST-63-PATH/meson.build
@@ -5,3 +5,5 @@ integration_tests += [
                 'name' : fs.name(meson.current_source_dir()),
         },
 ]
+
+testdata_subdirs += [meson.current_source_dir() / 'TEST-63-PATH.units']
diff --git a/test/testsuite-80.units/fdstore-nopin.service b/test/TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units/fdstore-nopin.service
similarity index 54%
rename from test/testsuite-80.units/fdstore-nopin.service
rename to test/TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units/fdstore-nopin.service
index 29ffd230336..f65885345f0 100644
--- a/test/testsuite-80.units/fdstore-nopin.service
+++ b/test/TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units/fdstore-nopin.service
@@ -3,4 +3,4 @@ Type=notify
 NotifyAccess=all
 FileDescriptorStoreMax=10
 FileDescriptorStorePreserve=restart
-ExecStart=/usr/lib/systemd/tests/testdata/testsuite-80.units/fdstore-pin.sh 0
+ExecStart=/usr/lib/systemd/tests/testdata/TEST-80-NOTIFYACCESS.units/fdstore-pin.sh 0
diff --git a/test/testsuite-80.units/fdstore-pin.service b/test/TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units/fdstore-pin.service
similarity index 53%
rename from test/testsuite-80.units/fdstore-pin.service
rename to test/TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units/fdstore-pin.service
index 913daa2725b..393b5ac6819 100644
--- a/test/testsuite-80.units/fdstore-pin.service
+++ b/test/TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units/fdstore-pin.service
@@ -3,4 +3,4 @@ Type=notify
 NotifyAccess=all
 FileDescriptorStoreMax=10
 FileDescriptorStorePreserve=yes
-ExecStart=/usr/lib/systemd/tests/testdata/testsuite-80.units/fdstore-pin.sh 1
+ExecStart=/usr/lib/systemd/tests/testdata/TEST-80-NOTIFYACCESS.units/fdstore-pin.sh 1
diff --git a/test/testsuite-80.units/fdstore-pin.sh b/test/TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units/fdstore-pin.sh
similarity index 100%
rename from test/testsuite-80.units/fdstore-pin.sh
rename to test/TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units/fdstore-pin.sh
diff --git a/test/testsuite-80.units/fdstore-pin.target b/test/TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units/fdstore-pin.target
similarity index 100%
rename from test/testsuite-80.units/fdstore-pin.target
rename to test/TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units/fdstore-pin.target
diff --git a/test/TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units/notify.service b/test/TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units/notify.service
new file mode 100644
index 00000000000..5693be613da
--- /dev/null
+++ b/test/TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units/notify.service
@@ -0,0 +1,4 @@
+[Service]
+Type=notify
+NotifyAccess=all
+ExecStart=/usr/lib/systemd/tests/testdata/TEST-80-NOTIFYACCESS.units/test.sh
diff --git a/test/testsuite-80.units/test.sh b/test/TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units/test.sh
similarity index 100%
rename from test/testsuite-80.units/test.sh
rename to test/TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units/test.sh
diff --git a/test/TEST-80-NOTIFYACCESS/meson.build b/test/TEST-80-NOTIFYACCESS/meson.build
index 8dec5f37e73..f78c6fd732e 100644
--- a/test/TEST-80-NOTIFYACCESS/meson.build
+++ b/test/TEST-80-NOTIFYACCESS/meson.build
@@ -5,3 +5,5 @@ integration_tests += [
                 'name' : fs.name(meson.current_source_dir()),
         },
 ]
+
+testdata_subdirs += [meson.current_source_dir() / 'TEST-80-NOTIFYACCESS.units']
diff --git a/test/integration-test-wrapper.py b/test/integration-test-wrapper.py
index c41ca8e55a0..6e2c0aede72 100755
--- a/test/integration-test-wrapper.py
+++ b/test/integration-test-wrapper.py
@@ -43,7 +43,6 @@ def main():
     parser.add_argument('--meson-source-dir', required=True, type=Path)
     parser.add_argument('--meson-build-dir', required=True, type=Path)
     parser.add_argument('--test-name', required=True)
-    parser.add_argument('--test-number', required=True)
     parser.add_argument('--storage', required=True)
     parser.add_argument('--firmware', required=True)
     parser.add_argument('--slow', action=argparse.BooleanOptionalAction)
@@ -59,7 +58,7 @@ def main():
         exit(77)
 
     name = args.test_name + (f"-{i}" if (i := os.getenv("MESON_TEST_ITERATION")) else "")
-    test_unit = f"testsuite-{args.test_number}.service"
+    test_unit = f"{args.test_name}.service"
 
     dropin = textwrap.dedent(
         """\
@@ -130,7 +129,7 @@ def main():
         '--kernel-command-line-extra',
         ' '.join([
             'systemd.hostname=H',
-            f"SYSTEMD_UNIT_PATH=/usr/lib/systemd/tests/testdata/testsuite-{args.test_number}.units:/usr/lib/systemd/tests/testdata/units:",
+            f"SYSTEMD_UNIT_PATH=/usr/lib/systemd/tests/testdata/{args.test_name}.units:/usr/lib/systemd/tests/testdata/units:",
             f"systemd.unit={test_unit}",
             'systemd.mask=systemd-networkd-wait-online.service',
             *(
diff --git a/test/meson.build b/test/meson.build
index 37c6a671ad8..26fbd562829 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -1,75 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-if install_tests
-        foreach subdir : [
-                'auxv',
-                'journal-data',
-                'knot-data',
-                'test-journals',
-                'units',
-                'test-execute',
-                'test-fstab-generator',
-                'test-path',
-                'test-path-util',
-                'test-umount',
-                'test-network',
-                'test-network-generator-conversion',
-                'testsuite-03.units',
-                'testsuite-04.units',
-                'testsuite-06.units',
-                'testsuite-07.units',
-                'testsuite-16.units',
-                'testsuite-23.units',
-                'testsuite-30.units',
-                'testsuite-52.units',
-                'testsuite-63.units',
-                'testsuite-80.units',
-        ]
-                # install_subdir() before meson 1.3.0 does not handle symlinks correctly (it follows them
-                # instead of copying the symlink) so we use rsync instead.
-                if meson.version().version_compare('<1.3.0')
-                        if not rsync.found()
-                                error('rsync is required to install the integration test data')
-                        endif
-
-                        rsync_r = rsync.full_path() + ' -rlpt --exclude .gitattributes --exclude 25-default.link -- "@0@" "${DESTDIR:-}@1@"'
-                        meson.add_install_script(sh, '-c',
-                                                 rsync_r.format(meson.current_source_dir() / subdir, testdata_dir))
-                else
-                        install_subdir(subdir,
-                                       exclude_files : ['.gitattributes', '25-default.link'],
-                                       install_dir : testdata_dir,
-                                       follow_symlinks : false)
-                endif
-        endforeach
-
-        # test-network/conf/25-default.link is a local symlink that becomes dangling when installed, so we
-        # exclude it and create the correct symlink here.
-        meson.add_install_script(sh, '-c', ln_s.format(networkdir / '99-default.link',
-                                                       testdata_dir / 'test-network/conf/25-default.link'))
-
-        install_data(kbd_model_map,
-                     install_dir : testdata_dir + '/test-keymap-util')
-
-        if conf.get('HAVE_ZSTD') == 1 and efi_arch != ''
-                install_subdir('test-bcd',
-                               exclude_files : '.gitattributes',
-                               install_dir : testdata_dir)
-        endif
-        if conf.get('ENABLE_RESOLVE') == 1
-                install_subdir('test-resolve',
-                               exclude_files : '.gitattributes',
-                               install_dir : testdata_dir)
-        endif
-
-        # The unit tests implemented as shell scripts expect to find testdata/
-        # in the directory where they are stored.
-        meson.add_install_script(sh, '-c', ln_s.format(testdata_dir,
-                                                       unittestsdir / 'testdata'))
-endif
-
-############################################################
-
 if conf.get('ENABLE_SYSUSERS') == 1
         test_sysusers_sh = configure_file(
                 input : 'test-sysusers.sh.in',
@@ -353,6 +283,20 @@ integration_test_template = {
         'firmware' : 'linux',
         'slow' : false,
 }
+testdata_subdirs = [
+        'auxv',
+        'journal-data',
+        'knot-data',
+        'test-journals',
+        'units',
+        'test-execute',
+        'test-fstab-generator',
+        'test-path',
+        'test-path-util',
+        'test-umount',
+        'test-network',
+        'test-network-generator-conversion',
+]
 
 foreach dirname : [
         'TEST-01-BASIC',
@@ -423,13 +367,10 @@ foreach dirname : [
 endforeach
 
 foreach integration_test : integration_tests
-        integration_test_number = integration_test['name'].split('-')[1]
-
         integration_test_args = [
                 '--meson-source-dir', meson.project_source_root(),
                 '--meson-build-dir', meson.project_build_root(),
                 '--test-name', integration_test['name'],
-                '--test-number', integration_test_number,
                 '--storage', integration_test['storage'],
                 '--firmware', integration_test['firmware'],
         ]
@@ -463,3 +404,48 @@ foreach integration_test : integration_tests
                 suite : 'integration-tests',
         )
 endforeach
+
+if install_tests
+        foreach subdir : testdata_subdirs
+                # install_subdir() before meson 1.3.0 does not handle symlinks correctly (it follows them
+                # instead of copying the symlink) so we use rsync instead.
+                if meson.version().version_compare('<1.3.0')
+                        if not rsync.found()
+                                error('rsync is required to install the integration test data')
+                        endif
+
+                        rsync_r = rsync.full_path() + ' -rlpt --exclude .gitattributes --exclude 25-default.link -- "@0@" "${DESTDIR:-}@1@"'
+                        meson.add_install_script(sh, '-c',
+                                                 rsync_r.format(meson.current_source_dir() / subdir, testdata_dir))
+                else
+                        install_subdir(subdir,
+                                       exclude_files : ['.gitattributes', '25-default.link'],
+                                       install_dir : testdata_dir,
+                                       follow_symlinks : false)
+                endif
+        endforeach
+
+        # test-network/conf/25-default.link is a local symlink that becomes dangling when installed, so we
+        # exclude it and create the correct symlink here.
+        meson.add_install_script(sh, '-c', ln_s.format(networkdir / '99-default.link',
+                                                       testdata_dir / 'test-network/conf/25-default.link'))
+
+        install_data(kbd_model_map,
+                     install_dir : testdata_dir + '/test-keymap-util')
+
+        if conf.get('HAVE_ZSTD') == 1 and efi_arch != ''
+                install_subdir('test-bcd',
+                               exclude_files : '.gitattributes',
+                               install_dir : testdata_dir)
+        endif
+        if conf.get('ENABLE_RESOLVE') == 1
+                install_subdir('test-resolve',
+                               exclude_files : '.gitattributes',
+                               install_dir : testdata_dir)
+        endif
+
+        # The unit tests implemented as shell scripts expect to find testdata/
+        # in the directory where they are stored.
+        meson.add_install_script(sh, '-c', ln_s.format(testdata_dir,
+                                                       unittestsdir / 'testdata'))
+endif
diff --git a/test/test-functions b/test/test-functions
index 6e889f838b5..2168854addf 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -146,10 +146,9 @@ if ! [[ "$TESTNAME" =~ ^TEST\-([0-9]+)\-.+$ ]]; then
     echo "ERROR: Test name '$TESTNAME' is not in the expected format: TEST-[0-9]+-*" >&2
     exit 1
 fi
-TESTID="${BASH_REMATCH[1]:?}"
 
-if [[ ! -f "$TEST_UNITS_DIR/testsuite-$TESTID.service" ]]; then
-    echo "ERROR: Test '$TESTNAME' is missing its service file '$TEST_UNITS_DIR/testsuite-$TESTID.service" >&2
+if [[ ! -f "$TEST_UNITS_DIR/$TESTNAME.service" ]]; then
+    echo "ERROR: Test '$TESTNAME' is missing its service file '$TEST_UNITS_DIR/$TESTNAME.service" >&2
     exit 1
 fi
 
@@ -566,9 +565,9 @@ run_qemu() {
         "loglevel=2"
         "init=$PATH_TO_INIT"
         "console=$CONSOLE"
-        "SYSTEMD_UNIT_PATH=/usr/lib/systemd/tests/testdata/testsuite-$1.units:/usr/lib/systemd/tests/testdata/units:"
+        "SYSTEMD_UNIT_PATH=/usr/lib/systemd/tests/testdata/$1.units:/usr/lib/systemd/tests/testdata/units:"
         "systemd.unit=testsuite.target"
-        "systemd.wants=testsuite-$1.service"
+        "systemd.wants=$1.service"
         "noresume"
         "oops=panic"
         ${TEST_MATCH_SUBTEST:+"systemd.setenv=TEST_MATCH_SUBTEST=$TEST_MATCH_SUBTEST"}
@@ -658,13 +657,13 @@ run_nspawn() {
         "--register=no"
         "--kill-signal=SIGKILL"
         "--directory=${1:?}"
-        "--setenv=SYSTEMD_UNIT_PATH=/usr/lib/systemd/tests/testdata/testsuite-$2.units:/usr/lib/systemd/tests/testdata/units:"
-        "--machine=TEST-$TESTID"
+        "--setenv=SYSTEMD_UNIT_PATH=/usr/lib/systemd/tests/testdata/$2.units:/usr/lib/systemd/tests/testdata/units:"
+        "--machine=$2"
     )
     local kernel_params=(
         "$PATH_TO_INIT"
         "systemd.unit=testsuite.target"
-        "systemd.wants=testsuite-$2.service"
+        "systemd.wants=$2.service"
         ${TEST_MATCH_SUBTEST:+"systemd.setenv=TEST_MATCH_SUBTEST=$TEST_MATCH_SUBTEST"}
         ${TEST_MATCH_TESTCASE:+"systemd.setenv=TEST_MATCH_TESTCASE=$TEST_MATCH_TESTCASE"}
     )
@@ -1745,10 +1744,10 @@ save_journal() {
         dest_name="system.journal"
     fi
 
-    # Show messages from the testsuite-XX.service or messages with priority "warning" and higher
+    # Show messages from the TEST-XX-XXX.service or messages with priority "warning" and higher
     echo " --- $source_dir ---"
     "$JOURNALCTL" --all --no-pager --no-hostname -o short-monotonic -D "$source_dir" \
-        _SYSTEMD_UNIT="testsuite-${TESTID:?}.service" + SYSLOG_IDENTIFIER="testsuite-$TESTID.sh" + \
+        _SYSTEMD_UNIT="${TESTNAME:?}.service" + SYSLOG_IDENTIFIER="$TESTNAME.sh" + \
         PRIORITY=4 + PRIORITY=3 + PRIORITY=2 + PRIORITY=1 + PRIORITY=0
 
     if get_bool "$save"; then
@@ -3325,11 +3324,11 @@ test_setup() {
 }
 
 test_run() {
-    local test_id="${1:?}"
+    local test_name="${1:?}"
     mount_initdir
 
     if ! get_bool "${TEST_NO_QEMU:=}"; then
-        if run_qemu "$test_id"; then
+        if run_qemu "$test_name"; then
             check_result_qemu || { echo "qemu test failed"; return 1; }
         else
             dwarn "can't run qemu, skipping"
@@ -3337,7 +3336,7 @@ test_run() {
     fi
     if ! get_bool "${TEST_NO_NSPAWN:=}"; then
         mount_initdir
-        if run_nspawn "${initdir:?}" "$test_id"; then
+        if run_nspawn "${initdir:?}" "$test_name"; then
             check_result_nspawn "$initdir" || { echo "nspawn-root test failed"; return 1; }
         else
             dwarn "can't run systemd-nspawn, skipping"
@@ -3345,7 +3344,7 @@ test_run() {
 
         if get_bool "${RUN_IN_UNPRIVILEGED_CONTAINER:=}"; then
             dir="$TESTDIR/unprivileged-nspawn-root"
-            if NSPAWN_ARGUMENTS="-U --private-network ${NSPAWN_ARGUMENTS:-}" run_nspawn "$dir" "$test_id"; then
+            if NSPAWN_ARGUMENTS="-U --private-network ${NSPAWN_ARGUMENTS:-}" run_nspawn "$dir" "$test_name"; then
                 check_result_nspawn "$dir" || { echo "unprivileged-nspawn-root test failed"; return 1; }
             else
                 dwarn "can't run systemd-nspawn, skipping"
@@ -3401,7 +3400,7 @@ do_test() {
         case $1 in
             --run)
                 echo "${testname} RUN: $TEST_DESCRIPTION"
-                test_run "$TESTID"
+                test_run "$TESTNAME"
                 ret=$?
                 if [ $ret -eq 0 ]; then
                     echo "${testname} RUN: $TEST_DESCRIPTION [OK]"
@@ -3433,7 +3432,7 @@ do_test() {
                     test_setup_cleanup </dev/null >>"$TESTLOG" 2>&1 || ret=$?
                 fi
                 if [ $ret -eq 0 ]; then
-                    test_run "$TESTID" </dev/null >>"$TESTLOG" 2>&1 || ret=$?
+                    test_run "$TESTNAME" </dev/null >>"$TESTLOG" 2>&1 || ret=$?
                 fi
                 test_cleanup
                 if [ $ret -eq 0 ]; then
diff --git a/test/testsuite-23.units/testsuite-23-prop-stop-one.service b/test/testsuite-23.units/testsuite-23-prop-stop-one.service
deleted file mode 100644
index 03189550a7f..00000000000
--- a/test/testsuite-23.units/testsuite-23-prop-stop-one.service
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=Stop Propagation Receiver
-Wants=testsuite-23-prop-stop-two.service
-After=testsuite-23-prop-stop-two.service
-StopPropagatedFrom=testsuite-23-prop-stop-two.service
-
-[Service]
-ExecStart=sleep infinity
-ExecStopPost=systemctl kill --kill-whom=main -sUSR2 testsuite-23.service
diff --git a/test/testsuite-80.units/notify.service b/test/testsuite-80.units/notify.service
deleted file mode 100644
index 196b0766720..00000000000
--- a/test/testsuite-80.units/notify.service
+++ /dev/null
@@ -1,4 +0,0 @@
-[Service]
-Type=notify
-NotifyAccess=all
-ExecStart=/usr/lib/systemd/tests/testdata/testsuite-80.units/test.sh
diff --git a/test/units/testsuite-01.service b/test/units/TEST-01-BASIC.service
similarity index 100%
rename from test/units/testsuite-01.service
rename to test/units/TEST-01-BASIC.service
diff --git a/test/units/testsuite-01.sh b/test/units/TEST-01-BASIC.sh
similarity index 100%
rename from test/units/testsuite-01.sh
rename to test/units/TEST-01-BASIC.sh
diff --git a/test/units/testsuite-02.service b/test/units/TEST-02-UNITTESTS.service
similarity index 100%
rename from test/units/testsuite-02.service
rename to test/units/TEST-02-UNITTESTS.service
diff --git a/test/units/testsuite-02.sh b/test/units/TEST-02-UNITTESTS.sh
similarity index 100%
rename from test/units/testsuite-02.sh
rename to test/units/TEST-02-UNITTESTS.sh
diff --git a/test/units/testsuite-03.service b/test/units/TEST-03-JOBS.service
similarity index 100%
rename from test/units/testsuite-03.service
rename to test/units/TEST-03-JOBS.service
diff --git a/test/units/testsuite-03.sh b/test/units/TEST-03-JOBS.sh
similarity index 100%
rename from test/units/testsuite-03.sh
rename to test/units/TEST-03-JOBS.sh
diff --git a/test/units/testsuite-04.LogFilterPatterns.sh b/test/units/TEST-04-JOURNAL.LogFilterPatterns.sh
similarity index 100%
rename from test/units/testsuite-04.LogFilterPatterns.sh
rename to test/units/TEST-04-JOURNAL.LogFilterPatterns.sh
diff --git a/test/units/testsuite-04.SYSTEMD_JOURNAL_COMPRESS.sh b/test/units/TEST-04-JOURNAL.SYSTEMD_JOURNAL_COMPRESS.sh
similarity index 100%
rename from test/units/testsuite-04.SYSTEMD_JOURNAL_COMPRESS.sh
rename to test/units/TEST-04-JOURNAL.SYSTEMD_JOURNAL_COMPRESS.sh
diff --git a/test/units/testsuite-04.bsod.sh b/test/units/TEST-04-JOURNAL.bsod.sh
similarity index 100%
rename from test/units/testsuite-04.bsod.sh
rename to test/units/TEST-04-JOURNAL.bsod.sh
diff --git a/test/units/testsuite-04.cat.sh b/test/units/TEST-04-JOURNAL.cat.sh
similarity index 100%
rename from test/units/testsuite-04.cat.sh
rename to test/units/TEST-04-JOURNAL.cat.sh
diff --git a/test/units/testsuite-04.corrupted-journals.sh b/test/units/TEST-04-JOURNAL.corrupted-journals.sh
similarity index 100%
rename from test/units/testsuite-04.corrupted-journals.sh
rename to test/units/TEST-04-JOURNAL.corrupted-journals.sh
diff --git a/test/units/testsuite-04.fss.sh b/test/units/TEST-04-JOURNAL.fss.sh
similarity index 100%
rename from test/units/testsuite-04.fss.sh
rename to test/units/TEST-04-JOURNAL.fss.sh
diff --git a/test/units/testsuite-04.journal-append.sh b/test/units/TEST-04-JOURNAL.journal-append.sh
similarity index 100%
rename from test/units/testsuite-04.journal-append.sh
rename to test/units/TEST-04-JOURNAL.journal-append.sh
diff --git a/test/units/testsuite-04.journal-corrupt.sh b/test/units/TEST-04-JOURNAL.journal-corrupt.sh
similarity index 100%
rename from test/units/testsuite-04.journal-corrupt.sh
rename to test/units/TEST-04-JOURNAL.journal-corrupt.sh
diff --git a/test/units/testsuite-04.journal-gatewayd.sh b/test/units/TEST-04-JOURNAL.journal-gatewayd.sh
similarity index 100%
rename from test/units/testsuite-04.journal-gatewayd.sh
rename to test/units/TEST-04-JOURNAL.journal-gatewayd.sh
diff --git a/test/units/testsuite-04.journal-remote.sh b/test/units/TEST-04-JOURNAL.journal-remote.sh
similarity index 100%
rename from test/units/testsuite-04.journal-remote.sh
rename to test/units/TEST-04-JOURNAL.journal-remote.sh
diff --git a/test/units/testsuite-04.journal.sh b/test/units/TEST-04-JOURNAL.journal.sh
similarity index 100%
rename from test/units/testsuite-04.journal.sh
rename to test/units/TEST-04-JOURNAL.journal.sh
diff --git a/test/units/testsuite-04.service b/test/units/TEST-04-JOURNAL.service
similarity index 100%
rename from test/units/testsuite-04.service
rename to test/units/TEST-04-JOURNAL.service
diff --git a/test/units/testsuite-04.sh b/test/units/TEST-04-JOURNAL.sh
similarity index 100%
rename from test/units/testsuite-04.sh
rename to test/units/TEST-04-JOURNAL.sh
diff --git a/test/units/testsuite-05.effective-limit.sh b/test/units/TEST-05-RLIMITS.effective-limit.sh
similarity index 100%
rename from test/units/testsuite-05.effective-limit.sh
rename to test/units/TEST-05-RLIMITS.effective-limit.sh
diff --git a/test/units/testsuite-05.rlimit.sh b/test/units/TEST-05-RLIMITS.rlimit.sh
similarity index 77%
rename from test/units/testsuite-05.rlimit.sh
rename to test/units/TEST-05-RLIMITS.rlimit.sh
index bbf3adbe651..6b425d4081d 100755
--- a/test/units/testsuite-05.rlimit.sh
+++ b/test/units/TEST-05-RLIMITS.rlimit.sh
@@ -16,8 +16,8 @@ systemctl daemon-reload
 [[ "$(systemctl show -P DefaultLimitNOFILESoft)" = "10000" ]]
 [[ "$(systemctl show -P DefaultLimitNOFILE)" = "16384" ]]
 
-[[ "$(systemctl show -P LimitNOFILESoft testsuite-05.service)" = "10000" ]]
-[[ "$(systemctl show -P LimitNOFILE testsuite-05.service)" = "16384" ]]
+[[ "$(systemctl show -P LimitNOFILESoft TEST-05-RLIMITS.service)" = "10000" ]]
+[[ "$(systemctl show -P LimitNOFILE TEST-05-RLIMITS.service)" = "16384" ]]
 
 # shellcheck disable=SC2016
 systemd-run --wait -t bash -c '[[ "$(ulimit -n -S)" = "10000" ]]'
diff --git a/test/units/testsuite-19.service b/test/units/TEST-05-RLIMITS.service
similarity index 85%
rename from test/units/testsuite-19.service
rename to test/units/TEST-05-RLIMITS.service
index 9ee5fc97d23..ab72d8fe27a 100644
--- a/test/units/testsuite-19.service
+++ b/test/units/TEST-05-RLIMITS.service
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
-Description=TEST-19-DELEGATE
+Description=TEST-05-RLIMITS
 
 [Service]
 ExecStartPre=rm -f /failed /testok
diff --git a/test/units/testsuite-05.sh b/test/units/TEST-05-RLIMITS.sh
similarity index 100%
rename from test/units/testsuite-05.sh
rename to test/units/TEST-05-RLIMITS.sh
diff --git a/test/units/testsuite-06.service b/test/units/TEST-06-SELINUX.service
similarity index 100%
rename from test/units/testsuite-06.service
rename to test/units/TEST-06-SELINUX.service
diff --git a/test/units/testsuite-06.sh b/test/units/TEST-06-SELINUX.sh
similarity index 100%
rename from test/units/testsuite-06.sh
rename to test/units/TEST-06-SELINUX.sh
diff --git a/test/units/testsuite-07.aux-scope.sh b/test/units/TEST-07-PID1.aux-scope.sh
similarity index 100%
rename from test/units/testsuite-07.aux-scope.sh
rename to test/units/TEST-07-PID1.aux-scope.sh
diff --git a/test/units/testsuite-07.exec-context.sh b/test/units/TEST-07-PID1.exec-context.sh
similarity index 100%
rename from test/units/testsuite-07.exec-context.sh
rename to test/units/TEST-07-PID1.exec-context.sh
diff --git a/test/units/testsuite-07.exec-deserialization.sh b/test/units/TEST-07-PID1.exec-deserialization.sh
similarity index 100%
rename from test/units/testsuite-07.exec-deserialization.sh
rename to test/units/TEST-07-PID1.exec-deserialization.sh
diff --git a/test/units/testsuite-07.exec-timestamps.sh b/test/units/TEST-07-PID1.exec-timestamps.sh
similarity index 100%
rename from test/units/testsuite-07.exec-timestamps.sh
rename to test/units/TEST-07-PID1.exec-timestamps.sh
diff --git a/test/units/testsuite-07.issue-14566.sh b/test/units/TEST-07-PID1.issue-14566.sh
similarity index 100%
rename from test/units/testsuite-07.issue-14566.sh
rename to test/units/TEST-07-PID1.issue-14566.sh
diff --git a/test/units/testsuite-07.issue-16115.sh b/test/units/TEST-07-PID1.issue-16115.sh
similarity index 100%
rename from test/units/testsuite-07.issue-16115.sh
rename to test/units/TEST-07-PID1.issue-16115.sh
diff --git a/test/units/testsuite-07.issue-1981.sh b/test/units/TEST-07-PID1.issue-1981.sh
similarity index 100%
rename from test/units/testsuite-07.issue-1981.sh
rename to test/units/TEST-07-PID1.issue-1981.sh
diff --git a/test/units/testsuite-07.issue-2467.sh b/test/units/TEST-07-PID1.issue-2467.sh
similarity index 100%
rename from test/units/testsuite-07.issue-2467.sh
rename to test/units/TEST-07-PID1.issue-2467.sh
diff --git a/test/units/testsuite-07.issue-27953.sh b/test/units/TEST-07-PID1.issue-27953.sh
similarity index 100%
rename from test/units/testsuite-07.issue-27953.sh
rename to test/units/TEST-07-PID1.issue-27953.sh
diff --git a/test/units/testsuite-07.issue-30412.sh b/test/units/TEST-07-PID1.issue-30412.sh
similarity index 100%
rename from test/units/testsuite-07.issue-30412.sh
rename to test/units/TEST-07-PID1.issue-30412.sh
diff --git a/test/units/testsuite-07.issue-3166.sh b/test/units/TEST-07-PID1.issue-3166.sh
similarity index 100%
rename from test/units/testsuite-07.issue-3166.sh
rename to test/units/TEST-07-PID1.issue-3166.sh
diff --git a/test/units/testsuite-07.issue-3171.sh b/test/units/TEST-07-PID1.issue-3171.sh
similarity index 100%
rename from test/units/testsuite-07.issue-3171.sh
rename to test/units/TEST-07-PID1.issue-3171.sh
diff --git a/test/units/testsuite-07.main-PID-change.sh b/test/units/TEST-07-PID1.main-PID-change.sh
similarity index 88%
rename from test/units/testsuite-07.main-PID-change.sh
rename to test/units/TEST-07-PID1.main-PID-change.sh
index bd1144c6f2e..16f3510e5ed 100755
--- a/test/units/testsuite-07.main-PID-change.sh
+++ b/test/units/TEST-07-PID1.main-PID-change.sh
@@ -10,7 +10,7 @@ set -o pipefail
 
 # The main service PID should be the parent bash process
 MAINPID="${PPID:?}"
-test "$(systemctl show -P MainPID testsuite-07.service)" -eq "$MAINPID"
+test "$(systemctl show -P MainPID TEST-07-PID1.service)" -eq "$MAINPID"
 
 # Start a test process inside of our own cgroup
 sleep infinity &
@@ -23,41 +23,41 @@ EXTERNALPID="$(systemctl show -P MainPID test-sleep.service)"
 
 # Update our own main PID to the external test PID, this should work
 systemd-notify MAINPID="$EXTERNALPID"
-test "$(systemctl show -P MainPID testsuite-07.service)" -eq "$EXTERNALPID"
+test "$(systemctl show -P MainPID TEST-07-PID1.service)" -eq "$EXTERNALPID"
 
 # Update our own main PID to the internal test PID, this should work, too
 systemd-notify MAINPID=$INTERNALPID
-test "$(systemctl show -P MainPID testsuite-07.service)" -eq "$INTERNALPID"
+test "$(systemctl show -P MainPID TEST-07-PID1.service)" -eq "$INTERNALPID"
 
 # Update it back to our own PID, this should also work
 systemd-notify MAINPID="$MAINPID"
-test "$(systemctl show -P MainPID testsuite-07.service)" -eq "$MAINPID"
+test "$(systemctl show -P MainPID TEST-07-PID1.service)" -eq "$MAINPID"
 
 # Try to set it to PID 1, which it should ignore, because that's the manager
 systemd-notify MAINPID=1
-test "$(systemctl show -P MainPID testsuite-07.service)" -eq "$MAINPID"
+test "$(systemctl show -P MainPID TEST-07-PID1.service)" -eq "$MAINPID"
 
 # Try to set it to PID 0, which is invalid and should be ignored
 systemd-notify MAINPID=0
-test "$(systemctl show -P MainPID testsuite-07.service)" -eq "$MAINPID"
+test "$(systemctl show -P MainPID TEST-07-PID1.service)" -eq "$MAINPID"
 
 # Try to set it to a valid but non-existing PID, which should be ignored. (Note
 # that we set the PID to a value well above any known /proc/sys/kernel/pid_max,
 # which means we can be pretty sure it doesn't exist by coincidence)
 systemd-notify MAINPID=1073741824
-test "$(systemctl show -P MainPID testsuite-07.service)" -eq "$MAINPID"
+test "$(systemctl show -P MainPID TEST-07-PID1.service)" -eq "$MAINPID"
 
 # Change it again to the external PID, without privileges this time. This should be ignored, because the PID is from outside of our cgroup and we lack privileges.
 systemd-notify --uid=1000 MAINPID="$EXTERNALPID"
-test "$(systemctl show -P MainPID testsuite-07.service)" -eq "$MAINPID"
+test "$(systemctl show -P MainPID TEST-07-PID1.service)" -eq "$MAINPID"
 
 # Change it again to the internal PID, without privileges this time. This should work, as the process is on our cgroup, and that's enough even if we lack privileges.
 systemd-notify --uid=1000 MAINPID="$INTERNALPID"
-test "$(systemctl show -P MainPID testsuite-07.service)" -eq "$INTERNALPID"
+test "$(systemctl show -P MainPID TEST-07-PID1.service)" -eq "$INTERNALPID"
 
 # Update it back to our own PID, this should also work
 systemd-notify --uid=1000 MAINPID="$MAINPID"
-test "$(systemctl show -P MainPID testsuite-07.service)" -eq "$MAINPID"
+test "$(systemctl show -P MainPID TEST-07-PID1.service)" -eq "$MAINPID"
 
 cat >/tmp/test-mainpid.sh <<\EOF
 #!/usr/bin/env bash
diff --git a/test/units/testsuite-07.mount-invalid-chars.sh b/test/units/TEST-07-PID1.mount-invalid-chars.sh
similarity index 100%
rename from test/units/testsuite-07.mount-invalid-chars.sh
rename to test/units/TEST-07-PID1.mount-invalid-chars.sh
diff --git a/test/units/testsuite-07.poll-limit.sh b/test/units/TEST-07-PID1.poll-limit.sh
similarity index 100%
rename from test/units/testsuite-07.poll-limit.sh
rename to test/units/TEST-07-PID1.poll-limit.sh
diff --git a/test/units/testsuite-07.pr-31351.sh b/test/units/TEST-07-PID1.pr-31351.sh
similarity index 100%
rename from test/units/testsuite-07.pr-31351.sh
rename to test/units/TEST-07-PID1.pr-31351.sh
diff --git a/test/units/testsuite-07.private-network.sh b/test/units/TEST-07-PID1.private-network.sh
similarity index 100%
rename from test/units/testsuite-07.private-network.sh
rename to test/units/TEST-07-PID1.private-network.sh
diff --git a/test/units/testsuite-07.service b/test/units/TEST-07-PID1.service
similarity index 100%
rename from test/units/testsuite-07.service
rename to test/units/TEST-07-PID1.service
diff --git a/test/units/testsuite-07.sh b/test/units/TEST-07-PID1.sh
similarity index 100%
rename from test/units/testsuite-07.sh
rename to test/units/TEST-07-PID1.sh
diff --git a/test/units/testsuite-07.socket-pass-fds.sh b/test/units/TEST-07-PID1.socket-pass-fds.sh
similarity index 100%
rename from test/units/testsuite-07.socket-pass-fds.sh
rename to test/units/TEST-07-PID1.socket-pass-fds.sh
diff --git a/test/units/testsuite-07.type-exec-parallel.sh b/test/units/TEST-07-PID1.type-exec-parallel.sh
similarity index 100%
rename from test/units/testsuite-07.type-exec-parallel.sh
rename to test/units/TEST-07-PID1.type-exec-parallel.sh
diff --git a/test/units/testsuite-08.service b/test/units/TEST-08-INITRD.service
similarity index 100%
rename from test/units/testsuite-08.service
rename to test/units/TEST-08-INITRD.service
diff --git a/test/units/testsuite-08.sh b/test/units/TEST-08-INITRD.sh
similarity index 100%
rename from test/units/testsuite-08.sh
rename to test/units/TEST-08-INITRD.sh
diff --git a/test/units/testsuite-09.journal.sh b/test/units/TEST-09-REBOOT.journal.sh
similarity index 100%
rename from test/units/testsuite-09.journal.sh
rename to test/units/TEST-09-REBOOT.journal.sh
diff --git a/test/units/testsuite-09.service b/test/units/TEST-09-REBOOT.service
similarity index 100%
rename from test/units/testsuite-09.service
rename to test/units/TEST-09-REBOOT.service
diff --git a/test/units/testsuite-09.sh b/test/units/TEST-09-REBOOT.sh
similarity index 100%
rename from test/units/testsuite-09.sh
rename to test/units/TEST-09-REBOOT.sh
diff --git a/test/units/testsuite-13.importctl.sh b/test/units/TEST-13-NSPAWN.importctl.sh
similarity index 100%
rename from test/units/testsuite-13.importctl.sh
rename to test/units/TEST-13-NSPAWN.importctl.sh
diff --git a/test/units/testsuite-13.machinectl.sh b/test/units/TEST-13-NSPAWN.machinectl.sh
similarity index 100%
rename from test/units/testsuite-13.machinectl.sh
rename to test/units/TEST-13-NSPAWN.machinectl.sh
diff --git a/test/units/testsuite-13.nspawn-oci.sh b/test/units/TEST-13-NSPAWN.nspawn-oci.sh
similarity index 99%
rename from test/units/testsuite-13.nspawn-oci.sh
rename to test/units/TEST-13-NSPAWN.nspawn-oci.sh
index b8a76fa1722..65dcc96b594 100755
--- a/test/units/testsuite-13.nspawn-oci.sh
+++ b/test/units/TEST-13-NSPAWN.nspawn-oci.sh
@@ -34,7 +34,7 @@ NETNS="$(mktemp /var/tmp/netns.XXX)"
 mount --bind /proc/self/ns/net "$NETNS"
 TMPDIR="$(mktemp -d)"
 touch "$TMPDIR/hello"
-OCI="$(mktemp -d /var/lib/machines/testsuite-13.oci-bundle.XXX)"
+OCI="$(mktemp -d /var/lib/machines/TEST-13-NSPAWN.oci-bundle.XXX)"
 create_dummy_container "$OCI/rootfs"
 mkdir -p "$OCI/rootfs/opt/var"
 mkdir -p "$OCI/rootfs/opt/readonly"
diff --git a/test/units/testsuite-13.nspawn.sh b/test/units/TEST-13-NSPAWN.nspawn.sh
similarity index 96%
rename from test/units/testsuite-13.nspawn.sh
rename to test/units/TEST-13-NSPAWN.nspawn.sh
index 026ed23fcd9..7901e9877bf 100755
--- a/test/units/testsuite-13.nspawn.sh
+++ b/test/units/TEST-13-NSPAWN.nspawn.sh
@@ -82,7 +82,7 @@ testcase_sanity() {
     template="$(mktemp -d /tmp/nspawn-template.XXX)"
     create_dummy_container "$template"
     # Create a simple image from the just created container template
-    image="$(mktemp /var/lib/machines/testsuite-13.image-XXX.img)"
+    image="$(mktemp /var/lib/machines/TEST-13-NSPAWN.image-XXX.img)"
     dd if=/dev/zero of="$image" bs=1M count=256
     mkfs.ext4 "$image"
     mkdir -p /mnt
@@ -94,7 +94,7 @@ testcase_sanity() {
     systemd-nspawn --version
 
     # --template=
-    root="$(mktemp -u -d /var/lib/machines/testsuite-13.sanity.XXX)"
+    root="$(mktemp -u -d /var/lib/machines/TEST-13-NSPAWN.sanity.XXX)"
     coverage_create_nspawn_dropin "$root"
     (! systemd-nspawn --directory="$root" bash -xec 'echo hello')
     # Initialize $root from $template (the $root directory must not exist, hence
@@ -342,7 +342,7 @@ testcase_nspawn_settings() {
     local root container dev private_users wlan_names
 
     mkdir -p /run/systemd/nspawn
-    root="$(mktemp -d /var/lib/machines/testsuite-13.nspawn-settings.XXX)"
+    root="$(mktemp -d /var/lib/machines/TEST-13-NSPAWN.nspawn-settings.XXX)"
     container="$(basename "$root")"
     create_dummy_container "$root"
     rm -f "/etc/systemd/nspawn/$container.nspawn"
@@ -505,7 +505,7 @@ bind_user_cleanup() {
 testcase_bind_user() {
     local root
 
-    root="$(mktemp -d /var/lib/machines/testsuite-13.bind-user.XXX)"
+    root="$(mktemp -d /var/lib/machines/TEST-13-NSPAWN.bind-user.XXX)"
     create_dummy_container "$root"
     useradd --create-home --user-group nspawn-bind-user-1
     useradd --create-home --user-group nspawn-bind-user-2
@@ -554,7 +554,7 @@ testcase_bind_tmp_path() {
     # https://github.com/systemd/systemd/issues/4789
     local root
 
-    root="$(mktemp -d /var/lib/machines/testsuite-13.bind-tmp-path.XXX)"
+    root="$(mktemp -d /var/lib/machines/TEST-13-NSPAWN.bind-tmp-path.XXX)"
     create_dummy_container "$root"
     : >/tmp/bind
     systemd-nspawn --register=no \
@@ -569,7 +569,7 @@ testcase_norbind() {
     # https://github.com/systemd/systemd/issues/13170
     local root
 
-    root="$(mktemp -d /var/lib/machines/testsuite-13.norbind-path.XXX)"
+    root="$(mktemp -d /var/lib/machines/TEST-13-NSPAWN.norbind-path.XXX)"
     mkdir -p /tmp/binddir/subdir
     echo -n "outer" >/tmp/binddir/subdir/file
     mount -t tmpfs tmpfs /tmp/binddir/subdir
@@ -596,7 +596,7 @@ testcase_rootidmap() {
     local root cmd permissions
     local owner=1000
 
-    root="$(mktemp -d /var/lib/machines/testsuite-13.rootidmap-path.XXX)"
+    root="$(mktemp -d /var/lib/machines/TEST-13-NSPAWN.rootidmap-path.XXX)"
     # Create ext4 image, as ext4 supports idmapped-mounts.
     mkdir -p /tmp/rootidmap/bind
     dd if=/dev/zero of=/tmp/rootidmap/ext4.img bs=4k count=2048
@@ -640,7 +640,7 @@ testcase_owneridmap() {
     local root cmd permissions
     local owner=1000
 
-    root="$(mktemp -d /var/lib/machines/testsuite-13.owneridmap-path.XXX)"
+    root="$(mktemp -d /var/lib/machines/TEST-13-NSPAWN.owneridmap-path.XXX)"
     # Create ext4 image, as ext4 supports idmapped-mounts.
     mkdir -p /tmp/owneridmap/bind
     dd if=/dev/zero of=/tmp/owneridmap/ext4.img bs=4k count=2048
@@ -704,7 +704,7 @@ testcase_notification_socket() {
     local root
     local cmd='echo a | nc -U -u -w 1 /run/host/notify'
 
-    root="$(mktemp -d /var/lib/machines/testsuite-13.check_notification_socket.XXX)"
+    root="$(mktemp -d /var/lib/machines/TEST-13-NSPAWN.check_notification_socket.XXX)"
     create_dummy_container "$root"
 
     systemd-nspawn --register=no --directory="$root" bash -x -c "$cmd"
@@ -716,7 +716,7 @@ testcase_notification_socket() {
 testcase_os_release() {
     local root entrypoint os_release_source
 
-    root="$(mktemp -d /var/lib/machines/testsuite-13.os-release.XXX)"
+    root="$(mktemp -d /var/lib/machines/TEST-13-NSPAWN.os-release.XXX)"
     create_dummy_container "$root"
     entrypoint="$root/entrypoint.sh"
     cat >"$entrypoint" <<\EOF
@@ -758,7 +758,7 @@ testcase_machinectl_bind() {
     local service_path service_name root container_name ec
     local cmd='for i in $(seq 1 20); do if test -f /tmp/marker; then exit 0; fi; sleep .5; done; exit 1;'
 
-    root="$(mktemp -d /var/lib/machines/testsuite-13.machinectl-bind.XXX)"
+    root="$(mktemp -d /var/lib/machines/TEST-13-NSPAWN.machinectl-bind.XXX)"
     create_dummy_container "$root"
     container_name="$(basename "$root")"
 
@@ -793,7 +793,7 @@ testcase_selinux() {
 
     local root
 
-    root="$(mktemp -d /var/lib/machines/testsuite-13.selinux.XXX)"
+    root="$(mktemp -d /var/lib/machines/TEST-13-NSPAWN.selinux.XXX)"
     create_dummy_container "$root"
     chcon -R -t container_t "$root"
 
@@ -810,7 +810,7 @@ testcase_ephemeral_config() {
     # https://github.com/systemd/systemd/issues/13297
     local root container_name
 
-    root="$(mktemp -d /var/lib/machines/testsuite-13.ephemeral-config.XXX)"
+    root="$(mktemp -d /var/lib/machines/TEST-13-NSPAWN.ephemeral-config.XXX)"
     create_dummy_container "$root"
     container_name="$(basename "$root")"
 
@@ -853,7 +853,7 @@ matrix_run_one() {
         return 0
     fi
 
-    root="$(mktemp -d "/var/lib/machines/testsuite-13.unified-$1-cgns-$2-api-vfs-writable-$3.XXX")"
+    root="$(mktemp -d "/var/lib/machines/TEST-13-NSPAWN.unified-$1-cgns-$2-api-vfs-writable-$3.XXX")"
     create_dummy_container "$root"
 
     SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$cgroupsv2" SYSTEMD_NSPAWN_USE_CGNS="$use_cgns" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$api_vfs_writable" \
@@ -941,8 +941,8 @@ testcase_check_os_release() {
     # https://github.com/systemd/systemd/issues/29185
     local base common_opts root
 
-    base="$(mktemp -d /var/lib/machines/testsuite-13.check_os_release_base.XXX)"
-    root="$(mktemp -d /var/lib/machines/testsuite-13.check_os_release.XXX)"
+    base="$(mktemp -d /var/lib/machines/TEST-13-NSPAWN.check_os_release_base.XXX)"
+    root="$(mktemp -d /var/lib/machines/TEST-13-NSPAWN.check_os_release.XXX)"
     create_dummy_container "$base"
     cp -d "$base"/{bin,sbin,lib,lib64} "$root/"
     common_opts=(
diff --git a/test/units/testsuite-13.nss-mymachines.sh b/test/units/TEST-13-NSPAWN.nss-mymachines.sh
similarity index 100%
rename from test/units/testsuite-13.nss-mymachines.sh
rename to test/units/TEST-13-NSPAWN.nss-mymachines.sh
diff --git a/test/units/testsuite-13.service b/test/units/TEST-13-NSPAWN.service
similarity index 100%
rename from test/units/testsuite-13.service
rename to test/units/TEST-13-NSPAWN.service
diff --git a/test/units/testsuite-13.sh b/test/units/TEST-13-NSPAWN.sh
similarity index 100%
rename from test/units/testsuite-13.sh
rename to test/units/TEST-13-NSPAWN.sh
diff --git a/test/units/testsuite-15.service b/test/units/TEST-15-DROPIN.service
similarity index 100%
rename from test/units/testsuite-15.service
rename to test/units/TEST-15-DROPIN.service
diff --git a/test/units/testsuite-15.sh b/test/units/TEST-15-DROPIN.sh
similarity index 98%
rename from test/units/testsuite-15.sh
rename to test/units/TEST-15-DROPIN.sh
index 7143a1597a3..f5bd8d8af4a 100755
--- a/test/units/testsuite-15.sh
+++ b/test/units/TEST-15-DROPIN.sh
@@ -694,15 +694,15 @@ testcase_symlink_dropin_directory() {
     echo "Testing symlink drop-in directory..."
     create_services test15-a
     rmdir /{etc,run,usr/lib}/systemd/system/test15-a.service.d
-    mkdir -p /tmp/testsuite-15-test15-a-dropin-directory
-    ln -s /tmp/testsuite-15-test15-a-dropin-directory /etc/systemd/system/test15-a.service.d
-    cat >/tmp/testsuite-15-test15-a-dropin-directory/override.conf <<EOF
+    mkdir -p /tmp/TEST-15-DROPIN-test15-a-dropin-directory
+    ln -s /tmp/TEST-15-DROPIN-test15-a-dropin-directory /etc/systemd/system/test15-a.service.d
+    cat >/tmp/TEST-15-DROPIN-test15-a-dropin-directory/override.conf <<EOF
 [Unit]
 Description=hogehoge
 EOF
-    ln -s /tmp/testsuite-15-test15-a-dropin-directory-nonexistent /run/systemd/system/test15-a.service.d
-    touch /tmp/testsuite-15-test15-a-dropin-directory-regular
-    ln -s /tmp/testsuite-15-test15-a-dropin-directory-regular /usr/lib/systemd/system/test15-a.service.d
+    ln -s /tmp/TEST-15-DROPIN-test15-a-dropin-directory-nonexistent /run/systemd/system/test15-a.service.d
+    touch /tmp/TEST-15-DROPIN-test15-a-dropin-directory-regular
+    ln -s /tmp/TEST-15-DROPIN-test15-a-dropin-directory-regular /usr/lib/systemd/system/test15-a.service.d
     check_ok test15-a Description hogehoge
 
     clear_units test15-a.service
diff --git a/test/units/testsuite-16.service b/test/units/TEST-16-EXTEND-TIMEOUT.service
similarity index 100%
rename from test/units/testsuite-16.service
rename to test/units/TEST-16-EXTEND-TIMEOUT.service
diff --git a/test/units/testsuite-16.sh b/test/units/TEST-16-EXTEND-TIMEOUT.sh
similarity index 100%
rename from test/units/testsuite-16.sh
rename to test/units/TEST-16-EXTEND-TIMEOUT.sh
diff --git a/test/units/testsuite-17.00.sh b/test/units/TEST-17-UDEV.00.sh
similarity index 100%
rename from test/units/testsuite-17.00.sh
rename to test/units/TEST-17-UDEV.00.sh
diff --git a/test/units/testsuite-17.01.sh b/test/units/TEST-17-UDEV.01.sh
similarity index 100%
rename from test/units/testsuite-17.01.sh
rename to test/units/TEST-17-UDEV.01.sh
diff --git a/test/units/testsuite-17.02.sh b/test/units/TEST-17-UDEV.02.sh
similarity index 100%
rename from test/units/testsuite-17.02.sh
rename to test/units/TEST-17-UDEV.02.sh
diff --git a/test/units/testsuite-17.03.sh b/test/units/TEST-17-UDEV.03.sh
similarity index 100%
rename from test/units/testsuite-17.03.sh
rename to test/units/TEST-17-UDEV.03.sh
diff --git a/test/units/testsuite-17.04.sh b/test/units/TEST-17-UDEV.04.sh
similarity index 100%
rename from test/units/testsuite-17.04.sh
rename to test/units/TEST-17-UDEV.04.sh
diff --git a/test/units/testsuite-17.05.sh b/test/units/TEST-17-UDEV.05.sh
similarity index 100%
rename from test/units/testsuite-17.05.sh
rename to test/units/TEST-17-UDEV.05.sh
diff --git a/test/units/testsuite-17.06.sh b/test/units/TEST-17-UDEV.06.sh
similarity index 100%
rename from test/units/testsuite-17.06.sh
rename to test/units/TEST-17-UDEV.06.sh
diff --git a/test/units/testsuite-17.07.sh b/test/units/TEST-17-UDEV.07.sh
similarity index 100%
rename from test/units/testsuite-17.07.sh
rename to test/units/TEST-17-UDEV.07.sh
diff --git a/test/units/testsuite-17.08.sh b/test/units/TEST-17-UDEV.08.sh
similarity index 100%
rename from test/units/testsuite-17.08.sh
rename to test/units/TEST-17-UDEV.08.sh
diff --git a/test/units/testsuite-17.09.sh b/test/units/TEST-17-UDEV.09.sh
similarity index 100%
rename from test/units/testsuite-17.09.sh
rename to test/units/TEST-17-UDEV.09.sh
diff --git a/test/units/testsuite-17.10.sh b/test/units/TEST-17-UDEV.10.sh
similarity index 100%
rename from test/units/testsuite-17.10.sh
rename to test/units/TEST-17-UDEV.10.sh
diff --git a/test/units/testsuite-17.11.sh b/test/units/TEST-17-UDEV.11.sh
similarity index 100%
rename from test/units/testsuite-17.11.sh
rename to test/units/TEST-17-UDEV.11.sh
diff --git a/test/units/testsuite-17.12.sh b/test/units/TEST-17-UDEV.12.sh
similarity index 100%
rename from test/units/testsuite-17.12.sh
rename to test/units/TEST-17-UDEV.12.sh
diff --git a/test/units/testsuite-17.13.sh b/test/units/TEST-17-UDEV.13.sh
similarity index 100%
rename from test/units/testsuite-17.13.sh
rename to test/units/TEST-17-UDEV.13.sh
diff --git a/test/units/testsuite-17.credentials.sh b/test/units/TEST-17-UDEV.credentials.sh
similarity index 100%
rename from test/units/testsuite-17.credentials.sh
rename to test/units/TEST-17-UDEV.credentials.sh
diff --git a/test/units/testsuite-17.link-property.sh b/test/units/TEST-17-UDEV.link-property.sh
similarity index 100%
rename from test/units/testsuite-17.link-property.sh
rename to test/units/TEST-17-UDEV.link-property.sh
diff --git a/test/units/testsuite-17.service b/test/units/TEST-17-UDEV.service
similarity index 100%
rename from test/units/testsuite-17.service
rename to test/units/TEST-17-UDEV.service
diff --git a/test/units/testsuite-17.sh b/test/units/TEST-17-UDEV.sh
similarity index 100%
rename from test/units/testsuite-17.sh
rename to test/units/TEST-17-UDEV.sh
diff --git a/test/units/testsuite-18.service b/test/units/TEST-18-FAILUREACTION.service
similarity index 100%
rename from test/units/testsuite-18.service
rename to test/units/TEST-18-FAILUREACTION.service
diff --git a/test/units/testsuite-18.sh b/test/units/TEST-18-FAILUREACTION.sh
similarity index 100%
rename from test/units/testsuite-18.sh
rename to test/units/TEST-18-FAILUREACTION.sh
diff --git a/test/units/testsuite-19.ExitType-cgroup.sh b/test/units/TEST-19-CGROUP.ExitType-cgroup.sh
similarity index 100%
rename from test/units/testsuite-19.ExitType-cgroup.sh
rename to test/units/TEST-19-CGROUP.ExitType-cgroup.sh
diff --git a/test/units/testsuite-19.cleanup-slice.sh b/test/units/TEST-19-CGROUP.cleanup-slice.sh
similarity index 100%
rename from test/units/testsuite-19.cleanup-slice.sh
rename to test/units/TEST-19-CGROUP.cleanup-slice.sh
diff --git a/test/units/testsuite-19.delegate.sh b/test/units/TEST-19-CGROUP.delegate.sh
similarity index 100%
rename from test/units/testsuite-19.delegate.sh
rename to test/units/TEST-19-CGROUP.delegate.sh
diff --git a/test/units/testsuite-05.service b/test/units/TEST-19-CGROUP.service
similarity index 85%
rename from test/units/testsuite-05.service
rename to test/units/TEST-19-CGROUP.service
index cf32accb8c5..2094a126e17 100644
--- a/test/units/testsuite-05.service
+++ b/test/units/TEST-19-CGROUP.service
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
-Description=TEST-05-LIMITS
+Description=TEST-19-CGROUP
 
 [Service]
 ExecStartPre=rm -f /failed /testok
diff --git a/test/units/testsuite-19.sh b/test/units/TEST-19-CGROUP.sh
similarity index 100%
rename from test/units/testsuite-19.sh
rename to test/units/TEST-19-CGROUP.sh
diff --git a/test/units/testsuite-21.service b/test/units/TEST-21-DFUZZERE.service
similarity index 100%
rename from test/units/testsuite-21.service
rename to test/units/TEST-21-DFUZZERE.service
diff --git a/test/units/testsuite-21.sh b/test/units/TEST-21-DFUZZERE.sh
similarity index 100%
rename from test/units/testsuite-21.sh
rename to test/units/TEST-21-DFUZZERE.sh
diff --git a/test/units/testsuite-22.01.sh b/test/units/TEST-22-TMPFILES.01.sh
similarity index 100%
rename from test/units/testsuite-22.01.sh
rename to test/units/TEST-22-TMPFILES.01.sh
diff --git a/test/units/testsuite-22.02.sh b/test/units/TEST-22-TMPFILES.02.sh
similarity index 100%
rename from test/units/testsuite-22.02.sh
rename to test/units/TEST-22-TMPFILES.02.sh
diff --git a/test/units/testsuite-22.03.sh b/test/units/TEST-22-TMPFILES.03.sh
similarity index 100%
rename from test/units/testsuite-22.03.sh
rename to test/units/TEST-22-TMPFILES.03.sh
diff --git a/test/units/testsuite-22.04.sh b/test/units/TEST-22-TMPFILES.04.sh
similarity index 100%
rename from test/units/testsuite-22.04.sh
rename to test/units/TEST-22-TMPFILES.04.sh
diff --git a/test/units/testsuite-22.05.sh b/test/units/TEST-22-TMPFILES.05.sh
similarity index 100%
rename from test/units/testsuite-22.05.sh
rename to test/units/TEST-22-TMPFILES.05.sh
diff --git a/test/units/testsuite-22.06.sh b/test/units/TEST-22-TMPFILES.06.sh
similarity index 100%
rename from test/units/testsuite-22.06.sh
rename to test/units/TEST-22-TMPFILES.06.sh
diff --git a/test/units/testsuite-22.07.sh b/test/units/TEST-22-TMPFILES.07.sh
similarity index 100%
rename from test/units/testsuite-22.07.sh
rename to test/units/TEST-22-TMPFILES.07.sh
diff --git a/test/units/testsuite-22.08.sh b/test/units/TEST-22-TMPFILES.08.sh
similarity index 100%
rename from test/units/testsuite-22.08.sh
rename to test/units/TEST-22-TMPFILES.08.sh
diff --git a/test/units/testsuite-22.09.sh b/test/units/TEST-22-TMPFILES.09.sh
similarity index 100%
rename from test/units/testsuite-22.09.sh
rename to test/units/TEST-22-TMPFILES.09.sh
diff --git a/test/units/testsuite-22.10.sh b/test/units/TEST-22-TMPFILES.10.sh
similarity index 100%
rename from test/units/testsuite-22.10.sh
rename to test/units/TEST-22-TMPFILES.10.sh
diff --git a/test/units/testsuite-22.11.sh b/test/units/TEST-22-TMPFILES.11.sh
similarity index 100%
rename from test/units/testsuite-22.11.sh
rename to test/units/TEST-22-TMPFILES.11.sh
diff --git a/test/units/testsuite-22.12.sh b/test/units/TEST-22-TMPFILES.12.sh
similarity index 100%
rename from test/units/testsuite-22.12.sh
rename to test/units/TEST-22-TMPFILES.12.sh
diff --git a/test/units/testsuite-22.13.sh b/test/units/TEST-22-TMPFILES.13.sh
similarity index 100%
rename from test/units/testsuite-22.13.sh
rename to test/units/TEST-22-TMPFILES.13.sh
diff --git a/test/units/testsuite-22.14.sh b/test/units/TEST-22-TMPFILES.14.sh
similarity index 100%
rename from test/units/testsuite-22.14.sh
rename to test/units/TEST-22-TMPFILES.14.sh
diff --git a/test/units/testsuite-22.15.sh b/test/units/TEST-22-TMPFILES.15.sh
similarity index 100%
rename from test/units/testsuite-22.15.sh
rename to test/units/TEST-22-TMPFILES.15.sh
diff --git a/test/units/testsuite-22.16.sh b/test/units/TEST-22-TMPFILES.16.sh
similarity index 100%
rename from test/units/testsuite-22.16.sh
rename to test/units/TEST-22-TMPFILES.16.sh
diff --git a/test/units/testsuite-22.17.sh b/test/units/TEST-22-TMPFILES.17.sh
similarity index 100%
rename from test/units/testsuite-22.17.sh
rename to test/units/TEST-22-TMPFILES.17.sh
diff --git a/test/units/testsuite-22.18.sh b/test/units/TEST-22-TMPFILES.18.sh
similarity index 100%
rename from test/units/testsuite-22.18.sh
rename to test/units/TEST-22-TMPFILES.18.sh
diff --git a/test/units/testsuite-22.19.sh b/test/units/TEST-22-TMPFILES.19.sh
similarity index 100%
rename from test/units/testsuite-22.19.sh
rename to test/units/TEST-22-TMPFILES.19.sh
diff --git a/test/units/testsuite-22.service b/test/units/TEST-22-TMPFILES.service
similarity index 100%
rename from test/units/testsuite-22.service
rename to test/units/TEST-22-TMPFILES.service
diff --git a/test/units/testsuite-22.sh b/test/units/TEST-22-TMPFILES.sh
similarity index 100%
rename from test/units/testsuite-22.sh
rename to test/units/TEST-22-TMPFILES.sh
diff --git a/test/units/testsuite-23-openfile-child.sh b/test/units/TEST-23-UNIT-FILE-openfile-child.sh
similarity index 100%
rename from test/units/testsuite-23-openfile-child.sh
rename to test/units/TEST-23-UNIT-FILE-openfile-child.sh
diff --git a/test/units/TEST-23-UNIT-FILE-short-lived.sh b/test/units/TEST-23-UNIT-FILE-short-lived.sh
new file mode 100755
index 00000000000..4b13070734e
--- /dev/null
+++ b/test/units/TEST-23-UNIT-FILE-short-lived.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: LGPL-2.1-or-later
+set -ex
+
+if [ -f /tmp/TEST-23-UNIT-FILE.counter ] ; then
+    read -r counter < /tmp/TEST-23-UNIT-FILE.counter
+    counter=$((counter + 1))
+else
+    counter=0
+fi
+
+echo "$counter" >/tmp/TEST-23-UNIT-FILE.counter
+
+if [ "$counter" -eq 5 ] ; then
+    systemctl kill --kill-whom=main -sUSR1 TEST-23-UNIT-FILE.service
+fi
+
+exec sleep 1.5
diff --git a/test/units/testsuite-23.ExecReload.sh b/test/units/TEST-23-UNIT-FILE.ExecReload.sh
similarity index 100%
rename from test/units/testsuite-23.ExecReload.sh
rename to test/units/TEST-23-UNIT-FILE.ExecReload.sh
diff --git a/test/units/testsuite-23.ExecStopPost.sh b/test/units/TEST-23-UNIT-FILE.ExecStopPost.sh
similarity index 100%
rename from test/units/testsuite-23.ExecStopPost.sh
rename to test/units/TEST-23-UNIT-FILE.ExecStopPost.sh
diff --git a/test/units/TEST-23-UNIT-FILE.JoinsNamespaceOf.sh b/test/units/TEST-23-UNIT-FILE.JoinsNamespaceOf.sh
new file mode 100755
index 00000000000..4fd68d8b848
--- /dev/null
+++ b/test/units/TEST-23-UNIT-FILE.JoinsNamespaceOf.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+set -eux
+set -o pipefail
+
+# Test JoinsNamespaceOf= with PrivateTmp=yes
+
+systemd-analyze log-level debug
+systemd-analyze log-target journal
+
+# simple case
+systemctl start TEST-23-UNIT-FILE-joins-namespace-of-1.service
+systemctl start TEST-23-UNIT-FILE-joins-namespace-of-2.service
+systemctl start TEST-23-UNIT-FILE-joins-namespace-of-3.service
+systemctl stop TEST-23-UNIT-FILE-joins-namespace-of-1.service
+
+# inverse dependency
+systemctl start TEST-23-UNIT-FILE-joins-namespace-of-4.service
+systemctl start TEST-23-UNIT-FILE-joins-namespace-of-5.service
+systemctl stop TEST-23-UNIT-FILE-joins-namespace-of-4.service
+
+# transitive dependency
+systemctl start TEST-23-UNIT-FILE-joins-namespace-of-6.service
+systemctl start TEST-23-UNIT-FILE-joins-namespace-of-7.service
+systemctl start TEST-23-UNIT-FILE-joins-namespace-of-8.service
+systemctl start TEST-23-UNIT-FILE-joins-namespace-of-9.service
+systemctl stop TEST-23-UNIT-FILE-joins-namespace-of-6.service
+systemctl stop TEST-23-UNIT-FILE-joins-namespace-of-8.service
+
+systemd-analyze log-level info
diff --git a/test/units/testsuite-23.RuntimeDirectoryPreserve.sh b/test/units/TEST-23-UNIT-FILE.RuntimeDirectoryPreserve.sh
similarity index 100%
rename from test/units/testsuite-23.RuntimeDirectoryPreserve.sh
rename to test/units/TEST-23-UNIT-FILE.RuntimeDirectoryPreserve.sh
diff --git a/test/units/testsuite-23.StandardOutput.sh b/test/units/TEST-23-UNIT-FILE.StandardOutput.sh
similarity index 80%
rename from test/units/testsuite-23.StandardOutput.sh
rename to test/units/TEST-23-UNIT-FILE.StandardOutput.sh
index 50b9ac2a2b9..a951b13b465 100755
--- a/test/units/testsuite-23.StandardOutput.sh
+++ b/test/units/TEST-23-UNIT-FILE.StandardOutput.sh
@@ -7,7 +7,7 @@ set -o pipefail
 
 systemd-analyze log-level debug
 
-systemd-run --wait --unit=testsuite-23-standard-output-one \
+systemd-run --wait --unit=TEST-23-UNIT-FILE-standard-output-one \
             -p StandardOutput=file:/tmp/stdout \
             -p StandardError=file:/tmp/stderr \
             -p Type=exec \
@@ -19,7 +19,7 @@ cmp /tmp/stderr <<EOF
 y
 EOF
 
-systemd-run --wait --unit=testsuite-23-standard-output-two \
+systemd-run --wait --unit=TEST-23-UNIT-FILE-standard-output-two \
             -p StandardOutput=file:/tmp/stdout \
             -p StandardError=file:/tmp/stderr \
             -p Type=exec \
@@ -31,7 +31,7 @@ cmp /tmp/stderr <<EOF
 a
 EOF
 
-systemd-run --wait --unit=testsuite-23-standard-output-three \
+systemd-run --wait --unit=TEST-23-UNIT-FILE-standard-output-three \
             -p StandardOutput=append:/tmp/stdout \
             -p StandardError=append:/tmp/stderr \
             -p Type=exec \
@@ -45,7 +45,7 @@ a
 c
 EOF
 
-systemd-run --wait --unit=testsuite-23-standard-output-four \
+systemd-run --wait --unit=TEST-23-UNIT-FILE-standard-output-four \
             -p StandardOutput=truncate:/tmp/stdout \
             -p StandardError=truncate:/tmp/stderr \
             -p Type=exec \
diff --git a/test/units/TEST-23-UNIT-FILE.Upholds.sh b/test/units/TEST-23-UNIT-FILE.Upholds.sh
new file mode 100755
index 00000000000..20d2d2b1733
--- /dev/null
+++ b/test/units/TEST-23-UNIT-FILE.Upholds.sh
@@ -0,0 +1,99 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+set -eux
+set -o pipefail
+
+# Test OnSuccess= + Uphold= + PropagatesStopTo= + BindsTo=
+
+systemd-analyze log-level debug
+systemd-analyze log-target journal
+
+# Idea is this:
+#    1. we start TEST-23-UNIT-FILE-success.service
+#    2. which through OnSuccess= starts TEST-23-UNIT-FILE-fail.service,
+#    3. which through OnFailure= starts TEST-23-UNIT-FILE-uphold.service,
+#    4. which through Uphold= starts/keeps TEST-23-UNIT-FILE-short-lived.service running,
+#    5. which will sleep 1s when invoked, and on the 5th invocation send us a SIGUSR1
+#    6. once we got that we finish cleanly
+
+sigusr1=0
+trap sigusr1=1 SIGUSR1
+
+trap -p SIGUSR1
+
+systemctl start TEST-23-UNIT-FILE-success.service
+
+while [ "$sigusr1" -eq 0 ] ; do
+    sleep .5
+done
+
+systemctl stop TEST-23-UNIT-FILE-uphold.service
+
+systemctl enable TEST-23-UNIT-FILE-upheldby-install.service
+
+# Idea is this:
+#    1. we start TEST-23-UNIT-FILE-retry-uphold.service
+#    2. which through Uphold= starts TEST-23-UNIT-FILE-retry-upheld.service
+#    3. which through Requires= starts TEST-23-UNIT-FILE-retry-fail.service
+#    4. which fails as /tmp/TEST-23-UNIT-FILE-retry-fail does not exist, so TEST-23-UNIT-FILE-retry-upheld.service
+#       is no longer restarted
+#    5. we create /tmp/TEST-23-UNIT-FILE-retry-fail
+#    6. now TEST-23-UNIT-FILE-retry-upheld.service will be restarted since upheld, and its dependency will
+#       be satisfied
+
+rm -f /tmp/TEST-23-UNIT-FILE-retry-fail
+systemctl start TEST-23-UNIT-FILE-retry-uphold.service
+systemctl is-active TEST-23-UNIT-FILE-upheldby-install.service
+
+until systemctl is-failed TEST-23-UNIT-FILE-retry-fail.service ; do
+    sleep .5
+done
+
+(! systemctl is-active TEST-23-UNIT-FILE-retry-upheld.service)
+
+touch /tmp/TEST-23-UNIT-FILE-retry-fail
+
+until systemctl is-active TEST-23-UNIT-FILE-retry-upheld.service ; do
+    sleep .5
+done
+
+systemctl stop TEST-23-UNIT-FILE-retry-uphold.service TEST-23-UNIT-FILE-retry-fail.service TEST-23-UNIT-FILE-retry-upheld.service
+
+# Idea is this:
+#    1. we start TEST-23-UNIT-FILE-prop-stop-one.service
+#    2. which through Wants=/After= pulls in TEST-23-UNIT-FILE-prop-stop-two.service as well
+#    3. TEST-23-UNIT-FILE-prop-stop-one.service then sleeps indefinitely
+#    4. TEST-23-UNIT-FILE-prop-stop-two.service sleeps a short time and exits
+#    5. the StopPropagatedFrom= dependency between the two should ensure *both* will exit as result
+#    6. an ExecStopPost= line on TEST-23-UNIT-FILE-prop-stop-one.service will send us a SIGUSR2
+#    7. once we got that we finish cleanly
+
+sigusr2=0
+trap sigusr2=1 SIGUSR2
+
+systemctl start TEST-23-UNIT-FILE-prop-stop-one.service
+
+while [ "$sigusr2" -eq 0 ] ; do
+    sleep .5
+done
+
+
+# Idea is this:
+#    1. we start TEST-23-UNIT-FILE-binds-to.service
+#    2. which through BindsTo=/After= pulls in TEST-23-UNIT-FILE-bound-by.service as well
+#    3. TEST-23-UNIT-FILE-bound-by.service suddenly dies
+#    4. TEST-23-UNIT-FILE-binds-to.service should then also be pulled down (it otherwise just hangs)
+#    6. an ExecStopPost= line on TEST-23-UNIT-FILE-binds-to.service will send us a SIGRTMIN1+1
+#    7. once we got that we finish cleanly
+
+sigrtmin1=0
+trap sigrtmin1=1 SIGRTMIN+1
+
+systemctl start TEST-23-UNIT-FILE-binds-to.service
+
+while [ "$sigrtmin1" -eq 0 ] ; do
+    sleep .5
+done
+
+systemd-analyze log-level info
diff --git a/test/units/testsuite-23.clean-unit.sh b/test/units/TEST-23-UNIT-FILE.clean-unit.sh
similarity index 100%
rename from test/units/testsuite-23.clean-unit.sh
rename to test/units/TEST-23-UNIT-FILE.clean-unit.sh
diff --git a/test/units/testsuite-23.exec-command-ex.sh b/test/units/TEST-23-UNIT-FILE.exec-command-ex.sh
similarity index 100%
rename from test/units/testsuite-23.exec-command-ex.sh
rename to test/units/TEST-23-UNIT-FILE.exec-command-ex.sh
diff --git a/test/units/testsuite-23.oneshot-restart.sh b/test/units/TEST-23-UNIT-FILE.oneshot-restart.sh
similarity index 90%
rename from test/units/testsuite-23.oneshot-restart.sh
rename to test/units/TEST-23-UNIT-FILE.oneshot-restart.sh
index bb4d664945e..d06dbaae8cf 100755
--- a/test/units/testsuite-23.oneshot-restart.sh
+++ b/test/units/TEST-23-UNIT-FILE.oneshot-restart.sh
@@ -56,8 +56,8 @@ rm "$TMP_FILE"
 # Test RestartForceExitStatus=. Note that success exit statuses are meant to be skipped
 
 TMP_FILE="/tmp/test-23-oneshot-restart-test$RANDOM"
-UNIT_NAME="testsuite-23-oneshot-restartforce.service"
-ONSUCCESS_UNIT_NAME="testsuite-23-oneshot-restartforce-onsuccess.service"
+UNIT_NAME="TEST-23-UNIT-FILE-oneshot-restartforce.service"
+ONSUCCESS_UNIT_NAME="TEST-23-UNIT-FILE-oneshot-restartforce-onsuccess.service"
 FIFO_FILE="/tmp/test-23-oneshot-restart-test-fifo"
 
 cat >"/run/systemd/system/$UNIT_NAME" <<EOF
@@ -67,7 +67,7 @@ OnSuccess=$ONSUCCESS_UNIT_NAME
 [Service]
 Type=oneshot
 RestartForceExitStatus=0 2
-ExecStart=/usr/lib/systemd/tests/testdata/testsuite-23.units/testsuite-23-oneshot-restartforce.sh "$TMP_FILE"
+ExecStart=/usr/lib/systemd/tests/testdata/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-oneshot-restartforce.sh "$TMP_FILE"
 
 [Install]
 WantedBy=multi-user.target
diff --git a/test/units/testsuite-23.openfile.sh b/test/units/TEST-23-UNIT-FILE.openfile.sh
similarity index 79%
rename from test/units/testsuite-23.openfile.sh
rename to test/units/TEST-23-UNIT-FILE.openfile.sh
index 61081617a14..644b6f458ed 100755
--- a/test/units/testsuite-23.openfile.sh
+++ b/test/units/TEST-23-UNIT-FILE.openfile.sh
@@ -28,7 +28,7 @@ systemd-run -p DynamicUser=yes -p EnvironmentFile=-/usr/lib/systemd/systemd-asan
             -p RemainAfterExit=yes \
             --unit=test-23-openfile-existing.service \
             --service-type=oneshot \
-            /usr/lib/systemd/tests/testdata/units/testsuite-23-openfile-child.sh 2 "open.txt:colon" "Open" "File"
+            /usr/lib/systemd/tests/testdata/units/TEST-23-UNIT-FILE-openfile-child.sh 2 "open.txt:colon" "Open" "File"
 
 cmp <(systemctl show -p OpenFile test-23-openfile-existing.service) <<EOF
 OpenFile=/tmp/test-open-file/open.txt::read-only
@@ -39,13 +39,13 @@ systemctl stop test-23-openfile-existing.service
 
 # Sockets
 
-systemctl start testsuite-23-openfile-server.socket
+systemctl start TEST-23-UNIT-FILE-openfile-server.socket
 
 systemd-run -p OpenFile=/tmp/test.sock:socket:read-only \
             --wait \
-            /usr/lib/systemd/tests/testdata/units/testsuite-23-openfile-child.sh 1 "socket" "Socket"
+            /usr/lib/systemd/tests/testdata/units/TEST-23-UNIT-FILE-openfile-child.sh 1 "socket" "Socket"
 
-systemctl stop testsuite-23-openfile-server.socket
+systemctl stop TEST-23-UNIT-FILE-openfile-server.socket
 
 # Ignore when missing
 
diff --git a/test/units/testsuite-23.percentj-wantedby.sh b/test/units/TEST-23-UNIT-FILE.percentj-wantedby.sh
similarity index 69%
rename from test/units/testsuite-23.percentj-wantedby.sh
rename to test/units/TEST-23-UNIT-FILE.percentj-wantedby.sh
index e9ffaba6824..c091bd64551 100755
--- a/test/units/testsuite-23.percentj-wantedby.sh
+++ b/test/units/TEST-23-UNIT-FILE.percentj-wantedby.sh
@@ -8,8 +8,8 @@ set -o pipefail
 # Ensure %j Wants directives work
 systemd-run --wait \
             --property="Type=oneshot" \
-            --property="Wants=testsuite-23-specifier-j-wants.service" \
-            --property="After=testsuite-23-specifier-j-wants.service" \
+            --property="Wants=TEST-23-UNIT-FILE-specifier-j-wants.service" \
+            --property="After=TEST-23-UNIT-FILE-specifier-j-wants.service" \
             true
 
 test -f /tmp/tetsuite-23-specifier-j-done
diff --git a/test/units/TEST-23-UNIT-FILE.runtime-bind-paths.sh b/test/units/TEST-23-UNIT-FILE.runtime-bind-paths.sh
new file mode 100755
index 00000000000..3a78234cdc7
--- /dev/null
+++ b/test/units/TEST-23-UNIT-FILE.runtime-bind-paths.sh
@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: LGPL-2.1-or-later
+# shellcheck disable=SC2016
+set -eux
+set -o pipefail
+
+# Test adding new BindPaths while unit is already running
+
+at_exit() {
+    set +e
+
+    rm -f /run/TEST-23-UNIT-FILE-marker-{fixed,runtime}
+    rm -fr /run/inaccessible
+}
+
+trap at_exit EXIT
+
+echo "MARKER_FIXED" >/run/TEST-23-UNIT-FILE-marker-fixed
+mkdir /run/inaccessible
+
+systemctl start TEST-23-UNIT-FILE-namespaced.service
+
+# Ensure that inaccessible paths aren't bypassed by the runtime setup,
+(! systemctl bind --mkdir TEST-23-UNIT-FILE-namespaced.service /run/TEST-23-UNIT-FILE-marker-fixed /run/inaccessible/testfile-marker-fixed)
+
+echo "MARKER_WRONG" >/run/TEST-23-UNIT-FILE-marker-wrong
+echo "MARKER_RUNTIME" >/run/TEST-23-UNIT-FILE-marker-runtime
+
+# Mount twice to exercise mount-beneath (on kernel 6.5+, on older kernels it will just overmount)
+systemctl bind --mkdir TEST-23-UNIT-FILE-namespaced.service /run/TEST-23-UNIT-FILE-marker-wrong /tmp/testfile-marker-runtime
+test "$(systemctl show -P SubState TEST-23-UNIT-FILE-namespaced.service)" = "running"
+systemctl bind --mkdir TEST-23-UNIT-FILE-namespaced.service /run/TEST-23-UNIT-FILE-marker-runtime /tmp/testfile-marker-runtime
+
+timeout 10 bash -xec 'while [[ "$(systemctl show -P SubState TEST-23-UNIT-FILE-namespaced.service)" == running ]]; do sleep .5; done'
+systemctl is-active TEST-23-UNIT-FILE-namespaced.service
+
+# Now test that systemctl bind fails when attempted on a non-namespaced unit
+systemctl start TEST-23-UNIT-FILE-non-namespaced.service
+
+(! systemctl bind --mkdir TEST-23-UNIT-FILE-non-namespaced.service /run/TEST-23-UNIT-FILE-marker-runtime /tmp/testfile-marker-runtime)
+
+timeout 10 bash -xec 'while [[ "$(systemctl show -P SubState TEST-23-UNIT-FILE-non-namespaced.service)" == running ]]; do sleep .5; done'
+(! systemctl is-active TEST-23-UNIT-FILE-non-namespaced.service)
diff --git a/test/units/testsuite-23.service b/test/units/TEST-23-UNIT-FILE.service
similarity index 84%
rename from test/units/testsuite-23.service
rename to test/units/TEST-23-UNIT-FILE.service
index 26f5226cd4d..e45435b84a5 100644
--- a/test/units/testsuite-23.service
+++ b/test/units/TEST-23-UNIT-FILE.service
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
-Description=TEST-23-TYPE-EXEC
+Description=TEST-23-UNIT-FILE
 
 [Service]
 ExecStartPre=rm -f /failed /testok
diff --git a/test/units/testsuite-23.sh b/test/units/TEST-23-UNIT-FILE.sh
similarity index 100%
rename from test/units/testsuite-23.sh
rename to test/units/TEST-23-UNIT-FILE.sh
diff --git a/test/units/TEST-23-UNIT-FILE.start-stop-no-reload.sh b/test/units/TEST-23-UNIT-FILE.start-stop-no-reload.sh
new file mode 100755
index 00000000000..61a6592cb6c
--- /dev/null
+++ b/test/units/TEST-23-UNIT-FILE.start-stop-no-reload.sh
@@ -0,0 +1,93 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: LGPL-2.1-or-later
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+set -eux
+set -o pipefail
+
+# Test start & stop operations without daemon-reload
+
+at_exit() {
+    set +e
+
+    rm -f /run/systemd/system/TEST-23-UNIT-FILE-no-reload.{service,target}
+}
+
+trap at_exit EXIT
+
+cat >/run/systemd/system/TEST-23-UNIT-FILE-no-reload.target <<EOF
+[Unit]
+Wants=TEST-23-UNIT-FILE-no-reload.service
+EOF
+
+systemctl daemon-reload
+
+systemctl start TEST-23-UNIT-FILE-no-reload.target
+
+# The filesystem on the test image, despite being ext4, seems to have a mtime
+# granularity of one second, which means the manager's unit cache won't be
+# marked as dirty when writing the unit file, unless we wait at least a full
+# second after the previous daemon-reload.
+# May 07 23:12:20 H TEST-23-UNIT-FILE.sh[30]: + cat
+# May 07 23:12:20 H TEST-23-UNIT-FILE.sh[30]: + ls -l --full-time /etc/systemd/system/TEST-23-UNIT-FILE-no-reload.service
+# May 07 23:12:20 H TEST-23-UNIT-FILE.sh[52]: -rw-r--r-- 1 root root 50 2020-05-07 23:12:20.000000000 +0100 /
+# May 07 23:12:20 H TEST-23-UNIT-FILE.sh[30]: + stat -f --format=%t /etc/systemd/system/TEST-23-UNIT-FILE-no-reload.servic
+# May 07 23:12:20 H TEST-23-UNIT-FILE.sh[53]: ef53
+sleep 3.1
+
+cat >/run/systemd/system/TEST-23-UNIT-FILE-no-reload.service <<EOF
+[Service]
+ExecStart=sleep infinity
+EOF
+
+systemctl start TEST-23-UNIT-FILE-no-reload.service
+
+systemctl is-active TEST-23-UNIT-FILE-no-reload.service
+
+# Stop and remove, and try again to exercise https://github.com/systemd/systemd/issues/15992
+systemctl stop TEST-23-UNIT-FILE-no-reload.service
+rm -f /run/systemd/system/TEST-23-UNIT-FILE-no-reload.service
+systemctl daemon-reload
+
+sleep 3.1
+
+cat >/run/systemd/system/TEST-23-UNIT-FILE-no-reload.service <<EOF
+[Service]
+ExecStart=sleep infinity
+EOF
+
+# Start a non-existing unit first, so that the cache is reloaded for an unrelated
+# reason. Starting the existing unit later should still work thanks to the check
+# for the last load attempt vs cache timestamp.
+systemctl start TEST-23-UNIT-FILE-no-reload-nonexistent.service || true
+
+systemctl start TEST-23-UNIT-FILE-no-reload.service
+
+systemctl is-active TEST-23-UNIT-FILE-no-reload.service
+
+# Stop and remove, and try again to exercise the transaction setup code path by
+# having the target pull in the unloaded but available unit
+systemctl stop TEST-23-UNIT-FILE-no-reload.service TEST-23-UNIT-FILE-no-reload.target
+rm -f /run/systemd/system/TEST-23-UNIT-FILE-no-reload.service /run/systemd/system/TEST-23-UNIT-FILE-no-reload.target
+systemctl daemon-reload
+
+sleep 3.1
+
+cat >/run/systemd/system/TEST-23-UNIT-FILE-no-reload.target <<EOF
+[Unit]
+Conflicts=shutdown.target
+Wants=TEST-23-UNIT-FILE-no-reload.service
+EOF
+
+systemctl daemon-reload
+
+systemctl start TEST-23-UNIT-FILE-no-reload.target
+
+cat >/run/systemd/system/TEST-23-UNIT-FILE-no-reload.service <<EOF
+[Service]
+ExecStart=sleep infinity
+EOF
+
+systemctl restart TEST-23-UNIT-FILE-no-reload.target
+
+systemctl is-active TEST-23-UNIT-FILE-no-reload.service
diff --git a/test/units/testsuite-23.statedir.sh b/test/units/TEST-23-UNIT-FILE.statedir.sh
similarity index 100%
rename from test/units/testsuite-23.statedir.sh
rename to test/units/TEST-23-UNIT-FILE.statedir.sh
diff --git a/test/units/testsuite-23.success-failure.sh b/test/units/TEST-23-UNIT-FILE.success-failure.sh
similarity index 100%
rename from test/units/testsuite-23.success-failure.sh
rename to test/units/TEST-23-UNIT-FILE.success-failure.sh
diff --git a/test/units/testsuite-23.type-exec.sh b/test/units/TEST-23-UNIT-FILE.type-exec.sh
similarity index 100%
rename from test/units/testsuite-23.type-exec.sh
rename to test/units/TEST-23-UNIT-FILE.type-exec.sh
diff --git a/test/units/testsuite-23.utmp.sh b/test/units/TEST-23-UNIT-FILE.utmp.sh
similarity index 100%
rename from test/units/testsuite-23.utmp.sh
rename to test/units/TEST-23-UNIT-FILE.utmp.sh
diff --git a/test/units/testsuite-23.verify-unit-files.sh b/test/units/TEST-23-UNIT-FILE.verify-unit-files.sh
similarity index 100%
rename from test/units/testsuite-23.verify-unit-files.sh
rename to test/units/TEST-23-UNIT-FILE.verify-unit-files.sh
diff --git a/test/units/testsuite-23.whoami.sh b/test/units/TEST-23-UNIT-FILE.whoami.sh
similarity index 66%
rename from test/units/testsuite-23.whoami.sh
rename to test/units/TEST-23-UNIT-FILE.whoami.sh
index a0c73b85647..b538d94ae1d 100755
--- a/test/units/testsuite-23.whoami.sh
+++ b/test/units/TEST-23-UNIT-FILE.whoami.sh
@@ -5,11 +5,11 @@
 set -eux
 set -o pipefail
 
-test "$(systemctl whoami)" = testsuite-23.service
-test "$(systemctl whoami $$)" = testsuite-23.service
+test "$(systemctl whoami)" = TEST-23-UNIT-FILE.service
+test "$(systemctl whoami $$)" = TEST-23-UNIT-FILE.service
 
 systemctl whoami 1 $$ 1 | cmp - /dev/fd/3 3<<'EOF'
 init.scope
-testsuite-23.service
+TEST-23-UNIT-FILE.service
 init.scope
 EOF
diff --git a/test/units/testsuite-24.service b/test/units/TEST-24-CRYPTSETUP.service
similarity index 100%
rename from test/units/testsuite-24.service
rename to test/units/TEST-24-CRYPTSETUP.service
diff --git a/test/units/testsuite-24.sh b/test/units/TEST-24-CRYPTSETUP.sh
similarity index 100%
rename from test/units/testsuite-24.sh
rename to test/units/TEST-24-CRYPTSETUP.sh
diff --git a/test/units/testsuite-25.service b/test/units/TEST-25-IMPORT.service
similarity index 100%
rename from test/units/testsuite-25.service
rename to test/units/TEST-25-IMPORT.service
diff --git a/test/units/testsuite-25.sh b/test/units/TEST-25-IMPORT.sh
similarity index 100%
rename from test/units/testsuite-25.sh
rename to test/units/TEST-25-IMPORT.sh
diff --git a/test/units/testsuite-26.service b/test/units/TEST-26-SYSTEMCTL.service
similarity index 100%
rename from test/units/testsuite-26.service
rename to test/units/TEST-26-SYSTEMCTL.service
diff --git a/test/units/testsuite-26.sh b/test/units/TEST-26-SYSTEMCTL.sh
similarity index 100%
rename from test/units/testsuite-26.sh
rename to test/units/TEST-26-SYSTEMCTL.sh
diff --git a/test/units/testsuite-29.service b/test/units/TEST-29-PORTABLE.service
similarity index 100%
rename from test/units/testsuite-29.service
rename to test/units/TEST-29-PORTABLE.service
diff --git a/test/units/testsuite-29.sh b/test/units/TEST-29-PORTABLE.sh
similarity index 100%
rename from test/units/testsuite-29.sh
rename to test/units/TEST-29-PORTABLE.sh
diff --git a/test/units/testsuite-30.service b/test/units/TEST-30-ONCLOCKCHANGE.service
similarity index 100%
rename from test/units/testsuite-30.service
rename to test/units/TEST-30-ONCLOCKCHANGE.service
diff --git a/test/units/testsuite-30.sh b/test/units/TEST-30-ONCLOCKCHANGE.sh
similarity index 100%
rename from test/units/testsuite-30.sh
rename to test/units/TEST-30-ONCLOCKCHANGE.sh
diff --git a/test/units/testsuite-31.service b/test/units/TEST-31-DEVICE-ENUMERATION.service
similarity index 100%
rename from test/units/testsuite-31.service
rename to test/units/TEST-31-DEVICE-ENUMERATION.service
diff --git a/test/units/testsuite-31.sh b/test/units/TEST-31-DEVICE-ENUMERATION.sh
similarity index 100%
rename from test/units/testsuite-31.sh
rename to test/units/TEST-31-DEVICE-ENUMERATION.sh
diff --git a/test/units/testsuite-32.service b/test/units/TEST-32-OOMPOLICY.service
similarity index 100%
rename from test/units/testsuite-32.service
rename to test/units/TEST-32-OOMPOLICY.service
diff --git a/test/units/testsuite-32.sh b/test/units/TEST-32-OOMPOLICY.sh
similarity index 92%
rename from test/units/testsuite-32.sh
rename to test/units/TEST-32-OOMPOLICY.sh
index 83b548a6021..046b8b95458 100755
--- a/test/units/testsuite-32.sh
+++ b/test/units/TEST-32-OOMPOLICY.sh
@@ -9,7 +9,7 @@ set -o pipefail
 # an easier thing to test for, and also: let's not get confused by older
 # kernels where the concept was still new.
 
-if test -f /sys/fs/cgroup/system.slice/testsuite-32.service/memory.oom.group; then
+if test -f /sys/fs/cgroup/system.slice/TEST-32-OOMPOLICY.service/memory.oom.group; then
     systemd-analyze log-level debug
 
     # Run a service that is guaranteed to be the first candidate for OOM killing
diff --git a/test/units/testsuite-34.service b/test/units/TEST-34-DYNAMICUSERMIGRATE.service
similarity index 100%
rename from test/units/testsuite-34.service
rename to test/units/TEST-34-DYNAMICUSERMIGRATE.service
diff --git a/test/units/testsuite-34.sh b/test/units/TEST-34-DYNAMICUSERMIGRATE.sh
similarity index 100%
rename from test/units/testsuite-34.sh
rename to test/units/TEST-34-DYNAMICUSERMIGRATE.sh
diff --git a/test/units/testsuite-35.service b/test/units/TEST-35-LOGIN.service
similarity index 100%
rename from test/units/testsuite-35.service
rename to test/units/TEST-35-LOGIN.service
diff --git a/test/units/testsuite-35.sh b/test/units/TEST-35-LOGIN.sh
similarity index 100%
rename from test/units/testsuite-35.sh
rename to test/units/TEST-35-LOGIN.sh
diff --git a/test/units/testsuite-36.service b/test/units/TEST-36-NUMAPOLICY.service
similarity index 100%
rename from test/units/testsuite-36.service
rename to test/units/TEST-36-NUMAPOLICY.service
diff --git a/test/units/testsuite-36.sh b/test/units/TEST-36-NUMAPOLICY.sh
similarity index 100%
rename from test/units/testsuite-36.sh
rename to test/units/TEST-36-NUMAPOLICY.sh
diff --git a/test/units/testsuite-38-sleep.service b/test/units/TEST-38-FREEZER-sleep.service
similarity index 100%
rename from test/units/testsuite-38-sleep.service
rename to test/units/TEST-38-FREEZER-sleep.service
diff --git a/test/units/testsuite-38.service b/test/units/TEST-38-FREEZER.service
similarity index 100%
rename from test/units/testsuite-38.service
rename to test/units/TEST-38-FREEZER.service
diff --git a/test/units/testsuite-38.sh b/test/units/TEST-38-FREEZER.sh
similarity index 99%
rename from test/units/testsuite-38.sh
rename to test/units/TEST-38-FREEZER.sh
index 1cb8915e195..07597843e25 100755
--- a/test/units/testsuite-38.sh
+++ b/test/units/TEST-38-FREEZER.sh
@@ -9,7 +9,7 @@ set -o pipefail
 
 systemd-analyze log-level debug
 
-unit=testsuite-38-sleep.service
+unit=TEST-38-FREEZER-sleep.service
 
 start_test_service() {
     systemctl daemon-reload
diff --git a/test/units/testsuite-43.service b/test/units/TEST-43-PRIVATEUSER-UNPRIV.service
similarity index 100%
rename from test/units/testsuite-43.service
rename to test/units/TEST-43-PRIVATEUSER-UNPRIV.service
diff --git a/test/units/testsuite-43.sh b/test/units/TEST-43-PRIVATEUSER-UNPRIV.sh
similarity index 100%
rename from test/units/testsuite-43.sh
rename to test/units/TEST-43-PRIVATEUSER-UNPRIV.sh
diff --git a/test/units/testsuite-44.service b/test/units/TEST-44-LOG-NAMESPACE.service
similarity index 90%
rename from test/units/testsuite-44.service
rename to test/units/TEST-44-LOG-NAMESPACE.service
index 4dffdeab94a..6189d3afa0b 100644
--- a/test/units/testsuite-44.service
+++ b/test/units/TEST-44-LOG-NAMESPACE.service
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
-Description=TESTSUITE-44-LOG-NAMESPACE
+Description=TEST-44-LOG-NAMESPACE
 Before=getty-pre.target
 Wants=getty-pre.target
 Wants=systemd-journald@foobar.socket systemd-journald-varlink@foobar.socket
diff --git a/test/units/testsuite-44.sh b/test/units/TEST-44-LOG-NAMESPACE.sh
similarity index 100%
rename from test/units/testsuite-44.sh
rename to test/units/TEST-44-LOG-NAMESPACE.sh
diff --git a/test/units/testsuite-45.service b/test/units/TEST-45-TIMEDATE.service
similarity index 100%
rename from test/units/testsuite-45.service
rename to test/units/TEST-45-TIMEDATE.service
diff --git a/test/units/testsuite-45.sh b/test/units/TEST-45-TIMEDATE.sh
similarity index 100%
rename from test/units/testsuite-45.sh
rename to test/units/TEST-45-TIMEDATE.sh
diff --git a/test/units/testsuite-46.service b/test/units/TEST-46-HOMED.service
similarity index 100%
rename from test/units/testsuite-46.service
rename to test/units/TEST-46-HOMED.service
diff --git a/test/units/testsuite-46.sh b/test/units/TEST-46-HOMED.sh
similarity index 100%
rename from test/units/testsuite-46.sh
rename to test/units/TEST-46-HOMED.sh
diff --git a/test/units/testsuite-50.DDI.sh b/test/units/TEST-50-DISSECT.DDI.sh
similarity index 100%
rename from test/units/testsuite-50.DDI.sh
rename to test/units/TEST-50-DISSECT.DDI.sh
diff --git a/test/units/testsuite-50.dissect.sh b/test/units/TEST-50-DISSECT.dissect.sh
similarity index 100%
rename from test/units/testsuite-50.dissect.sh
rename to test/units/TEST-50-DISSECT.dissect.sh
diff --git a/test/units/testsuite-50.mountfsd.sh b/test/units/TEST-50-DISSECT.mountfsd.sh
similarity index 100%
rename from test/units/testsuite-50.mountfsd.sh
rename to test/units/TEST-50-DISSECT.mountfsd.sh
diff --git a/test/units/testsuite-50.service b/test/units/TEST-50-DISSECT.service
similarity index 100%
rename from test/units/testsuite-50.service
rename to test/units/TEST-50-DISSECT.service
diff --git a/test/units/testsuite-50.sh b/test/units/TEST-50-DISSECT.sh
similarity index 99%
rename from test/units/testsuite-50.sh
rename to test/units/TEST-50-DISSECT.sh
index d014e824fce..b1286d70ff5 100755
--- a/test/units/testsuite-50.sh
+++ b/test/units/TEST-50-DISSECT.sh
@@ -95,7 +95,7 @@ elif [[ "$machine" == "riscv32" ]]; then
     SIGNATURE_GUID=3a112a75-8729-4380-b4cf-764d79934448
     ARCHITECTURE="riscv32"
 else
-    echo "Unexpected uname -m: $machine in testsuite-50.sh, please fix me"
+    echo "Unexpected uname -m: $machine in TEST-50-DISSECT.sh, please fix me"
     exit 1
 fi
 
diff --git a/test/units/testsuite-50.sysext.sh b/test/units/TEST-50-DISSECT.sysext.sh
similarity index 100%
rename from test/units/testsuite-50.sysext.sh
rename to test/units/TEST-50-DISSECT.sysext.sh
diff --git a/test/units/testsuite-52.service b/test/units/TEST-52-HONORFIRSTSHUTDOWN.service
similarity index 76%
rename from test/units/testsuite-52.service
rename to test/units/TEST-52-HONORFIRSTSHUTDOWN.service
index b9f290975a8..966b9b6a1b6 100644
--- a/test/units/testsuite-52.service
+++ b/test/units/TEST-52-HONORFIRSTSHUTDOWN.service
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
-Description=Testsuite service
+Description=TEST-52-HONORFIRSTSHUTDOWN
 
 [Service]
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
diff --git a/test/units/testsuite-52.sh b/test/units/TEST-52-HONORFIRSTSHUTDOWN.sh
similarity index 100%
rename from test/units/testsuite-52.sh
rename to test/units/TEST-52-HONORFIRSTSHUTDOWN.sh
diff --git a/test/units/testsuite-53.service b/test/units/TEST-53-ISSUE-16347.service
similarity index 100%
rename from test/units/testsuite-53.service
rename to test/units/TEST-53-ISSUE-16347.service
diff --git a/test/units/testsuite-53.sh b/test/units/TEST-53-ISSUE-16347.sh
similarity index 100%
rename from test/units/testsuite-53.sh
rename to test/units/TEST-53-ISSUE-16347.sh
diff --git a/test/units/testsuite-64.service b/test/units/TEST-54-CREDS.service
similarity index 86%
rename from test/units/testsuite-64.service
rename to test/units/TEST-54-CREDS.service
index f75a3d7aad4..94bf2b7645e 100644
--- a/test/units/testsuite-64.service
+++ b/test/units/TEST-54-CREDS.service
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
-Description=TEST-64-UDEV
+Description=TEST-54-CREDS
 
 [Service]
 ExecStartPre=rm -f /failed /testok
diff --git a/test/units/testsuite-54.sh b/test/units/TEST-54-CREDS.sh
similarity index 100%
rename from test/units/testsuite-54.sh
rename to test/units/TEST-54-CREDS.sh
diff --git a/test/units/testsuite-55-testbloat.service b/test/units/TEST-55-OOMD-testbloat.service
similarity index 90%
rename from test/units/testsuite-55-testbloat.service
rename to test/units/TEST-55-OOMD-testbloat.service
index 6c8e3c93aca..ba4f2bc88c4 100644
--- a/test/units/testsuite-55-testbloat.service
+++ b/test/units/TEST-55-OOMD-testbloat.service
@@ -6,5 +6,5 @@ Description=Create a lot of memory pressure
 # A VERY small memory.high will cause the 'stress' (trying to use a lot of memory)
 # to throttle and be put under heavy pressure.
 MemoryHigh=3M
-Slice=testsuite-55-workload.slice
+Slice=TEST-55-OOMD-workload.slice
 ExecStart=stress --timeout 3m --vm 10 --vm-bytes 200M --vm-keep --vm-stride 1
diff --git a/test/units/testsuite-55-testchill.service b/test/units/TEST-55-OOMD-testchill.service
similarity index 79%
rename from test/units/testsuite-55-testchill.service
rename to test/units/TEST-55-OOMD-testchill.service
index 369b8029d37..1f708dd81ce 100644
--- a/test/units/testsuite-55-testchill.service
+++ b/test/units/TEST-55-OOMD-testchill.service
@@ -4,5 +4,5 @@ Description=No memory pressure
 
 [Service]
 MemoryHigh=3M
-Slice=testsuite-55-workload.slice
+Slice=TEST-55-OOMD-workload.slice
 ExecStart=sleep infinity
diff --git a/test/units/testsuite-55-testmunch.service b/test/units/TEST-55-OOMD-testmunch.service
similarity index 85%
rename from test/units/testsuite-55-testmunch.service
rename to test/units/TEST-55-OOMD-testmunch.service
index 37300597979..5659906ad1f 100644
--- a/test/units/testsuite-55-testmunch.service
+++ b/test/units/TEST-55-OOMD-testmunch.service
@@ -4,5 +4,5 @@ Description=Create some memory pressure
 
 [Service]
 MemoryHigh=12M
-Slice=testsuite-55-workload.slice
+Slice=TEST-55-OOMD-workload.slice
 ExecStart=stress --timeout 3m --vm 10 --vm-bytes 200M --vm-keep --vm-stride 1
diff --git a/test/units/testsuite-55-workload.slice b/test/units/TEST-55-OOMD-workload.slice
similarity index 100%
rename from test/units/testsuite-55-workload.slice
rename to test/units/TEST-55-OOMD-workload.slice
diff --git a/test/units/testsuite-55.service b/test/units/TEST-55-OOMD.service
similarity index 88%
rename from test/units/testsuite-55.service
rename to test/units/TEST-55-OOMD.service
index 00fb49919f4..1b6b8b818f4 100644
--- a/test/units/testsuite-55.service
+++ b/test/units/TEST-55-OOMD.service
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
-Description=TESTSUITE-55-OOMD
+Description=TEST-55-OOMD
 After=user@4711.service
 Wants=user@4711.service
 
diff --git a/test/units/testsuite-55.sh b/test/units/TEST-55-OOMD.sh
similarity index 74%
rename from test/units/testsuite-55.sh
rename to test/units/TEST-55-OOMD.sh
index 5bc0eaec75e..b04ebca7e21 100755
--- a/test/units/testsuite-55.sh
+++ b/test/units/TEST-55-OOMD.sh
@@ -27,7 +27,7 @@ if [[ -s /skipped ]]; then
     exit 77
 fi
 
-rm -rf /run/systemd/system/testsuite-55-testbloat.service.d
+rm -rf /run/systemd/system/TEST-55-OOMD-testbloat.service.d
 
 # Activate swap file if we are in a VM
 if systemd-detect-virt --vm --quiet; then
@@ -87,34 +87,34 @@ if [[ -v ASAN_OPTIONS || -v UBSAN_OPTIONS ]]; then
     # go on a killing spree. This fact is exacerbated further on Arch Linux which ships unstripped gcc-libs,
     # so sd-executor pulls in over 30M of libs on startup. Let's make the MemoryHigh= limit a bit more
     # generous when running with sanitizers to make the test happy.
-    systemctl edit --runtime --stdin --drop-in=99-MemoryHigh.conf testsuite-55-testchill.service <<EOF
+    systemctl edit --runtime --stdin --drop-in=99-MemoryHigh.conf TEST-55-OOMD-testchill.service <<EOF
 [Service]
 MemoryHigh=60M
 EOF
     # Do the same for the user instance as well
     mkdir -p /run/systemd/user/
-    cp -rfv /run/systemd/system/testsuite-55-testchill.service.d/ /run/systemd/user/
+    cp -rfv /run/systemd/system/TEST-55-OOMD-testchill.service.d/ /run/systemd/user/
 else
     # Ensure that we can start services even with a very low hard memory cap without oom-kills, but skip
     # under sanitizers as they balloon memory usage.
     systemd-run -t -p MemoryMax=10M -p MemorySwapMax=0 -p MemoryZSwapMax=0 /bin/true
 fi
 
-systemctl start testsuite-55-testchill.service
-systemctl start testsuite-55-testbloat.service
+systemctl start TEST-55-OOMD-testchill.service
+systemctl start TEST-55-OOMD-testbloat.service
 
 # Verify systemd-oomd is monitoring the expected units
-timeout 1m bash -xec 'until oomctl | grep "/testsuite-55-workload.slice"; do sleep 1; done'
-oomctl | grep "/testsuite-55-workload.slice"
+timeout 1m bash -xec 'until oomctl | grep "/TEST-55-OOMD-workload.slice"; do sleep 1; done'
+oomctl | grep "/TEST-55-OOMD-workload.slice"
 oomctl | grep "20.00%"
 oomctl | grep "Default Memory Pressure Duration: 2s"
 
-systemctl status testsuite-55-testchill.service
+systemctl status TEST-55-OOMD-testchill.service
 
 # systemd-oomd watches for elevated pressure for 2 seconds before acting.
 # It can take time to build up pressure so either wait 2 minutes or for the service to fail.
 for _ in {0..59}; do
-    if ! systemctl status testsuite-55-testbloat.service; then
+    if ! systemctl status TEST-55-OOMD-testbloat.service; then
         break
     fi
     oomctl
@@ -122,28 +122,28 @@ for _ in {0..59}; do
 done
 
 # testbloat should be killed and testchill should be fine
-if systemctl status testsuite-55-testbloat.service; then exit 42; fi
-if ! systemctl status testsuite-55-testchill.service; then exit 24; fi
+if systemctl status TEST-55-OOMD-testbloat.service; then exit 42; fi
+if ! systemctl status TEST-55-OOMD-testchill.service; then exit 24; fi
 
 # Make sure we also work correctly on user units.
 loginctl enable-linger testuser
 
-systemctl start --machine "testuser@.host" --user testsuite-55-testchill.service
-systemctl start --machine "testuser@.host" --user testsuite-55-testbloat.service
+systemctl start --machine "testuser@.host" --user TEST-55-OOMD-testchill.service
+systemctl start --machine "testuser@.host" --user TEST-55-OOMD-testbloat.service
 
 # Verify systemd-oomd is monitoring the expected units
 # Try to avoid racing the oomctl output check by checking in a loop with a timeout
-timeout 1m bash -xec 'until oomctl | grep "/testsuite-55-workload.slice"; do sleep 1; done'
-oomctl | grep -E "/user.slice.*/testsuite-55-workload.slice"
+timeout 1m bash -xec 'until oomctl | grep "/TEST-55-OOMD-workload.slice"; do sleep 1; done'
+oomctl | grep -E "/user.slice.*/TEST-55-OOMD-workload.slice"
 oomctl | grep "20.00%"
 oomctl | grep "Default Memory Pressure Duration: 2s"
 
-systemctl --machine "testuser@.host" --user status testsuite-55-testchill.service
+systemctl --machine "testuser@.host" --user status TEST-55-OOMD-testchill.service
 
 # systemd-oomd watches for elevated pressure for 2 seconds before acting.
 # It can take time to build up pressure so either wait 2 minutes or for the service to fail.
 for _ in {0..59}; do
-    if ! systemctl --machine "testuser@.host" --user status testsuite-55-testbloat.service; then
+    if ! systemctl --machine "testuser@.host" --user status TEST-55-OOMD-testbloat.service; then
         break
     fi
     oomctl
@@ -151,8 +151,8 @@ for _ in {0..59}; do
 done
 
 # testbloat should be killed and testchill should be fine
-if systemctl --machine "testuser@.host" --user status testsuite-55-testbloat.service; then exit 42; fi
-if ! systemctl --machine "testuser@.host" --user status testsuite-55-testchill.service; then exit 24; fi
+if systemctl --machine "testuser@.host" --user status TEST-55-OOMD-testbloat.service; then exit 42; fi
+if ! systemctl --machine "testuser@.host" --user status TEST-55-OOMD-testchill.service; then exit 24; fi
 
 loginctl disable-linger testuser
 
@@ -160,19 +160,19 @@ loginctl disable-linger testuser
 if cgroupfs_supports_user_xattrs; then
     sleep 120 # wait for systemd-oomd kill cool down and elevated memory pressure to come down
 
-    mkdir -p /run/systemd/system/testsuite-55-testbloat.service.d/
-    cat >/run/systemd/system/testsuite-55-testbloat.service.d/override.conf <<EOF
+    mkdir -p /run/systemd/system/TEST-55-OOMD-testbloat.service.d/
+    cat >/run/systemd/system/TEST-55-OOMD-testbloat.service.d/override.conf <<EOF
 [Service]
 ManagedOOMPreference=avoid
 EOF
 
     systemctl daemon-reload
-    systemctl start testsuite-55-testchill.service
-    systemctl start testsuite-55-testmunch.service
-    systemctl start testsuite-55-testbloat.service
+    systemctl start TEST-55-OOMD-testchill.service
+    systemctl start TEST-55-OOMD-testmunch.service
+    systemctl start TEST-55-OOMD-testbloat.service
 
     for _ in {0..59}; do
-        if ! systemctl status testsuite-55-testmunch.service; then
+        if ! systemctl status TEST-55-OOMD-testmunch.service; then
             break
         fi
         oomctl
@@ -180,9 +180,9 @@ EOF
     done
 
     # testmunch should be killed since testbloat had the avoid xattr on it
-    if ! systemctl status testsuite-55-testbloat.service; then exit 25; fi
-    if systemctl status testsuite-55-testmunch.service; then exit 43; fi
-    if ! systemctl status testsuite-55-testchill.service; then exit 24; fi
+    if ! systemctl status TEST-55-OOMD-testbloat.service; then exit 25; fi
+    if systemctl status TEST-55-OOMD-testmunch.service; then exit 43; fi
+    if ! systemctl status TEST-55-OOMD-testchill.service; then exit 24; fi
 fi
 
 systemd-analyze log-level info
diff --git a/test/units/testsuite-58.service b/test/units/TEST-58-REPART.service
similarity index 100%
rename from test/units/testsuite-58.service
rename to test/units/TEST-58-REPART.service
diff --git a/test/units/testsuite-58.sh b/test/units/TEST-58-REPART.sh
similarity index 99%
rename from test/units/testsuite-58.sh
rename to test/units/TEST-58-REPART.sh
index bebe7b727b6..d3cb2f8bb04 100755
--- a/test/units/testsuite-58.sh
+++ b/test/units/TEST-58-REPART.sh
@@ -87,7 +87,7 @@ elif [ "${machine}" = "ppc64le" ]; then
     usr_uuid=C0D0823B-8040-4C7C-A629-026248E297FB
     architecture="ppc64-le"
 else
-    echo "Unexpected uname -m: ${machine} in testsuite-58.sh, please fix me"
+    echo "Unexpected uname -m: ${machine} in TEST-58-REPART.sh, please fix me"
     exit 1
 fi
 
diff --git a/test/units/testsuite-59.service b/test/units/TEST-59-RELOADING-RESTART.service
similarity index 100%
rename from test/units/testsuite-59.service
rename to test/units/TEST-59-RELOADING-RESTART.service
diff --git a/test/units/testsuite-59.sh b/test/units/TEST-59-RELOADING-RESTART.sh
similarity index 100%
rename from test/units/testsuite-59.sh
rename to test/units/TEST-59-RELOADING-RESTART.sh
diff --git a/test/units/testsuite-60.service b/test/units/TEST-60-MOUNT-RATELIMIT.service
similarity index 100%
rename from test/units/testsuite-60.service
rename to test/units/TEST-60-MOUNT-RATELIMIT.service
diff --git a/test/units/testsuite-60.sh b/test/units/TEST-60-MOUNT-RATELIMIT.sh
similarity index 96%
rename from test/units/testsuite-60.sh
rename to test/units/TEST-60-MOUNT-RATELIMIT.sh
index e800a7a12c2..d205a93a86b 100755
--- a/test/units/testsuite-60.sh
+++ b/test/units/TEST-60-MOUNT-RATELIMIT.sh
@@ -23,8 +23,8 @@ teardown_test_dependencies() (
         losetup -d "${LOOP_1}" || :
     fi
 
-    rm -f /tmp/testsuite-60-dependencies-0.img
-    rm -f /tmp/testsuite-60-dependencies-1.img
+    rm -f /tmp/TEST-60-MOUNT-RATELIMIT-dependencies-0.img
+    rm -f /tmp/TEST-60-MOUNT-RATELIMIT-dependencies-1.img
 
     rm -f /run/systemd/system/tmp-deptest.mount
     systemctl daemon-reload
@@ -33,13 +33,13 @@ teardown_test_dependencies() (
 )
 
 setup_loop() {
-    truncate -s 30m "/tmp/testsuite-60-dependencies-${1?}.img"
-    sfdisk --wipe=always "/tmp/testsuite-60-dependencies-${1?}.img" <<EOF
+    truncate -s 30m "/tmp/TEST-60-MOUNT-RATELIMIT-dependencies-${1?}.img"
+    sfdisk --wipe=always "/tmp/TEST-60-MOUNT-RATELIMIT-dependencies-${1?}.img" <<EOF
 label:gpt
 
 name="loop${1?}-part1"
 EOF
-    LOOP=$(losetup -P --show -f "/tmp/testsuite-60-dependencies-${1?}.img")
+    LOOP=$(losetup -P --show -f "/tmp/TEST-60-MOUNT-RATELIMIT-dependencies-${1?}.img")
     udevadm wait --settle --timeout=10 "${LOOP}"
     udevadm lock --device="${LOOP}" mkfs.ext4 -L "partname${1?}-1" "${LOOP}p1"
 }
diff --git a/test/units/testsuite-62-1.service b/test/units/TEST-62-RESTRICT-IFACES-1.service
similarity index 100%
rename from test/units/testsuite-62-1.service
rename to test/units/TEST-62-RESTRICT-IFACES-1.service
diff --git a/test/units/testsuite-62-2.service b/test/units/TEST-62-RESTRICT-IFACES-2.service
similarity index 100%
rename from test/units/testsuite-62-2.service
rename to test/units/TEST-62-RESTRICT-IFACES-2.service
diff --git a/test/units/testsuite-62-3.service b/test/units/TEST-62-RESTRICT-IFACES-3.service
similarity index 100%
rename from test/units/testsuite-62-3.service
rename to test/units/TEST-62-RESTRICT-IFACES-3.service
diff --git a/test/units/testsuite-62-4.service b/test/units/TEST-62-RESTRICT-IFACES-4.service
similarity index 100%
rename from test/units/testsuite-62-4.service
rename to test/units/TEST-62-RESTRICT-IFACES-4.service
diff --git a/test/units/testsuite-62-5.service b/test/units/TEST-62-RESTRICT-IFACES-5.service
similarity index 100%
rename from test/units/testsuite-62-5.service
rename to test/units/TEST-62-RESTRICT-IFACES-5.service
diff --git a/test/units/testsuite-62-6.service b/test/units/TEST-62-RESTRICT-IFACES-6.service
similarity index 100%
rename from test/units/testsuite-62-6.service
rename to test/units/TEST-62-RESTRICT-IFACES-6.service
diff --git a/test/units/testsuite-62.service b/test/units/TEST-62-RESTRICT-IFACES.service
similarity index 100%
rename from test/units/testsuite-62.service
rename to test/units/TEST-62-RESTRICT-IFACES.service
diff --git a/test/units/testsuite-62.sh b/test/units/TEST-62-RESTRICT-IFACES.sh
similarity index 81%
rename from test/units/testsuite-62.sh
rename to test/units/TEST-62-RESTRICT-IFACES.sh
index 1fbb3cb1c22..35ab862f321 100755
--- a/test/units/testsuite-62.sh
+++ b/test/units/TEST-62-RESTRICT-IFACES.sh
@@ -47,10 +47,10 @@ fi
 trap teardown EXIT
 setup
 
-systemctl start --wait testsuite-62-1.service
-systemctl start --wait testsuite-62-2.service
-systemctl start --wait testsuite-62-3.service
-systemctl start --wait testsuite-62-4.service
-systemctl start --wait testsuite-62-5.service
+systemctl start --wait TEST-62-RESTRICT-IFACES-1.service
+systemctl start --wait TEST-62-RESTRICT-IFACES-2.service
+systemctl start --wait TEST-62-RESTRICT-IFACES-3.service
+systemctl start --wait TEST-62-RESTRICT-IFACES-4.service
+systemctl start --wait TEST-62-RESTRICT-IFACES-5.service
 
 touch /testok
diff --git a/test/units/testsuite-63.service b/test/units/TEST-63-PATH.service
similarity index 100%
rename from test/units/testsuite-63.service
rename to test/units/TEST-63-PATH.service
diff --git a/test/units/testsuite-63.sh b/test/units/TEST-63-PATH.sh
similarity index 100%
rename from test/units/testsuite-63.sh
rename to test/units/TEST-63-PATH.sh
diff --git a/test/units/testsuite-54.service b/test/units/TEST-64-UDEV-STORAGE.service
similarity index 83%
rename from test/units/testsuite-54.service
rename to test/units/TEST-64-UDEV-STORAGE.service
index ba8cdad5cb1..b7626bbf941 100644
--- a/test/units/testsuite-54.service
+++ b/test/units/TEST-64-UDEV-STORAGE.service
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
-Description=TESTSUITE-54-CREDS
+Description=TEST-64-UDEV-STORAGE
 
 [Service]
 ExecStartPre=rm -f /failed /testok
diff --git a/test/units/testsuite-64.sh b/test/units/TEST-64-UDEV-STORAGE.sh
similarity index 100%
rename from test/units/testsuite-64.sh
rename to test/units/TEST-64-UDEV-STORAGE.sh
diff --git a/test/units/testsuite-65.service b/test/units/TEST-65-ANALYZE.service
similarity index 100%
rename from test/units/testsuite-65.service
rename to test/units/TEST-65-ANALYZE.service
diff --git a/test/units/testsuite-65.sh b/test/units/TEST-65-ANALYZE.sh
similarity index 100%
rename from test/units/testsuite-65.sh
rename to test/units/TEST-65-ANALYZE.sh
diff --git a/test/units/testsuite-66-deviceisolation.service b/test/units/TEST-66-DEVICE-ISOLATION-device-isolation.service
similarity index 66%
rename from test/units/testsuite-66-deviceisolation.service
rename to test/units/TEST-66-DEVICE-ISOLATION-device-isolation.service
index 14b0d8987af..85b3d0dcc6f 100644
--- a/test/units/testsuite-66-deviceisolation.service
+++ b/test/units/TEST-66-DEVICE-ISOLATION-device-isolation.service
@@ -5,6 +5,6 @@ Description=Service that uses device isolation
 [Service]
 DevicePolicy=strict
 DeviceAllow=/dev/null r
-StandardOutput=file:/tmp/testsuite66serviceresults
-ExecStartPre=rm -f /tmp/testsuite66serviceresults
+StandardOutput=file:/tmp/TEST-66-DEVICE-ISOLATION.serviceresults
+ExecStartPre=rm -f /tmp/TEST-66-DEVICE-ISOLATION.serviceresults
 ExecStart=bash -c "while true; do sleep 0.01 && echo meow >/dev/null && echo thisshouldnotbehere; done"
diff --git a/test/units/testsuite-66.sh b/test/units/TEST-66-DEVICE-ISOLATION.sh
similarity index 64%
rename from test/units/testsuite-66.sh
rename to test/units/TEST-66-DEVICE-ISOLATION.sh
index 147335a7af1..ccdfcb274c1 100755
--- a/test/units/testsuite-66.sh
+++ b/test/units/TEST-66-DEVICE-ISOLATION.sh
@@ -3,11 +3,11 @@
 set -eux
 set -o pipefail
 
-RESULTS_FILE=/tmp/testsuite66serviceresults
+RESULTS_FILE=/tmp/TEST-66-DEVICE-ISOLATION.serviceresults
 
 systemd-analyze log-level debug
 
-systemctl start testsuite-66-deviceisolation.service
+systemctl start TEST-66-DEVICE-ISOLATION-device-isolation.service
 
 sleep 5
 grep -q "Operation not permitted" "$RESULTS_FILE"
@@ -15,7 +15,7 @@ grep -q "Operation not permitted" "$RESULTS_FILE"
 systemctl daemon-reload
 systemctl daemon-reexec
 
-systemctl stop testsuite-66-deviceisolation.service
+systemctl stop TEST-66-DEVICE-ISOLATION-device-isolation.service
 
 grep -q "thisshouldnotbehere" "$RESULTS_FILE" && exit 42
 
diff --git a/test/units/TEST-66-DEVICEISOLATION.service b/test/units/TEST-66-DEVICEISOLATION.service
new file mode 100644
index 00000000000..61cd0abfb58
--- /dev/null
+++ b/test/units/TEST-66-DEVICEISOLATION.service
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+[Unit]
+Description=TEST-66-DEVICEISOLATION
+
+[Service]
+ExecStartPre=rm -f /failed /testok
+ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
+Type=oneshot
diff --git a/test/units/testsuite-67.service b/test/units/TEST-67-INTEGRITY.service
similarity index 100%
rename from test/units/testsuite-67.service
rename to test/units/TEST-67-INTEGRITY.service
diff --git a/test/units/testsuite-67.sh b/test/units/TEST-67-INTEGRITY.sh
similarity index 100%
rename from test/units/testsuite-67.sh
rename to test/units/TEST-67-INTEGRITY.sh
diff --git a/test/units/testsuite-68.service b/test/units/TEST-68-PROPAGATE-EXIT-STATUS.service
similarity index 100%
rename from test/units/testsuite-68.service
rename to test/units/TEST-68-PROPAGATE-EXIT-STATUS.service
diff --git a/test/units/testsuite-68.sh b/test/units/TEST-68-PROPAGATE-EXIT-STATUS.sh
similarity index 100%
rename from test/units/testsuite-68.sh
rename to test/units/TEST-68-PROPAGATE-EXIT-STATUS.sh
diff --git a/test/units/testsuite-69.service b/test/units/TEST-69-SHUTDOWN.service
similarity index 100%
rename from test/units/testsuite-69.service
rename to test/units/TEST-69-SHUTDOWN.service
diff --git a/test/units/testsuite-70.creds.sh b/test/units/TEST-70-TPM2.creds.sh
similarity index 100%
rename from test/units/testsuite-70.creds.sh
rename to test/units/TEST-70-TPM2.creds.sh
diff --git a/test/units/testsuite-70.cryptenroll.sh b/test/units/TEST-70-TPM2.cryptenroll.sh
similarity index 100%
rename from test/units/testsuite-70.cryptenroll.sh
rename to test/units/TEST-70-TPM2.cryptenroll.sh
diff --git a/test/units/testsuite-70.cryptsetup.sh b/test/units/TEST-70-TPM2.cryptsetup.sh
similarity index 100%
rename from test/units/testsuite-70.cryptsetup.sh
rename to test/units/TEST-70-TPM2.cryptsetup.sh
diff --git a/test/units/testsuite-70.measure.sh b/test/units/TEST-70-TPM2.measure.sh
similarity index 100%
rename from test/units/testsuite-70.measure.sh
rename to test/units/TEST-70-TPM2.measure.sh
diff --git a/test/units/testsuite-70.pcrextend.sh b/test/units/TEST-70-TPM2.pcrextend.sh
similarity index 100%
rename from test/units/testsuite-70.pcrextend.sh
rename to test/units/TEST-70-TPM2.pcrextend.sh
diff --git a/test/units/testsuite-70.pcrlock.sh b/test/units/TEST-70-TPM2.pcrlock.sh
similarity index 100%
rename from test/units/testsuite-70.pcrlock.sh
rename to test/units/TEST-70-TPM2.pcrlock.sh
diff --git a/test/units/testsuite-70.service b/test/units/TEST-70-TPM2.service
similarity index 100%
rename from test/units/testsuite-70.service
rename to test/units/TEST-70-TPM2.service
diff --git a/test/units/testsuite-70.sh b/test/units/TEST-70-TPM2.sh
similarity index 100%
rename from test/units/testsuite-70.sh
rename to test/units/TEST-70-TPM2.sh
diff --git a/test/units/testsuite-70.tpm2-setup.sh b/test/units/TEST-70-TPM2.tpm2-setup.sh
similarity index 100%
rename from test/units/testsuite-70.tpm2-setup.sh
rename to test/units/TEST-70-TPM2.tpm2-setup.sh
diff --git a/test/units/testsuite-71.service b/test/units/TEST-71-HOSTNAME.service
similarity index 100%
rename from test/units/testsuite-71.service
rename to test/units/TEST-71-HOSTNAME.service
diff --git a/test/units/testsuite-71.sh b/test/units/TEST-71-HOSTNAME.sh
similarity index 100%
rename from test/units/testsuite-71.sh
rename to test/units/TEST-71-HOSTNAME.sh
diff --git a/test/units/testsuite-72.service b/test/units/TEST-72-SYSUPDATE.service
similarity index 100%
rename from test/units/testsuite-72.service
rename to test/units/TEST-72-SYSUPDATE.service
diff --git a/test/units/testsuite-72.sh b/test/units/TEST-72-SYSUPDATE.sh
similarity index 100%
rename from test/units/testsuite-72.sh
rename to test/units/TEST-72-SYSUPDATE.sh
diff --git a/test/units/testsuite-73.service b/test/units/TEST-73-LOCALE.service
similarity index 100%
rename from test/units/testsuite-73.service
rename to test/units/TEST-73-LOCALE.service
diff --git a/test/units/testsuite-73.sh b/test/units/TEST-73-LOCALE.sh
similarity index 100%
rename from test/units/testsuite-73.sh
rename to test/units/TEST-73-LOCALE.sh
diff --git a/test/units/testsuite-74.battery-check.sh b/test/units/TEST-74-AUX-UTILS.battery-check.sh
similarity index 100%
rename from test/units/testsuite-74.battery-check.sh
rename to test/units/TEST-74-AUX-UTILS.battery-check.sh
diff --git a/test/units/testsuite-74.bootctl.sh b/test/units/TEST-74-AUX-UTILS.bootctl.sh
similarity index 100%
rename from test/units/testsuite-74.bootctl.sh
rename to test/units/TEST-74-AUX-UTILS.bootctl.sh
diff --git a/test/units/testsuite-74.busctl.sh b/test/units/TEST-74-AUX-UTILS.busctl.sh
similarity index 100%
rename from test/units/testsuite-74.busctl.sh
rename to test/units/TEST-74-AUX-UTILS.busctl.sh
diff --git a/test/units/testsuite-74.capsule.sh b/test/units/TEST-74-AUX-UTILS.capsule.sh
similarity index 100%
rename from test/units/testsuite-74.capsule.sh
rename to test/units/TEST-74-AUX-UTILS.capsule.sh
diff --git a/test/units/testsuite-74.cgls.sh b/test/units/TEST-74-AUX-UTILS.cgls.sh
similarity index 100%
rename from test/units/testsuite-74.cgls.sh
rename to test/units/TEST-74-AUX-UTILS.cgls.sh
diff --git a/test/units/testsuite-74.cgtop.sh b/test/units/TEST-74-AUX-UTILS.cgtop.sh
similarity index 100%
rename from test/units/testsuite-74.cgtop.sh
rename to test/units/TEST-74-AUX-UTILS.cgtop.sh
diff --git a/test/units/testsuite-74.coredump.sh b/test/units/TEST-74-AUX-UTILS.coredump.sh
similarity index 99%
rename from test/units/testsuite-74.coredump.sh
rename to test/units/TEST-74-AUX-UTILS.coredump.sh
index f48607c0db2..3f3571639e3 100755
--- a/test/units/testsuite-74.coredump.sh
+++ b/test/units/TEST-74-AUX-UTILS.coredump.sh
@@ -79,7 +79,7 @@ timeout 30 bash -c "while [[ \$(coredumpctl list -q --no-legend $CORE_TEST_BIN |
 
 if cgroupfs_supports_user_xattrs; then
     # Make sure we can forward crashes back to containers
-    CONTAINER="testsuite-74-container"
+    CONTAINER="TEST-74-AUX-UTILS-container"
 
     mkdir -p "/var/lib/machines/$CONTAINER"
     mkdir -p "/run/systemd/system/systemd-nspawn@$CONTAINER.service.d"
diff --git a/test/units/testsuite-74.delta.sh b/test/units/TEST-74-AUX-UTILS.delta.sh
similarity index 100%
rename from test/units/testsuite-74.delta.sh
rename to test/units/TEST-74-AUX-UTILS.delta.sh
diff --git a/test/units/testsuite-74.escape.sh b/test/units/TEST-74-AUX-UTILS.escape.sh
similarity index 100%
rename from test/units/testsuite-74.escape.sh
rename to test/units/TEST-74-AUX-UTILS.escape.sh
diff --git a/test/units/testsuite-74.firstboot.sh b/test/units/TEST-74-AUX-UTILS.firstboot.sh
similarity index 100%
rename from test/units/testsuite-74.firstboot.sh
rename to test/units/TEST-74-AUX-UTILS.firstboot.sh
diff --git a/test/units/testsuite-74.id128.sh b/test/units/TEST-74-AUX-UTILS.id128.sh
similarity index 100%
rename from test/units/testsuite-74.id128.sh
rename to test/units/TEST-74-AUX-UTILS.id128.sh
diff --git a/test/units/testsuite-74.machine-id-setup.sh b/test/units/TEST-74-AUX-UTILS.machine-id-setup.sh
similarity index 100%
rename from test/units/testsuite-74.machine-id-setup.sh
rename to test/units/TEST-74-AUX-UTILS.machine-id-setup.sh
diff --git a/test/units/testsuite-74.modules-load.sh b/test/units/TEST-74-AUX-UTILS.modules-load.sh
similarity index 100%
rename from test/units/testsuite-74.modules-load.sh
rename to test/units/TEST-74-AUX-UTILS.modules-load.sh
diff --git a/test/units/testsuite-74.mount.sh b/test/units/TEST-74-AUX-UTILS.mount.sh
similarity index 100%
rename from test/units/testsuite-74.mount.sh
rename to test/units/TEST-74-AUX-UTILS.mount.sh
diff --git a/test/units/testsuite-74.network-generator.sh b/test/units/TEST-74-AUX-UTILS.network-generator.sh
similarity index 100%
rename from test/units/testsuite-74.network-generator.sh
rename to test/units/TEST-74-AUX-UTILS.network-generator.sh
diff --git a/test/units/testsuite-74.networkctl.sh b/test/units/TEST-74-AUX-UTILS.networkctl.sh
similarity index 100%
rename from test/units/testsuite-74.networkctl.sh
rename to test/units/TEST-74-AUX-UTILS.networkctl.sh
diff --git a/test/units/testsuite-74.path.sh b/test/units/TEST-74-AUX-UTILS.path.sh
similarity index 100%
rename from test/units/testsuite-74.path.sh
rename to test/units/TEST-74-AUX-UTILS.path.sh
diff --git a/test/units/testsuite-74.pstore.sh b/test/units/TEST-74-AUX-UTILS.pstore.sh
similarity index 100%
rename from test/units/testsuite-74.pstore.sh
rename to test/units/TEST-74-AUX-UTILS.pstore.sh
diff --git a/test/units/testsuite-74.run.sh b/test/units/TEST-74-AUX-UTILS.run.sh
similarity index 100%
rename from test/units/testsuite-74.run.sh
rename to test/units/TEST-74-AUX-UTILS.run.sh
diff --git a/test/units/testsuite-74.service b/test/units/TEST-74-AUX-UTILS.service
similarity index 100%
rename from test/units/testsuite-74.service
rename to test/units/TEST-74-AUX-UTILS.service
diff --git a/test/units/testsuite-74.sh b/test/units/TEST-74-AUX-UTILS.sh
similarity index 100%
rename from test/units/testsuite-74.sh
rename to test/units/TEST-74-AUX-UTILS.sh
diff --git a/test/units/testsuite-74.socket.sh b/test/units/TEST-74-AUX-UTILS.socket.sh
similarity index 100%
rename from test/units/testsuite-74.socket.sh
rename to test/units/TEST-74-AUX-UTILS.socket.sh
diff --git a/test/units/testsuite-74.ssh.sh b/test/units/TEST-74-AUX-UTILS.ssh.sh
similarity index 100%
rename from test/units/testsuite-74.ssh.sh
rename to test/units/TEST-74-AUX-UTILS.ssh.sh
diff --git a/test/units/testsuite-74.varlinkctl.sh b/test/units/TEST-74-AUX-UTILS.varlinkctl.sh
similarity index 100%
rename from test/units/testsuite-74.varlinkctl.sh
rename to test/units/TEST-74-AUX-UTILS.varlinkctl.sh
diff --git a/test/units/testsuite-74.vpick.sh b/test/units/TEST-74-AUX-UTILS.vpick.sh
similarity index 100%
rename from test/units/testsuite-74.vpick.sh
rename to test/units/TEST-74-AUX-UTILS.vpick.sh
diff --git a/test/units/TEST-75-RESOLVED.service b/test/units/TEST-75-RESOLVED.service
new file mode 100644
index 00000000000..3368e04b99d
--- /dev/null
+++ b/test/units/TEST-75-RESOLVED.service
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+[Unit]
+Description=TEST-75-RESOLVED
+
+[Service]
+ExecStartPre=rm -f /failed /testok
+ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
+Type=oneshot
diff --git a/test/units/testsuite-75.sh b/test/units/TEST-75-RESOLVED.sh
similarity index 100%
rename from test/units/testsuite-75.sh
rename to test/units/TEST-75-RESOLVED.sh
diff --git a/test/units/testsuite-76.service b/test/units/TEST-76-SYSCTL.service
similarity index 100%
rename from test/units/testsuite-76.service
rename to test/units/TEST-76-SYSCTL.service
diff --git a/test/units/testsuite-76.sh b/test/units/TEST-76-SYSCTL.sh
similarity index 100%
rename from test/units/testsuite-76.sh
rename to test/units/TEST-76-SYSCTL.sh
diff --git a/test/units/testsuite-78.service b/test/units/TEST-78-SIGQUEUE.service
similarity index 100%
rename from test/units/testsuite-78.service
rename to test/units/TEST-78-SIGQUEUE.service
diff --git a/test/units/testsuite-78.sh b/test/units/TEST-78-SIGQUEUE.sh
similarity index 100%
rename from test/units/testsuite-78.sh
rename to test/units/TEST-78-SIGQUEUE.sh
diff --git a/test/units/testsuite-79.service b/test/units/TEST-79-MEMPRESS.service
similarity index 100%
rename from test/units/testsuite-79.service
rename to test/units/TEST-79-MEMPRESS.service
diff --git a/test/units/testsuite-79.sh b/test/units/TEST-79-MEMPRESS.sh
similarity index 94%
rename from test/units/testsuite-79.sh
rename to test/units/TEST-79-MEMPRESS.sh
index 205f7f3da32..4ce73d4c299 100755
--- a/test/units/testsuite-79.sh
+++ b/test/units/TEST-79-MEMPRESS.sh
@@ -15,7 +15,7 @@ fi
 
 systemd-analyze log-level debug
 
-CGROUP=/sys/fs/cgroup/"$(systemctl show testsuite-79.service -P ControlGroup)"
+CGROUP=/sys/fs/cgroup/"$(systemctl show TEST-79-MEMPRESS.service -P ControlGroup)"
 test -d "$CGROUP"
 
 if ! test -f "$CGROUP"/memory.pressure ; then
diff --git a/test/units/testsuite-80.service b/test/units/TEST-80-NOTIFYACCESS.service
similarity index 100%
rename from test/units/testsuite-80.service
rename to test/units/TEST-80-NOTIFYACCESS.service
diff --git a/test/units/testsuite-80.sh b/test/units/TEST-80-NOTIFYACCESS.sh
similarity index 100%
rename from test/units/testsuite-80.sh
rename to test/units/TEST-80-NOTIFYACCESS.sh
diff --git a/test/units/testsuite-81.debug-generator.sh b/test/units/TEST-81-GENERATORS.debug-generator.sh
similarity index 100%
rename from test/units/testsuite-81.debug-generator.sh
rename to test/units/TEST-81-GENERATORS.debug-generator.sh
diff --git a/test/units/testsuite-81.environment-d-generator.sh b/test/units/TEST-81-GENERATORS.environment-d-generator.sh
similarity index 100%
rename from test/units/testsuite-81.environment-d-generator.sh
rename to test/units/TEST-81-GENERATORS.environment-d-generator.sh
diff --git a/test/units/testsuite-81.fstab-generator.sh b/test/units/TEST-81-GENERATORS.fstab-generator.sh
similarity index 100%
rename from test/units/testsuite-81.fstab-generator.sh
rename to test/units/TEST-81-GENERATORS.fstab-generator.sh
diff --git a/test/units/testsuite-81.getty-generator.sh b/test/units/TEST-81-GENERATORS.getty-generator.sh
similarity index 100%
rename from test/units/testsuite-81.getty-generator.sh
rename to test/units/TEST-81-GENERATORS.getty-generator.sh
diff --git a/test/units/testsuite-81.run-generator.sh b/test/units/TEST-81-GENERATORS.run-generator.sh
similarity index 100%
rename from test/units/testsuite-81.run-generator.sh
rename to test/units/TEST-81-GENERATORS.run-generator.sh
diff --git a/test/units/testsuite-81.service b/test/units/TEST-81-GENERATORS.service
similarity index 100%
rename from test/units/testsuite-81.service
rename to test/units/TEST-81-GENERATORS.service
diff --git a/test/units/testsuite-81.sh b/test/units/TEST-81-GENERATORS.sh
similarity index 100%
rename from test/units/testsuite-81.sh
rename to test/units/TEST-81-GENERATORS.sh
diff --git a/test/units/testsuite-81.system-update-generator.sh b/test/units/TEST-81-GENERATORS.system-update-generator.sh
similarity index 100%
rename from test/units/testsuite-81.system-update-generator.sh
rename to test/units/TEST-81-GENERATORS.system-update-generator.sh
diff --git a/test/units/testsuite-82.service b/test/units/TEST-82-SOFTREBOOT.service
similarity index 100%
rename from test/units/testsuite-82.service
rename to test/units/TEST-82-SOFTREBOOT.service
diff --git a/test/units/testsuite-82.sh b/test/units/TEST-82-SOFTREBOOT.sh
similarity index 79%
rename from test/units/testsuite-82.sh
rename to test/units/TEST-82-SOFTREBOOT.sh
index 9747602d192..7a1d8a9221b 100755
--- a/test/units/testsuite-82.sh
+++ b/test/units/TEST-82-SOFTREBOOT.sh
@@ -23,13 +23,13 @@ systemd-analyze log-level debug
 
 export SYSTEMD_LOG_LEVEL=debug
 
-if [ -f /run/testsuite82.touch3 ]; then
+if [ -f /run/TEST-82-SOFTREBOOT.touch3 ]; then
     echo "This is the fourth boot!"
     systemd-notify --status="Fourth Boot"
 
     test "$(busctl -j get-property org.freedesktop.systemd1 /org/freedesktop/systemd1 org.freedesktop.systemd1.Manager SoftRebootsCount | jq -r '.data')" -eq 3
 
-    rm /run/testsuite82.touch3
+    rm /run/TEST-82-SOFTREBOOT.touch3
     mount
     rmdir /original-root /run/nextroot
 
@@ -39,10 +39,10 @@ if [ -f /run/testsuite82.touch3 ]; then
     test "$x" = "oinkoink"
 
     # Check that the surviving services are still around
-    test "$(systemctl show -P ActiveState testsuite-82-survive.service)" = "active"
-    test "$(systemctl show -P ActiveState testsuite-82-survive-argv.service)" = "active"
-    test "$(systemctl show -P ActiveState testsuite-82-nosurvive-sigterm.service)" != "active"
-    test "$(systemctl show -P ActiveState testsuite-82-nosurvive.service)" != "active"
+    test "$(systemctl show -P ActiveState TEST-82-SOFTREBOOT-survive.service)" = "active"
+    test "$(systemctl show -P ActiveState TEST-82-SOFTREBOOT-survive-argv.service)" = "active"
+    test "$(systemctl show -P ActiveState TEST-82-SOFTREBOOT-nosurvive-sigterm.service)" != "active"
+    test "$(systemctl show -P ActiveState TEST-82-SOFTREBOOT-nosurvive.service)" != "active"
 
     # Check journals
     journalctl -o short-monotonic --no-hostname --grep '(will soft-reboot|KILL|corrupt)'
@@ -50,13 +50,13 @@ if [ -f /run/testsuite82.touch3 ]; then
 
     # All succeeded, exit cleanly now
 
-elif [ -f /run/testsuite82.touch2 ]; then
+elif [ -f /run/TEST-82-SOFTREBOOT.touch2 ]; then
     echo "This is the third boot!"
     systemd-notify --status="Third Boot"
 
     test "$(busctl -j get-property org.freedesktop.systemd1 /org/freedesktop/systemd1 org.freedesktop.systemd1.Manager SoftRebootsCount | jq -r '.data')" -eq 2
 
-    rm /run/testsuite82.touch2
+    rm /run/TEST-82-SOFTREBOOT.touch2
 
     # Check that the fdstore entry still exists
     test "$LISTEN_FDS" -eq 2
@@ -70,10 +70,10 @@ elif [ -f /run/testsuite82.touch2 ]; then
     rm "$T"
 
     # Check that the surviving services are still around
-    test "$(systemctl show -P ActiveState testsuite-82-survive.service)" = "active"
-    test "$(systemctl show -P ActiveState testsuite-82-survive-argv.service)" = "active"
-    test "$(systemctl show -P ActiveState testsuite-82-nosurvive-sigterm.service)" != "active"
-    test "$(systemctl show -P ActiveState testsuite-82-nosurvive.service)" != "active"
+    test "$(systemctl show -P ActiveState TEST-82-SOFTREBOOT-survive.service)" = "active"
+    test "$(systemctl show -P ActiveState TEST-82-SOFTREBOOT-survive-argv.service)" = "active"
+    test "$(systemctl show -P ActiveState TEST-82-SOFTREBOOT-nosurvive-sigterm.service)" != "active"
+    test "$(systemctl show -P ActiveState TEST-82-SOFTREBOOT-nosurvive.service)" != "active"
 
     # Test that we really are in the new overlayfs root fs
     read -r x </lower
@@ -86,23 +86,23 @@ elif [ -f /run/testsuite82.touch2 ]; then
     mount
 
     # Restart the unit that is not supposed to survive
-    systemd-run --collect --service-type=exec --unit=testsuite-82-nosurvive.service sleep infinity
+    systemd-run --collect --service-type=exec --unit=TEST-82-SOFTREBOOT-nosurvive.service sleep infinity
 
     # Now issue the soft reboot. We should be right back soon.
-    touch /run/testsuite82.touch3
+    touch /run/TEST-82-SOFTREBOOT.touch3
     systemctl --no-block soft-reboot
 
     # Now block until the soft-boot killing spree kills us
     exec sleep infinity
 
-elif [ -f /run/testsuite82.touch ]; then
+elif [ -f /run/TEST-82-SOFTREBOOT.touch ]; then
     echo "This is the second boot!"
     systemd-notify --status="Second Boot"
 
     test "$(busctl -j get-property org.freedesktop.systemd1 /org/freedesktop/systemd1 org.freedesktop.systemd1.Manager SoftRebootsCount | jq -r '.data')" -eq 1
 
     # Clean up what we created earlier
-    rm /run/testsuite82.touch
+    rm /run/TEST-82-SOFTREBOOT.touch
 
     # Check that the fdstore entry still exists
     test "$LISTEN_FDS" -eq 1
@@ -110,8 +110,8 @@ elif [ -f /run/testsuite82.touch ]; then
     test "$x" = "wuffwuff"
 
     # Check that we got a PrepareForShutdownWithMetadata signal with the right type
-    cat /run/testsuite82.signal
-    test "$(jq -r '.payload.data[1].type.data' </run/testsuite82.signal)" = "soft-reboot"
+    cat /run/TEST-82-SOFTREBOOT.signal
+    test "$(jq -r '.payload.data[1].type.data' </run/TEST-82-SOFTREBOOT.signal)" = "soft-reboot"
 
     # Check that the system credentials survived the soft reboot.
     test "$(systemd-creds cat --system kernelcmdlinecred)" = "uff"
@@ -123,10 +123,10 @@ elif [ -f /run/testsuite82.touch ]; then
     rm "$T"
 
     # Check that the surviving services are still around
-    test "$(systemctl show -P ActiveState testsuite-82-survive.service)" = "active"
-    test "$(systemctl show -P ActiveState testsuite-82-survive-argv.service)" = "active"
-    test "$(systemctl show -P ActiveState testsuite-82-nosurvive-sigterm.service)" != "active"
-    test "$(systemctl show -P ActiveState testsuite-82-nosurvive.service)" != "active"
+    test "$(systemctl show -P ActiveState TEST-82-SOFTREBOOT-survive.service)" = "active"
+    test "$(systemctl show -P ActiveState TEST-82-SOFTREBOOT-survive-argv.service)" = "active"
+    test "$(systemctl show -P ActiveState TEST-82-SOFTREBOOT-nosurvive-sigterm.service)" != "active"
+    test "$(systemctl show -P ActiveState TEST-82-SOFTREBOOT-nosurvive.service)" != "active"
 
     # This time we test the /run/nextroot/ root switching logic. (We synthesize a new rootfs from the old via overlayfs)
     mkdir -p /run/nextroot /tmp/nextroot-lower /original-root
@@ -147,7 +147,7 @@ elif [ -f /run/testsuite82.touch ]; then
     mount --bind / /run/nextroot/original-root
 
     # Restart the unit that is not supposed to survive
-    systemd-run --collect --service-type=exec --unit=testsuite-82-nosurvive.service sleep infinity
+    systemd-run --collect --service-type=exec --unit=TEST-82-SOFTREBOOT-nosurvive.service sleep infinity
 
     # Now ensure there are no naming clashes and a bunch of transient units all succeed
     for _ in $(seq 1 25); do
@@ -156,7 +156,7 @@ elif [ -f /run/testsuite82.touch ]; then
 
     # Now issue the soft reboot. We should be right back soon. Given /run/nextroot exists, we should
     # automatically do a softreboot instead of normal reboot.
-    touch /run/testsuite82.touch2
+    touch /run/TEST-82-SOFTREBOOT.touch2
     systemctl --no-block reboot
 
     # Now block until the soft-boot killing spree kills us
@@ -194,8 +194,8 @@ EOF
     # This sets DefaultDependencies=no so that they remain running until the very end, and
     # IgnoreOnIsolate=yes so that they aren't stopped via the "testsuite.target" isolation we do on next boot,
     # and will be killed by the final sigterm/sigkill spree.
-    systemd-run --collect --service-type=notify -p DefaultDependencies=no -p IgnoreOnIsolate=yes --unit=testsuite-82-nosurvive-sigterm.service "$survive_sigterm"
-    systemd-run --collect --service-type=exec -p DefaultDependencies=no -p IgnoreOnIsolate=yes --unit=testsuite-82-nosurvive.service sleep infinity
+    systemd-run --collect --service-type=notify -p DefaultDependencies=no -p IgnoreOnIsolate=yes --unit=TEST-82-SOFTREBOOT-nosurvive-sigterm.service "$survive_sigterm"
+    systemd-run --collect --service-type=exec -p DefaultDependencies=no -p IgnoreOnIsolate=yes --unit=TEST-82-SOFTREBOOT-nosurvive.service sleep infinity
 
     # Ensure that the unit doesn't get deactivated by dependencies on the source file. Given it's a verity
     # image that is already open, even if the tmpfs with the image goes away, the file will be pinned by the
@@ -205,7 +205,7 @@ EOF
     # Configure these transient units to survive the soft reboot - they will not conflict with shutdown.target
     # and it will be ignored on the isolate that happens in the next boot. The first will use argv[0][0] =
     # '@', and the second will use SurviveFinalKillSignal=yes. Both should survive.
-    systemd-run --service-type=notify --unit=testsuite-82-survive-argv.service \
+    systemd-run --service-type=notify --unit=TEST-82-SOFTREBOOT-survive-argv.service \
         --property SurviveFinalKillSignal=no \
         --property IgnoreOnIsolate=yes \
         --property DefaultDependencies=no \
@@ -213,7 +213,7 @@ EOF
         --property "Conflicts=reboot.target kexec.target poweroff.target halt.target emergency.target rescue.target" \
         --property "Before=reboot.target kexec.target poweroff.target halt.target emergency.target rescue.target" \
          "$survive_argv"
-    systemd-run --service-type=exec --unit=testsuite-82-survive.service \
+    systemd-run --service-type=exec --unit=TEST-82-SOFTREBOOT-survive.service \
         --property TemporaryFileSystem="/run /tmp /var" \
         --property RootImage=/tmp/minimal_0.raw \
         --property BindReadOnlyPaths=/dev/log \
@@ -229,7 +229,7 @@ EOF
 
     # Check that we can set up an inhibitor, and that busctl monitor sees the
     # PrepareForShutdownWithMetadata signal and that it says 'soft-reboot'.
-    systemd-run --unit busctl.service --service-type=exec --property StandardOutput=file:/run/testsuite82.signal \
+    systemd-run --unit busctl.service --service-type=exec --property StandardOutput=file:/run/TEST-82-SOFTREBOOT.signal \
         busctl monitor --json=pretty --match 'sender=org.freedesktop.login1,path=/org/freedesktop/login1,interface=org.freedesktop.login1.Manager,member=PrepareForShutdownWithMetadata,type=signal'
     systemd-run --unit inhibit.service --service-type=exec \
         systemd-inhibit --what=shutdown --who=test --why=test --mode=delay \
@@ -244,7 +244,7 @@ EOF
     done
 
     # Now issue the soft reboot. We should be right back soon.
-    touch /run/testsuite82.touch
+    touch /run/TEST-82-SOFTREBOOT.touch
     systemctl --no-block --check-inhibitors=yes soft-reboot
 
     # Now block until the soft-boot killing spree kills us
diff --git a/test/units/testsuite-83.service b/test/units/TEST-83-BTRFS.service
similarity index 100%
rename from test/units/testsuite-83.service
rename to test/units/TEST-83-BTRFS.service
diff --git a/test/units/testsuite-83.sh b/test/units/TEST-83-BTRFS.sh
similarity index 100%
rename from test/units/testsuite-83.sh
rename to test/units/TEST-83-BTRFS.sh
diff --git a/test/units/testsuite-84.service b/test/units/TEST-84-STORAGETM.service
similarity index 100%
rename from test/units/testsuite-84.service
rename to test/units/TEST-84-STORAGETM.service
diff --git a/test/units/testsuite-84.sh b/test/units/TEST-84-STORAGETM.sh
similarity index 100%
rename from test/units/testsuite-84.sh
rename to test/units/TEST-84-STORAGETM.sh
diff --git a/test/units/test-control.sh b/test/units/test-control.sh
index 0a1611b80ae..4cede74d50e 100644
--- a/test/units/test-control.sh
+++ b/test/units/test-control.sh
@@ -107,7 +107,7 @@ run_subtests_with_signals() {
     _show_summary
 }
 
-# Run all subtests (i.e. files named as testsuite-<testid>.<subtest_name>.sh)
+# Run all subtests (i.e. files named as $TESTNAME.<subtest_name>.sh)
 run_subtests() {
     local subtests=("${0%.sh}".*.sh)
     local subtest
diff --git a/test/units/testsuite-23-short-lived.sh b/test/units/testsuite-23-short-lived.sh
deleted file mode 100755
index 4a12c7f4987..00000000000
--- a/test/units/testsuite-23-short-lived.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: LGPL-2.1-or-later
-set -ex
-
-if [ -f /tmp/testsuite-23.counter ] ; then
-    read -r counter < /tmp/testsuite-23.counter
-    counter=$((counter + 1))
-else
-    counter=0
-fi
-
-echo "$counter" >/tmp/testsuite-23.counter
-
-if [ "$counter" -eq 5 ] ; then
-    systemctl kill --kill-whom=main -sUSR1 testsuite-23.service
-fi
-
-exec sleep 1.5
diff --git a/test/units/testsuite-23.JoinsNamespaceOf.sh b/test/units/testsuite-23.JoinsNamespaceOf.sh
deleted file mode 100755
index 68ba4650722..00000000000
--- a/test/units/testsuite-23.JoinsNamespaceOf.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-set -eux
-set -o pipefail
-
-# Test JoinsNamespaceOf= with PrivateTmp=yes
-
-systemd-analyze log-level debug
-systemd-analyze log-target journal
-
-# simple case
-systemctl start testsuite-23-joins-namespace-of-1.service
-systemctl start testsuite-23-joins-namespace-of-2.service
-systemctl start testsuite-23-joins-namespace-of-3.service
-systemctl stop testsuite-23-joins-namespace-of-1.service
-
-# inverse dependency
-systemctl start testsuite-23-joins-namespace-of-4.service
-systemctl start testsuite-23-joins-namespace-of-5.service
-systemctl stop testsuite-23-joins-namespace-of-4.service
-
-# transitive dependency
-systemctl start testsuite-23-joins-namespace-of-6.service
-systemctl start testsuite-23-joins-namespace-of-7.service
-systemctl start testsuite-23-joins-namespace-of-8.service
-systemctl start testsuite-23-joins-namespace-of-9.service
-systemctl stop testsuite-23-joins-namespace-of-6.service
-systemctl stop testsuite-23-joins-namespace-of-8.service
-
-systemd-analyze log-level info
diff --git a/test/units/testsuite-23.Upholds.sh b/test/units/testsuite-23.Upholds.sh
deleted file mode 100755
index e62f9c64dea..00000000000
--- a/test/units/testsuite-23.Upholds.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-set -eux
-set -o pipefail
-
-# Test OnSuccess= + Uphold= + PropagatesStopTo= + BindsTo=
-
-systemd-analyze log-level debug
-systemd-analyze log-target journal
-
-# Idea is this:
-#    1. we start testsuite-23-success.service
-#    2. which through OnSuccess= starts testsuite-23-fail.service,
-#    3. which through OnFailure= starts testsuite-23-uphold.service,
-#    4. which through Uphold= starts/keeps testsuite-23-short-lived.service running,
-#    5. which will sleep 1s when invoked, and on the 5th invocation send us a SIGUSR1
-#    6. once we got that we finish cleanly
-
-sigusr1=0
-trap sigusr1=1 SIGUSR1
-
-trap -p SIGUSR1
-
-systemctl start testsuite-23-success.service
-
-while [ "$sigusr1" -eq 0 ] ; do
-    sleep .5
-done
-
-systemctl stop testsuite-23-uphold.service
-
-systemctl enable testsuite-23-upheldby-install.service
-
-# Idea is this:
-#    1. we start testsuite-23-retry-uphold.service
-#    2. which through Uphold= starts testsuite-23-retry-upheld.service
-#    3. which through Requires= starts testsuite-23-retry-fail.service
-#    4. which fails as /tmp/testsuite-23-retry-fail does not exist, so testsuite-23-retry-upheld.service
-#       is no longer restarted
-#    5. we create /tmp/testsuite-23-retry-fail
-#    6. now testsuite-23-retry-upheld.service will be restarted since upheld, and its dependency will
-#       be satisfied
-
-rm -f /tmp/testsuite-23-retry-fail
-systemctl start testsuite-23-retry-uphold.service
-systemctl is-active testsuite-23-upheldby-install.service
-
-until systemctl is-failed testsuite-23-retry-fail.service ; do
-    sleep .5
-done
-
-(! systemctl is-active testsuite-23-retry-upheld.service)
-
-touch /tmp/testsuite-23-retry-fail
-
-until systemctl is-active testsuite-23-retry-upheld.service ; do
-    sleep .5
-done
-
-systemctl stop testsuite-23-retry-uphold.service testsuite-23-retry-fail.service testsuite-23-retry-upheld.service
-
-# Idea is this:
-#    1. we start testsuite-23-prop-stop-one.service
-#    2. which through Wants=/After= pulls in testsuite-23-prop-stop-two.service as well
-#    3. testsuite-23-prop-stop-one.service then sleeps indefinitely
-#    4. testsuite-23-prop-stop-two.service sleeps a short time and exits
-#    5. the StopPropagatedFrom= dependency between the two should ensure *both* will exit as result
-#    6. an ExecStopPost= line on testsuite-23-prop-stop-one.service will send us a SIGUSR2
-#    7. once we got that we finish cleanly
-
-sigusr2=0
-trap sigusr2=1 SIGUSR2
-
-systemctl start testsuite-23-prop-stop-one.service
-
-while [ "$sigusr2" -eq 0 ] ; do
-    sleep .5
-done
-
-
-# Idea is this:
-#    1. we start testsuite-23-binds-to.service
-#    2. which through BindsTo=/After= pulls in testsuite-23-bound-by.service as well
-#    3. testsuite-23-bound-by.service suddenly dies
-#    4. testsuite-23-binds-to.service should then also be pulled down (it otherwise just hangs)
-#    6. an ExecStopPost= line on testsuite-23-binds-to.service will send us a SIGRTMIN1+1
-#    7. once we got that we finish cleanly
-
-sigrtmin1=0
-trap sigrtmin1=1 SIGRTMIN+1
-
-systemctl start testsuite-23-binds-to.service
-
-while [ "$sigrtmin1" -eq 0 ] ; do
-    sleep .5
-done
-
-systemd-analyze log-level info
diff --git a/test/units/testsuite-23.runtime-bind-paths.sh b/test/units/testsuite-23.runtime-bind-paths.sh
deleted file mode 100755
index 65c2dbf41db..00000000000
--- a/test/units/testsuite-23.runtime-bind-paths.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: LGPL-2.1-or-later
-# shellcheck disable=SC2016
-set -eux
-set -o pipefail
-
-# Test adding new BindPaths while unit is already running
-
-at_exit() {
-    set +e
-
-    rm -f /run/testsuite-23-marker-{fixed,runtime}
-    rm -fr /run/inaccessible
-}
-
-trap at_exit EXIT
-
-echo "MARKER_FIXED" >/run/testsuite-23-marker-fixed
-mkdir /run/inaccessible
-
-systemctl start testsuite-23-namespaced.service
-
-# Ensure that inaccessible paths aren't bypassed by the runtime setup,
-(! systemctl bind --mkdir testsuite-23-namespaced.service /run/testsuite-23-marker-fixed /run/inaccessible/testfile-marker-fixed)
-
-echo "MARKER_WRONG" >/run/testsuite-23-marker-wrong
-echo "MARKER_RUNTIME" >/run/testsuite-23-marker-runtime
-
-# Mount twice to exercise mount-beneath (on kernel 6.5+, on older kernels it will just overmount)
-systemctl bind --mkdir testsuite-23-namespaced.service /run/testsuite-23-marker-wrong /tmp/testfile-marker-runtime
-test "$(systemctl show -P SubState testsuite-23-namespaced.service)" = "running"
-systemctl bind --mkdir testsuite-23-namespaced.service /run/testsuite-23-marker-runtime /tmp/testfile-marker-runtime
-
-timeout 10 bash -xec 'while [[ "$(systemctl show -P SubState testsuite-23-namespaced.service)" == running ]]; do sleep .5; done'
-systemctl is-active testsuite-23-namespaced.service
-
-# Now test that systemctl bind fails when attempted on a non-namespaced unit
-systemctl start testsuite-23-non-namespaced.service
-
-(! systemctl bind --mkdir testsuite-49-non-namespaced.service /run/testsuite-23-marker-runtime /tmp/testfile-marker-runtime)
-
-timeout 10 bash -xec 'while [[ "$(systemctl show -P SubState testsuite-23-non-namespaced.service)" == running ]]; do sleep .5; done'
-(! systemctl is-active testsuite-23-non-namespaced.service)
diff --git a/test/units/testsuite-23.start-stop-no-reload.sh b/test/units/testsuite-23.start-stop-no-reload.sh
deleted file mode 100755
index e40990bdbb8..00000000000
--- a/test/units/testsuite-23.start-stop-no-reload.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: LGPL-2.1-or-later
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-set -eux
-set -o pipefail
-
-# Test start & stop operations without daemon-reload
-
-at_exit() {
-    set +e
-
-    rm -f /run/systemd/system/testsuite-23-no-reload.{service,target}
-}
-
-trap at_exit EXIT
-
-cat >/run/systemd/system/testsuite-23-no-reload.target <<EOF
-[Unit]
-Wants=testsuite-23-no-reload.service
-EOF
-
-systemctl daemon-reload
-
-systemctl start testsuite-23-no-reload.target
-
-# The filesystem on the test image, despite being ext4, seems to have a mtime
-# granularity of one second, which means the manager's unit cache won't be
-# marked as dirty when writing the unit file, unless we wait at least a full
-# second after the previous daemon-reload.
-# May 07 23:12:20 H testsuite-48.sh[30]: + cat
-# May 07 23:12:20 H testsuite-48.sh[30]: + ls -l --full-time /etc/systemd/system/testsuite-23-no-reload.service
-# May 07 23:12:20 H testsuite-48.sh[52]: -rw-r--r-- 1 root root 50 2020-05-07 23:12:20.000000000 +0100 /
-# May 07 23:12:20 H testsuite-48.sh[30]: + stat -f --format=%t /etc/systemd/system/testsuite-23-no-reload.servic
-# May 07 23:12:20 H testsuite-48.sh[53]: ef53
-sleep 3.1
-
-cat >/run/systemd/system/testsuite-23-no-reload.service <<EOF
-[Service]
-ExecStart=sleep infinity
-EOF
-
-systemctl start testsuite-23-no-reload.service
-
-systemctl is-active testsuite-23-no-reload.service
-
-# Stop and remove, and try again to exercise https://github.com/systemd/systemd/issues/15992
-systemctl stop testsuite-23-no-reload.service
-rm -f /run/systemd/system/testsuite-23-no-reload.service
-systemctl daemon-reload
-
-sleep 3.1
-
-cat >/run/systemd/system/testsuite-23-no-reload.service <<EOF
-[Service]
-ExecStart=sleep infinity
-EOF
-
-# Start a non-existing unit first, so that the cache is reloaded for an unrelated
-# reason. Starting the existing unit later should still work thanks to the check
-# for the last load attempt vs cache timestamp.
-systemctl start testsuite-23-no-reload-nonexistent.service || true
-
-systemctl start testsuite-23-no-reload.service
-
-systemctl is-active testsuite-23-no-reload.service
-
-# Stop and remove, and try again to exercise the transaction setup code path by
-# having the target pull in the unloaded but available unit
-systemctl stop testsuite-23-no-reload.service testsuite-23-no-reload.target
-rm -f /run/systemd/system/testsuite-23-no-reload.service /run/systemd/system/testsuite-23-no-reload.target
-systemctl daemon-reload
-
-sleep 3.1
-
-cat >/run/systemd/system/testsuite-23-no-reload.target <<EOF
-[Unit]
-Conflicts=shutdown.target
-Wants=testsuite-23-no-reload.service
-EOF
-
-systemctl daemon-reload
-
-systemctl start testsuite-23-no-reload.target
-
-cat >/run/systemd/system/testsuite-23-no-reload.service <<EOF
-[Service]
-ExecStart=sleep infinity
-EOF
-
-systemctl restart testsuite-23-no-reload.target
-
-systemctl is-active testsuite-23-no-reload.service
diff --git a/test/units/testsuite-66.service b/test/units/testsuite-66.service
deleted file mode 100644
index 7e9dc3bee70..00000000000
--- a/test/units/testsuite-66.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TESTSUITE-66-DEVICEISOLATION
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/testsuite-75.service b/test/units/testsuite-75.service
deleted file mode 100644
index 111cde30ee2..00000000000
--- a/test/units/testsuite-75.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=Tests for systemd-resolved
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/util.sh b/test/units/util.sh
index cc9d5ec48f6..f5f6786d0f6 100755
--- a/test/units/util.sh
+++ b/test/units/util.sh
@@ -156,13 +156,13 @@ coverage_create_nspawn_dropin() {
 create_dummy_container() {
     local root="${1:?}"
 
-    if [[ ! -d /usr/share/testsuite-13-container-template ]]; then
+    if [[ ! -d /usr/share/TEST-13-NSPAWN-container-template ]]; then
         echo >&2 "Missing container template, probably not running in TEST-13-NSPAWN?"
         exit 1
     fi
 
     mkdir -p "$root"
-    cp -a /usr/share/testsuite-13-container-template/* "$root"
+    cp -a /usr/share/TEST-13-NSPAWN-container-template/* "$root"
     coverage_create_nspawn_dropin "$root"
 }