diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c
index 44b7e6bd4f..5fa6fe2da3 100644
--- a/src/test/test-cgroup-util.c
+++ b/src/test/test-cgroup-util.c
@@ -258,7 +258,7 @@ TEST(proc, .sd_booted = true) {
                 ASSERT_OK_OR(r4, -ESRCH, -ENXIO);
                 ASSERT_OK_OR(r5, -ESRCH, -ENXIO);
                 ASSERT_OK_OR(r6, -ESRCH, -ENXIO);
-                ASSERT_OK_OR(r7, -ESRCH, -ENOENT);
+                ASSERT_OK_OR(r7, -ESRCH, -ENXIO, -ENOENT);
         }
 }
 
diff --git a/src/test/test-cgroup.c b/src/test/test-cgroup.c
index cb093c74b2..77f720fd2d 100644
--- a/src/test/test-cgroup.c
+++ b/src/test/test-cgroup.c
@@ -64,7 +64,7 @@ TEST(cg_create) {
         (void) cg_trim(test_b, /* delete_root= */ true);
 
         r = cg_create(test_a);
-        if (ERRNO_IS_NEG_FS_WRITE_REFUSED(r))
+        if (ERRNO_IS_NEG_FS_WRITE_REFUSED(r) || r == -ENOENT)
                 return (void) log_tests_skipped_errno(r, "%s: Failed to create cgroup %s", __func__, test_a);
 
         ASSERT_OK_EQ(r, 1);