diff --git a/lib/common/tests/utils/Makefile.am b/lib/common/tests/utils/Makefile.am
index 1dbbfcd20c..6486e57e8a 100644
--- a/lib/common/tests/utils/Makefile.am
+++ b/lib/common/tests/utils/Makefile.am
@@ -1,34 +1,38 @@
 #
 # Copyright 2020-2022 the Pacemaker project contributors
 #
 # The version control history for this file may have further details.
 #
 # This source code is licensed under the GNU General Public License version 2
 # or later (GPLv2+) WITHOUT ANY WARRANTY.
 #
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/lib/common
 LDADD = $(top_builddir)/lib/common/libcrmcommon.la -lcmocka
 
 include $(top_srcdir)/mk/tap.mk
 
 crm_user_lookup_test_LDADD = $(top_builddir)/lib/common/libcrmcommon_test.la -lcmocka
 crm_user_lookup_test_LDFLAGS = -Wl,--wrap=calloc -Wl,--wrap=getpwnam_r
 
+pcmk_daemon_user_test_LDADD = $(top_builddir)/lib/common/libcrmcommon_test.la -lcmocka
+pcmk_daemon_user_test_LDFLAGS = -Wl,--wrap=getpwnam_r
+
 pcmk_hostname_test_LDADD = $(top_builddir)/lib/common/libcrmcommon_test.la -lcmocka
 pcmk_hostname_test_LDFLAGS = -Wl,--wrap=uname
 
 # Add "_test" to the end of all test program names to simplify .gitignore.
 check_PROGRAMS =	\
 	char2score_test \
 	crm_user_lookup_test \
+	pcmk_daemon_user_test \
 	pcmk_str_is_infinity_test		\
 	pcmk_str_is_minus_infinity_test \
 	score2char_stack_test 	\
 	score2char_test
 
 if WRAPPABLE_UNAME
 check_PROGRAMS += pcmk_hostname_test
 endif
 
 TESTS = $(check_PROGRAMS)
diff --git a/lib/common/tests/utils/pcmk_daemon_user_test.c b/lib/common/tests/utils/pcmk_daemon_user_test.c
new file mode 100644
index 0000000000..b58bf15f42
--- /dev/null
+++ b/lib/common/tests/utils/pcmk_daemon_user_test.c
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2022 the Pacemaker project contributors
+ *
+ * The version control history for this file may have further details.
+ *
+ * This source code is licensed under the GNU Lesser General Public License
+ * version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.
+ */
+
+#include <crm_internal.h>
+#include "mock_private.h"
+
+#include <pwd.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <setjmp.h>
+#include <cmocka.h>
+#include <sys/types.h>
+
+int
+__wrap_getpwnam_r(const char *name, struct passwd *pwd, char *buf, size_t buflen,
+                  struct passwd **result)
+{
+    *result = mock_ptr_type(struct passwd *);
+    return 0;
+}
+
+static void
+no_matching_pwent(void **state)
+{
+    uid_t uid;
+    gid_t gid;
+
+    will_return(__wrap_getpwnam_r, NULL);               // result parameter to getpwnam_r()
+
+    assert_int_equal(pcmk_daemon_user(&uid, &gid), -EINVAL);
+}
+
+static void
+entry_found(void **state)
+{
+    uid_t uid;
+    gid_t gid;
+
+    /* We don't care about any of the other fields of the password entry, so just
+     * leave them blank.
+     */
+    struct passwd returned_ent = { .pw_uid = 1000, .pw_gid = 1000 };
+
+    /* Test getpwnam_r returning a valid passwd entry, but we don't pass uid or gid. */
+
+    will_return_always(__wrap_getpwnam_r, &returned_ent);      // result parameter to getpwnam_r()
+
+    assert_int_equal(pcmk_daemon_user(NULL, NULL), 0);
+
+    /* Test getpwnam_r returning a valid passwd entry, and we do pass uid and gid. */
+
+    assert_int_equal(pcmk_daemon_user(&uid, &gid), 0);
+    assert_int_equal(uid, 1000);
+    assert_int_equal(gid, 1000);
+}
+
+int main(int argc, char **argv)
+{
+    const struct CMUnitTest tests[] = {
+        cmocka_unit_test(no_matching_pwent),
+        cmocka_unit_test(entry_found),
+    };
+
+    cmocka_set_message_output(CM_OUTPUT_TAP);
+    return cmocka_run_group_tests(tests, NULL, NULL);
+}