diff --git a/lib/common/tests/options/Makefile.am b/lib/common/tests/options/Makefile.am
index bda3b1127e..a915661c33 100644
--- a/lib/common/tests/options/Makefile.am
+++ b/lib/common/tests/options/Makefile.am
@@ -1,25 +1,26 @@
 #
 # 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 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_test.la \
 	-lcmocka
 AM_CFLAGS = -DPCMK__UNIT_TESTING
 AM_LDFLAGS = $(LDFLAGS_WRAP)
 
 include $(top_srcdir)/mk/tap.mk
 
 # Add "_test" to the end of all test program names to simplify .gitignore.
 check_PROGRAMS = \
 		pcmk__env_option_test \
-		pcmk__set_env_option_test
+		pcmk__set_env_option_test \
+		pcmk__env_option_enabled_test
 
 TESTS = $(check_PROGRAMS)
diff --git a/lib/common/tests/options/pcmk__env_option_enabled_test.c b/lib/common/tests/options/pcmk__env_option_enabled_test.c
new file mode 100644
index 0000000000..4b1ca7102b
--- /dev/null
+++ b/lib/common/tests/options/pcmk__env_option_enabled_test.c
@@ -0,0 +1,109 @@
+/*
+ * 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 <crm/common/unittest_internal.h>
+
+#include "mock_private.h"
+
+static void
+disabled_null_value(void **state)
+{
+    // Return false if option value not found (NULL accomplishes this)
+    assert_false(pcmk__env_option_enabled(NULL, NULL));
+    assert_false(pcmk__env_option_enabled("pacemaker-execd", NULL));
+}
+
+static void
+enabled_true_value(void **state)
+{
+    // Return true if option value is true, with or without daemon name
+    pcmk__mock_getenv = true;
+
+    expect_string(__wrap_getenv, name, "PCMK_env_var");
+    will_return(__wrap_getenv, "true");
+    assert_true(pcmk__env_option_enabled(NULL, "env_var"));
+
+    expect_string(__wrap_getenv, name, "PCMK_env_var");
+    will_return(__wrap_getenv, "true");
+    assert_true(pcmk__env_option_enabled("pacemaker-execd", "env_var"));
+
+    pcmk__mock_getenv = false;
+}
+
+static void
+disabled_false_value(void **state)
+{
+    // Return false if option value is false (no daemon list)
+    pcmk__mock_getenv = true;
+
+    expect_string(__wrap_getenv, name, "PCMK_env_var");
+    will_return(__wrap_getenv, "false");
+    assert_false(pcmk__env_option_enabled(NULL, "env_var"));
+
+    expect_string(__wrap_getenv, name, "PCMK_env_var");
+    will_return(__wrap_getenv, "false");
+    assert_false(pcmk__env_option_enabled("pacemaker-execd", "env_var"));
+
+    pcmk__mock_getenv = false;
+}
+
+static void
+enabled_daemon_in_list(void **state)
+{
+    // Return true if daemon is in the option's value
+    pcmk__mock_getenv = true;
+
+    expect_string(__wrap_getenv, name, "PCMK_env_var");
+    will_return(__wrap_getenv, "pacemaker-execd");
+    assert_true(pcmk__env_option_enabled("pacemaker-execd", "env_var"));
+
+    expect_string(__wrap_getenv, name, "PCMK_env_var");
+    will_return(__wrap_getenv, "pacemaker-execd,pacemaker-fenced");
+    assert_true(pcmk__env_option_enabled("pacemaker-execd", "env_var"));
+
+    expect_string(__wrap_getenv, name, "PCMK_env_var");
+    will_return(__wrap_getenv, "pacemaker-controld,pacemaker-execd");
+    assert_true(pcmk__env_option_enabled("pacemaker-execd", "env_var"));
+
+    expect_string(__wrap_getenv, name, "PCMK_env_var");
+    will_return(__wrap_getenv,
+                "pacemaker-controld,pacemaker-execd,pacemaker-fenced");
+    assert_true(pcmk__env_option_enabled("pacemaker-execd", "env_var"));
+
+    pcmk__mock_getenv = false;
+}
+
+static void
+disabled_daemon_not_in_list(void **state)
+{
+    // Return false if value is not true and daemon is not in the option's value
+    pcmk__mock_getenv = true;
+
+    expect_string(__wrap_getenv, name, "PCMK_env_var");
+    will_return(__wrap_getenv, "pacemaker-controld,pacemaker-fenced");
+    assert_false(pcmk__env_option_enabled("pacemaker-execd", "env_var"));
+
+    pcmk__mock_getenv = false;
+}
+
+int
+main(int argc, char **argv)
+{
+    const struct CMUnitTest tests[] = {
+        cmocka_unit_test(disabled_null_value),
+        cmocka_unit_test(enabled_true_value),
+        cmocka_unit_test(disabled_false_value),
+        cmocka_unit_test(enabled_daemon_in_list),
+        cmocka_unit_test(disabled_daemon_not_in_list),
+    };
+
+    cmocka_set_message_output(CM_OUTPUT_TAP);
+    return cmocka_run_group_tests(tests, NULL, NULL);
+}