diff --git a/lib/common/tests/utils/Makefile.am b/lib/common/tests/utils/Makefile.am
index 6486e57e8a..2cf35a3453 100644
--- a/lib/common/tests/utils/Makefile.am
+++ b/lib/common/tests/utils/Makefile.am
@@ -1,38 +1,39 @@
 #
 # 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 \
+	compare_version_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/compare_version_test.c b/lib/common/tests/utils/compare_version_test.c
new file mode 100644
index 0000000000..b380ea49c5
--- /dev/null
+++ b/lib/common/tests/utils/compare_version_test.c
@@ -0,0 +1,66 @@
+/*
+ * 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 <stdarg.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <setjmp.h>
+#include <cmocka.h>
+
+static void
+empty_params(void **state)
+{
+    assert_int_equal(compare_version(NULL, NULL), 0);
+    assert_int_equal(compare_version(NULL, "abc"), -1);
+    assert_int_equal(compare_version(NULL, "1.0.1"), -1);
+    assert_int_equal(compare_version("abc", NULL), 1);
+    assert_int_equal(compare_version("1.0.1", NULL), 1);
+}
+
+static void
+equal_versions(void **state)
+{
+    assert_int_equal(compare_version("0.4.7", "0.4.7"), 0);
+    assert_int_equal(compare_version("1.0", "1.0"), 0);
+}
+
+static void
+unequal_versions(void **state)
+{
+    assert_int_equal(compare_version("0.4.7", "0.4.8"), -1);
+    assert_int_equal(compare_version("0.4.8", "0.4.7"), 1);
+
+    assert_int_equal(compare_version("0.2.3", "0.3"), -1);
+    assert_int_equal(compare_version("0.3", "0.2.3"), 1);
+
+    assert_int_equal(compare_version("0.99", "1.0"), -1);
+    assert_int_equal(compare_version("1.0", "0.99"), 1);
+}
+
+static void
+shorter_versions(void **state)
+{
+    assert_int_equal(compare_version("1.0", "1.0.1"), -1);
+    assert_int_equal(compare_version("1.0.1", "1.0"), 1);
+}
+
+int main(int argc, char **argv)
+{
+    const struct CMUnitTest tests[] = {
+        cmocka_unit_test(empty_params),
+        cmocka_unit_test(equal_versions),
+        cmocka_unit_test(unequal_versions),
+        cmocka_unit_test(shorter_versions),
+    };
+
+    cmocka_set_message_output(CM_OUTPUT_TAP);
+    return cmocka_run_group_tests(tests, NULL, NULL);
+}