diff --git a/lib/common/tests/strings/pcmk__parse_ll_range.c b/lib/common/tests/strings/pcmk__parse_ll_range.c
index 1f5ad20e60..d94a9e36bb 100644
--- a/lib/common/tests/strings/pcmk__parse_ll_range.c
+++ b/lib/common/tests/strings/pcmk__parse_ll_range.c
@@ -1,84 +1,100 @@
 #include <glib.h>
 
 #include <crm_internal.h>
 
 static void
-empty_input_string(void) {
+empty_input_string(void)
+{
     long long start, end;
 
-    g_assert(pcmk__parse_ll_range(NULL, &start, &end) == pcmk_rc_unknown_format);
-    g_assert(pcmk__parse_ll_range("", &start, &end) == pcmk_rc_unknown_format);
+    g_assert_cmpint(pcmk__parse_ll_range(NULL, &start, &end), ==,
+                    pcmk_rc_unknown_format);
+    g_assert_cmpint(pcmk__parse_ll_range("", &start, &end), ==,
+                    pcmk_rc_unknown_format);
 }
 
 static void
-missing_separator(void) {
+missing_separator(void)
+{
     long long start, end;
 
-    g_assert(pcmk__parse_ll_range("1234", &start, &end) == pcmk_rc_ok);
+    g_assert_cmpint(pcmk__parse_ll_range("1234", &start, &end), ==, pcmk_rc_ok);
     g_assert_cmpint(start, ==, 1234);
     g_assert_cmpint(end, ==, 1234);
 }
 
 static void
-only_separator(void) {
+only_separator(void)
+{
     long long start, end;
 
-    g_assert(pcmk__parse_ll_range("-", &start, &end) == pcmk_rc_unknown_format);
+    g_assert_cmpint(pcmk__parse_ll_range("-", &start, &end), ==,
+                    pcmk_rc_unknown_format);
     g_assert_cmpint(start, ==, PCMK__PARSE_INT_DEFAULT);
     g_assert_cmpint(end, ==, PCMK__PARSE_INT_DEFAULT);
 }
 
 static void
-no_range_end(void) {
+no_range_end(void)
+{
     long long start, end;
 
-    g_assert(pcmk__parse_ll_range("2000-", &start, &end) == pcmk_rc_ok);
+    g_assert_cmpint(pcmk__parse_ll_range("2000-", &start, &end), ==,
+                    pcmk_rc_ok);
     g_assert_cmpint(start, ==, 2000);
     g_assert_cmpint(end, ==, PCMK__PARSE_INT_DEFAULT);
 }
 
 static void
-no_range_start(void) {
+no_range_start(void)
+{
     long long start, end;
 
-    g_assert(pcmk__parse_ll_range("-2020", &start, &end) == pcmk_rc_ok);
+    g_assert_cmpint(pcmk__parse_ll_range("-2020", &start, &end), ==,
+                    pcmk_rc_ok);
     g_assert_cmpint(start, ==, PCMK__PARSE_INT_DEFAULT);
     g_assert_cmpint(end, ==, 2020);
 }
 
 static void
-range_start_and_end(void) {
+range_start_and_end(void)
+{
     long long start, end;
 
-    g_assert(pcmk__parse_ll_range("2000-2020", &start, &end) == pcmk_rc_ok);
+    g_assert_cmpint(pcmk__parse_ll_range("2000-2020", &start, &end), ==,
+                    pcmk_rc_ok);
     g_assert_cmpint(start, ==, 2000);
     g_assert_cmpint(end, ==, 2020);
 }
 
 static void
-garbage(void) {
+garbage(void)
+{
     long long start, end;
 
-    g_assert(pcmk__parse_ll_range("2000x-", &start, &end) == pcmk_rc_unknown_format);
+    g_assert_cmpint(pcmk__parse_ll_range("2000x-", &start, &end), ==,
+                    pcmk_rc_unknown_format);
     g_assert_cmpint(start, ==, PCMK__PARSE_INT_DEFAULT);
     g_assert_cmpint(end, ==, PCMK__PARSE_INT_DEFAULT);
 
-    g_assert(pcmk__parse_ll_range("-x2000", &start, &end) == pcmk_rc_unknown_format);
+    g_assert_cmpint(pcmk__parse_ll_range("-x2000", &start, &end), ==,
+                    pcmk_rc_unknown_format);
     g_assert_cmpint(start, ==, PCMK__PARSE_INT_DEFAULT);
     g_assert_cmpint(end, ==, PCMK__PARSE_INT_DEFAULT);
 }
 
-int main(int argc, char **argv) {
+int main(int argc, char **argv)
+{
     g_test_init(&argc, &argv, NULL);
 
     g_test_add_func("/common/strings/range/empty", empty_input_string);
     g_test_add_func("/common/strings/range/no_sep", missing_separator);
     g_test_add_func("/common/strings/range/only_sep", only_separator);
     g_test_add_func("/common/strings/range/no_end", no_range_end);
     g_test_add_func("/common/strings/range/no_start", no_range_start);
     g_test_add_func("/common/strings/range/start_and_end", range_start_and_end);
 
     g_test_add_func("/common/strings/range/garbage", garbage);
 
     return g_test_run();
 }
diff --git a/lib/common/tests/strings/pcmk__str_any_of.c b/lib/common/tests/strings/pcmk__str_any_of.c
index 44cc329f63..0a45638a9d 100644
--- a/lib/common/tests/strings/pcmk__str_any_of.c
+++ b/lib/common/tests/strings/pcmk__str_any_of.c
@@ -1,45 +1,45 @@
 #include <glib.h>
 
 #include <crm_internal.h>
 
 static void
 empty_input_list(void) {
-    g_assert(pcmk__strcase_any_of("xxx", NULL) == false);
-    g_assert(pcmk__str_any_of("xxx", NULL) == false);
-    g_assert(pcmk__strcase_any_of("", NULL) == false);
-    g_assert(pcmk__str_any_of("", NULL) == false);
+    g_assert_false(pcmk__strcase_any_of("xxx", NULL));
+    g_assert_false(pcmk__str_any_of("xxx", NULL));
+    g_assert_false(pcmk__strcase_any_of("", NULL));
+    g_assert_false(pcmk__str_any_of("", NULL));
 }
 
 static void
 empty_string(void) {
-    g_assert(pcmk__strcase_any_of("", "xxx", "yyy", NULL) == false);
-    g_assert(pcmk__str_any_of("", "xxx", "yyy", NULL) == false);
-    g_assert(pcmk__strcase_any_of(NULL, "xxx", "yyy", NULL) == false);
-    g_assert(pcmk__str_any_of(NULL, "xxx", "yyy", NULL) == false);
+    g_assert_false(pcmk__strcase_any_of("", "xxx", "yyy", NULL));
+    g_assert_false(pcmk__str_any_of("", "xxx", "yyy", NULL));
+    g_assert_false(pcmk__strcase_any_of(NULL, "xxx", "yyy", NULL));
+    g_assert_false(pcmk__str_any_of(NULL, "xxx", "yyy", NULL));
 }
 
 static void
 in_list(void) {
-    g_assert(pcmk__strcase_any_of("xxx", "aaa", "bbb", "xxx", NULL) == true);
-    g_assert(pcmk__str_any_of("xxx", "aaa", "bbb", "xxx", NULL) == true);
-    g_assert(pcmk__strcase_any_of("XXX", "aaa", "bbb", "xxx", NULL) == true);
-    g_assert(pcmk__str_any_of("XXX", "aaa", "bbb", "xxx", NULL) == false);
+    g_assert_true(pcmk__strcase_any_of("xxx", "aaa", "bbb", "xxx", NULL));
+    g_assert_true(pcmk__str_any_of("xxx", "aaa", "bbb", "xxx", NULL));
+    g_assert_true(pcmk__strcase_any_of("XXX", "aaa", "bbb", "xxx", NULL));
 }
 
 static void
 not_in_list(void) {
-    g_assert(pcmk__strcase_any_of("xxx", "aaa", "bbb", NULL) == false);
-    g_assert(pcmk__str_any_of("xxx", "aaa", "bbb", NULL) == false);
-    g_assert(pcmk__str_any_of("AAA", "aaa", "bbb", NULL) == false);
+    g_assert_false(pcmk__strcase_any_of("xxx", "aaa", "bbb", NULL));
+    g_assert_false(pcmk__str_any_of("xxx", "aaa", "bbb", NULL));
+    g_assert_false(pcmk__str_any_of("AAA", "aaa", "bbb", NULL));
 }
 
-int main(int argc, char **argv) {
+int main(int argc, char **argv)
+{
     g_test_init(&argc, &argv, NULL);
 
     g_test_add_func("/common/strings/any_of/empty_list", empty_input_list);
     g_test_add_func("/common/strings/any_of/empty_string", empty_string);
     g_test_add_func("/common/strings/any_of/in", in_list);
     g_test_add_func("/common/strings/any_of/not_in", not_in_list);
 
     return g_test_run();
 }
diff --git a/lib/common/tests/utils/pcmk_str_is_infinity.c b/lib/common/tests/utils/pcmk_str_is_infinity.c
index d790921d97..72e26cb195 100644
--- a/lib/common/tests/utils/pcmk_str_is_infinity.c
+++ b/lib/common/tests/utils/pcmk_str_is_infinity.c
@@ -1,48 +1,54 @@
 #include <glib.h>
 
 #include <crm_internal.h>
 
 static void
-uppercase_str_passes(void) {
-    g_assert(pcmk_str_is_infinity("INFINITY") == TRUE);
-    g_assert(pcmk_str_is_infinity("+INFINITY") == TRUE);
+uppercase_str_passes(void)
+{
+    g_assert_true(pcmk_str_is_infinity("INFINITY"));
+    g_assert_true(pcmk_str_is_infinity("+INFINITY"));
 }
 
 static void
-mixed_case_str_fails(void) {
-    g_assert(pcmk_str_is_infinity("infinity") == FALSE);
-    g_assert(pcmk_str_is_infinity("+infinity") == FALSE);
-    g_assert(pcmk_str_is_infinity("Infinity") == FALSE);
-    g_assert(pcmk_str_is_infinity("+Infinity") == FALSE);
+mixed_case_str_fails(void)
+{
+    g_assert_false(pcmk_str_is_infinity("infinity"));
+    g_assert_false(pcmk_str_is_infinity("+infinity"));
+    g_assert_false(pcmk_str_is_infinity("Infinity"));
+    g_assert_false(pcmk_str_is_infinity("+Infinity"));
 }
 
 static void
-added_whitespace_fails(void) {
-    g_assert(pcmk_str_is_infinity(" INFINITY") == FALSE);
-    g_assert(pcmk_str_is_infinity("INFINITY ") == FALSE);
-    g_assert(pcmk_str_is_infinity(" INFINITY ") == FALSE);
-    g_assert(pcmk_str_is_infinity("+ INFINITY") == FALSE);
+added_whitespace_fails(void)
+{
+    g_assert_false(pcmk_str_is_infinity(" INFINITY"));
+    g_assert_false(pcmk_str_is_infinity("INFINITY "));
+    g_assert_false(pcmk_str_is_infinity(" INFINITY "));
+    g_assert_false(pcmk_str_is_infinity("+ INFINITY"));
 }
 
 static void
-empty_str_fails(void) {
-    g_assert(pcmk_str_is_infinity(NULL) == FALSE);
-    g_assert(pcmk_str_is_infinity("") == FALSE);
+empty_str_fails(void)
+{
+    g_assert_false(pcmk_str_is_infinity(NULL));
+    g_assert_false(pcmk_str_is_infinity(""));
 }
 
 static void
-minus_infinity_fails(void) {
-    g_assert(pcmk_str_is_infinity("-INFINITY") == FALSE);
+minus_infinity_fails(void)
+{
+    g_assert_false(pcmk_str_is_infinity("-INFINITY"));
 }
 
-int main(int argc, char **argv) {
+int main(int argc, char **argv)
+{
     g_test_init(&argc, &argv, NULL);
 
     g_test_add_func("/common/utils/infinity/uppercase", uppercase_str_passes);
     g_test_add_func("/common/utils/infinity/mixed_case", mixed_case_str_fails);
     g_test_add_func("/common/utils/infinity/whitespace", added_whitespace_fails);
     g_test_add_func("/common/utils/infinity/empty", empty_str_fails);
     g_test_add_func("/common/utils/infinity/minus_infinity", minus_infinity_fails);
 
     return g_test_run();
 }
diff --git a/lib/common/tests/utils/pcmk_str_is_minus_infinity.c b/lib/common/tests/utils/pcmk_str_is_minus_infinity.c
index 7dab4c5c0d..fe8b080fbe 100644
--- a/lib/common/tests/utils/pcmk_str_is_minus_infinity.c
+++ b/lib/common/tests/utils/pcmk_str_is_minus_infinity.c
@@ -1,45 +1,51 @@
 #include <glib.h>
 
 #include <crm_internal.h>
 
 static void
-uppercase_str_passes(void) {
-    g_assert(pcmk_str_is_minus_infinity("-INFINITY") == TRUE);
+uppercase_str_passes(void)
+{
+    g_assert_true(pcmk_str_is_minus_infinity("-INFINITY"));
 }
 
 static void
-mixed_case_str_fails(void) {
-    g_assert(pcmk_str_is_minus_infinity("-infinity") == FALSE);
-    g_assert(pcmk_str_is_minus_infinity("-Infinity") == FALSE);
+mixed_case_str_fails(void)
+{
+    g_assert_false(pcmk_str_is_minus_infinity("-infinity"));
+    g_assert_false(pcmk_str_is_minus_infinity("-Infinity"));
 }
 
 static void
-added_whitespace_fails(void) {
-    g_assert(pcmk_str_is_minus_infinity(" -INFINITY") == FALSE);
-    g_assert(pcmk_str_is_minus_infinity("-INFINITY ") == FALSE);
-    g_assert(pcmk_str_is_minus_infinity(" -INFINITY ") == FALSE);
-    g_assert(pcmk_str_is_minus_infinity("- INFINITY") == FALSE);
+added_whitespace_fails(void)
+{
+    g_assert_false(pcmk_str_is_minus_infinity(" -INFINITY"));
+    g_assert_false(pcmk_str_is_minus_infinity("-INFINITY "));
+    g_assert_false(pcmk_str_is_minus_infinity(" -INFINITY "));
+    g_assert_false(pcmk_str_is_minus_infinity("- INFINITY"));
 }
 
 static void
-empty_str_fails(void) {
-    g_assert(pcmk_str_is_minus_infinity(NULL) == FALSE);
-    g_assert(pcmk_str_is_minus_infinity("") == FALSE);
+empty_str_fails(void)
+{
+    g_assert_false(pcmk_str_is_minus_infinity(NULL));
+    g_assert_false(pcmk_str_is_minus_infinity(""));
 }
 
 static void
-infinity_fails(void) {
-    g_assert(pcmk_str_is_minus_infinity("INFINITY") == FALSE);
+infinity_fails(void)
+{
+    g_assert_false(pcmk_str_is_minus_infinity("INFINITY"));
 }
 
-int main(int argc, char **argv) {
+int main(int argc, char **argv)
+{
     g_test_init(&argc, &argv, NULL);
 
     g_test_add_func("/common/utils/minus_infinity/uppercase", uppercase_str_passes);
     g_test_add_func("/common/utils/minus_infinity/mixed_case", mixed_case_str_fails);
     g_test_add_func("/common/utils/minus_infinity/whitespace", added_whitespace_fails);
     g_test_add_func("/common/utils/minus_infinity/empty", empty_str_fails);
     g_test_add_func("/common/utils/minus_infinity/infinity", infinity_fails);
 
     return g_test_run();
 }