diff --git a/src/test/test-daemon.c b/src/test/test-daemon.c
index b880521025..5d6c52374c 100644
--- a/src/test/test-daemon.c
+++ b/src/test/test-daemon.c
@@ -19,7 +19,7 @@ int main(int argc, char *argv[]) {
         if (argc >= 2) {
                 unsigned x;
 
-                assert_se(safe_atou(argv[1], &x) >= 0);
+                ASSERT_OK(safe_atou(argv[1], &x));
                 duration = x * USEC_PER_SEC;
         }
 
diff --git a/src/test/test-date.c b/src/test/test-date.c
index c7d239e22f..f39720aba9 100644
--- a/src/test/test-date.c
+++ b/src/test/test-date.c
@@ -12,17 +12,17 @@ static void test_should_pass(const char *p) {
         char buf[FORMAT_TIMESTAMP_MAX], buf_relative[FORMAT_TIMESTAMP_RELATIVE_MAX];
 
         log_info("Test: %s", p);
-        assert_se(parse_timestamp(p, &t) >= 0);
-        assert_se(format_timestamp_style(buf, sizeof(buf), t, TIMESTAMP_US));
+        ASSERT_OK(parse_timestamp(p, &t));
+        ASSERT_NOT_NULL(format_timestamp_style(buf, sizeof(buf), t, TIMESTAMP_US));
         log_info("\"%s\" → \"%s\"", p, buf);
 
-        assert_se(parse_timestamp(buf, &q) >= 0);
+        ASSERT_OK(parse_timestamp(buf, &q));
         if (q != t)
                 log_error("round-trip failed: \"%s\" → \"%s\"",
                           buf, FORMAT_TIMESTAMP_STYLE(q, TIMESTAMP_US));
-        assert_se(q == t);
+        ASSERT_EQ(q, t);
 
-        assert_se(format_timestamp_relative(buf_relative, sizeof(buf_relative), t));
+        ASSERT_NOT_NULL(format_timestamp_relative(buf_relative, sizeof(buf_relative), t));
         log_info("%s", strna(buf_relative));
 }
 
@@ -30,7 +30,7 @@ static void test_should_parse(const char *p) {
         usec_t t;
 
         log_info("Test: %s", p);
-        assert_se(parse_timestamp(p, &t) >= 0);
+        ASSERT_OK(parse_timestamp(p, &t));
         log_info("\"%s\" → \"@%" PRI_USEC "\"", p, t);
 }
 
@@ -44,7 +44,7 @@ static void test_should_fail(const char *p) {
                 log_info("\"%s\" → \"@%" PRI_USEC "\" (unexpected)", p, t);
         else
                 log_info("parse_timestamp() returns %d (expected)", r);
-        assert_se(r < 0);
+        ASSERT_LT(r, 0);
 }
 
 static void test_one(const char *p) {
@@ -65,7 +65,7 @@ static void test_one_noutc(const char *p) {
 
 int main(int argc, char *argv[]) {
         /* Tests have hard-coded results that do not expect a specific timezone to be set by the caller */
-        assert_se(unsetenv("TZ") >= 0);
+        ASSERT_OK_ERRNO(unsetenv("TZ"));
 
         test_setup_logging(LOG_DEBUG);
 
diff --git a/src/test/test-dev-setup.c b/src/test/test-dev-setup.c
index ed56710d9e..bdf562584c 100644
--- a/src/test/test-dev-setup.c
+++ b/src/test/test-dev-setup.c
@@ -19,48 +19,48 @@ int main(int argc, char *argv[]) {
         if (have_effective_cap(CAP_DAC_OVERRIDE) <= 0)
                 return log_tests_skipped("missing capability (CAP_DAC_OVERRIDE)");
 
-        assert_se(mkdtemp_malloc("/tmp/test-dev-setupXXXXXX", &p) >= 0);
+        ASSERT_OK(mkdtemp_malloc("/tmp/test-dev-setupXXXXXX", &p));
 
         f = prefix_roota(p, "/run/systemd");
-        assert_se(mkdir_p(f, 0755) >= 0);
+        ASSERT_OK(mkdir_p(f, 0755));
 
-        assert_se(make_inaccessible_nodes(f, 1, 1) >= 0);
-        assert_se(make_inaccessible_nodes(f, 1, 1) >= 0); /* 2nd call should be a clean NOP */
+        ASSERT_OK(make_inaccessible_nodes(f, 1, 1));
+        ASSERT_OK(make_inaccessible_nodes(f, 1, 1)); /* 2nd call should be a clean NOP */
 
         f = prefix_roota(p, "/run/systemd/inaccessible/reg");
-        assert_se(stat(f, &st) >= 0);
-        assert_se(S_ISREG(st.st_mode));
-        assert_se((st.st_mode & 07777) == 0000);
+        ASSERT_OK_ERRNO(stat(f, &st));
+        ASSERT_TRUE(S_ISREG(st.st_mode));
+        ASSERT_EQ((st.st_mode & 07777), 0000U);
 
         f = prefix_roota(p, "/run/systemd/inaccessible/dir");
-        assert_se(stat(f, &st) >= 0);
-        assert_se(S_ISDIR(st.st_mode));
-        assert_se((st.st_mode & 07777) == 0000);
+        ASSERT_OK_ERRNO(stat(f, &st));
+        ASSERT_TRUE(S_ISDIR(st.st_mode));
+        ASSERT_EQ((st.st_mode & 07777), 0000U);
 
         f = prefix_roota(p, "/run/systemd/inaccessible/fifo");
-        assert_se(stat(f, &st) >= 0);
-        assert_se(S_ISFIFO(st.st_mode));
-        assert_se((st.st_mode & 07777) == 0000);
+        ASSERT_OK_ERRNO(stat(f, &st));
+        ASSERT_TRUE(S_ISFIFO(st.st_mode));
+        ASSERT_EQ((st.st_mode & 07777), 0000U);
 
         f = prefix_roota(p, "/run/systemd/inaccessible/sock");
-        assert_se(stat(f, &st) >= 0);
-        assert_se(S_ISSOCK(st.st_mode));
-        assert_se((st.st_mode & 07777) == 0000);
+        ASSERT_OK_ERRNO(stat(f, &st));
+        ASSERT_TRUE(S_ISSOCK(st.st_mode));
+        ASSERT_EQ((st.st_mode & 07777), 0000U);
 
         f = prefix_roota(p, "/run/systemd/inaccessible/chr");
         if (stat(f, &st) < 0)
-                assert_se(errno == ENOENT);
+                ASSERT_EQ(errno, ENOENT);
         else {
-                assert_se(S_ISCHR(st.st_mode));
-                assert_se((st.st_mode & 07777) == 0000);
+                ASSERT_TRUE(S_ISCHR(st.st_mode));
+                ASSERT_EQ((st.st_mode & 07777), 0000U);
         }
 
         f = prefix_roota(p, "/run/systemd/inaccessible/blk");
         if (stat(f, &st) < 0)
-                assert_se(errno == ENOENT);
+                ASSERT_EQ(errno, ENOENT);
         else {
-                assert_se(S_ISBLK(st.st_mode));
-                assert_se((st.st_mode & 07777) == 0000);
+                ASSERT_TRUE(S_ISBLK(st.st_mode));
+                ASSERT_EQ((st.st_mode & 07777), 0000U);
         }
 
         return EXIT_SUCCESS;