diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c
index 697130e70c..8831d87fe7 100644
--- a/src/test/test-seccomp.c
+++ b/src/test/test-seccomp.c
@@ -318,7 +318,7 @@ static void test_protect_sysctl(void) {
         if (pid == 0) {
 #if defined __NR__sysctl && __NR__sysctl >= 0
                 assert_se(syscall(__NR__sysctl, NULL) < 0);
-                assert_se(errno == EFAULT);
+                assert_se(IN_SET(errno, EFAULT, ENOSYS));
 #endif
 
                 assert_se(seccomp_protect_sysctl() >= 0);
diff --git a/test/TEST-02-CRYPTSETUP/Makefile b/test/TEST-02-UNITTESTS/Makefile
similarity index 100%
rename from test/TEST-02-CRYPTSETUP/Makefile
rename to test/TEST-02-UNITTESTS/Makefile
diff --git a/test/TEST-24-UNIT-TESTS/deny-list-ubuntu-ci-ppc64el b/test/TEST-02-UNITTESTS/deny-list-ubuntu-ci-ppc64el
similarity index 100%
rename from test/TEST-24-UNIT-TESTS/deny-list-ubuntu-ci-ppc64el
rename to test/TEST-02-UNITTESTS/deny-list-ubuntu-ci-ppc64el
diff --git a/test/TEST-24-UNIT-TESTS/test.sh b/test/TEST-02-UNITTESTS/test.sh
similarity index 98%
rename from test/TEST-24-UNIT-TESTS/test.sh
rename to test/TEST-02-UNITTESTS/test.sh
index e5553b0fb5..6143d3352b 100755
--- a/test/TEST-24-UNIT-TESTS/test.sh
+++ b/test/TEST-02-UNITTESTS/test.sh
@@ -60,4 +60,4 @@ check_result_qemu() {
     return $_ret
 }
 
-do_test "$@" 24
+do_test "$@" 02
diff --git a/test/TEST-24-UNIT-TESTS/Makefile b/test/TEST-24-CRYPTSETUP/Makefile
similarity index 100%
rename from test/TEST-24-UNIT-TESTS/Makefile
rename to test/TEST-24-CRYPTSETUP/Makefile
diff --git a/test/TEST-02-CRYPTSETUP/test.sh b/test/TEST-24-CRYPTSETUP/test.sh
similarity index 99%
rename from test/TEST-02-CRYPTSETUP/test.sh
rename to test/TEST-24-CRYPTSETUP/test.sh
index ef1811122e..2a6ad310ed 100755
--- a/test/TEST-02-CRYPTSETUP/test.sh
+++ b/test/TEST-24-CRYPTSETUP/test.sh
@@ -76,4 +76,4 @@ test_setup_cleanup() {
     cleanup_initdir
 }
 
-do_test "$@" 02
+do_test "$@" 24
diff --git a/test/run-integration-tests.sh b/test/run-integration-tests.sh
index ac7a28cf2c..04b8385be9 100755
--- a/test/run-integration-tests.sh
+++ b/test/run-integration-tests.sh
@@ -7,7 +7,7 @@ if [ $# -gt 0 ]; then
 else
     args="setup run clean-again"
 fi
-args_no_clean=$(sed -r 's/(^| )clean($| )/ /g' <<<$args)
+args_no_clean=$(sed -r 's/\bclean\b//g' <<<$args)
 do_clean=$( [ "$args" = "$args_no_clean" ]; echo $? )
 
 ninja -C "$BUILD_DIR"
@@ -26,6 +26,8 @@ if [ $do_clean = 1 ]; then
     for TEST in TEST-??-* ; do
         ( set -x ; make -C "$TEST" "BUILD_DIR=$BUILD_DIR" clean )
     done
+
+    [ -n "$args_no_clean" ] || exit 0
 fi
 
 pass_blacklist() {
diff --git a/test/units/testsuite-02.service b/test/units/testsuite-02.service
index 13e7ec3639..075e979d29 100644
--- a/test/units/testsuite-02.service
+++ b/test/units/testsuite-02.service
@@ -1,8 +1,7 @@
 [Unit]
-Description=TEST-02-CRYPTSETUP
-After=multi-user.target
+Description=TEST-02-UNITTESTS
 
 [Service]
 ExecStartPre=rm -f /failed /testok
-ExecStart=sh -x -e -c 'mountpoint /var; systemctl --state=failed --no-legend --no-pager >/failed; echo OK >/testok'
+ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-24.sh b/test/units/testsuite-02.sh
similarity index 100%
rename from test/units/testsuite-24.sh
rename to test/units/testsuite-02.sh
diff --git a/test/units/testsuite-24.service b/test/units/testsuite-24.service
index 43d4816d48..e66f61388f 100644
--- a/test/units/testsuite-24.service
+++ b/test/units/testsuite-24.service
@@ -1,7 +1,8 @@
 [Unit]
-Description=TEST-24-UNIT-TESTS
+Description=TEST-24-CRYPTSETUP
+After=multi-user.target
 
 [Service]
 ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
+ExecStart=sh -x -e -c 'mountpoint /var; systemctl --state=failed --no-legend --no-pager >/failed; echo OK >/testok'
 Type=oneshot