diff --git a/src/core/meta-selection-source-memory.c b/src/core/meta-selection-source-memory.c
index 48f0239d0..b4a3dbaa7 100644
--- a/src/core/meta-selection-source-memory.c
+++ b/src/core/meta-selection-source-memory.c
@@ -86,7 +86,7 @@ meta_unix_input_stream_new (int fd)
 {
   return G_INPUT_STREAM (g_object_new (META_TYPE_UNIX_INPUT_STREAM,
                                        "fd", fd,
-                                       "close-fd", true,
+                                       "close-fd", TRUE,
                                        NULL));
 }
 
diff --git a/src/tests/clutter/conform/gesture-relationship.c b/src/tests/clutter/conform/gesture-relationship.c
index 3da242807..91ae13572 100644
--- a/src/tests/clutter/conform/gesture-relationship.c
+++ b/src/tests/clutter/conform/gesture-relationship.c
@@ -286,7 +286,7 @@ gesture_relationship_two_points_two_actors (void)
   now_us = g_get_monotonic_time ();
 
   clutter_actor_set_size (second_actor, 20, 20);
-  clutter_actor_set_reactive (second_actor, true);
+  clutter_actor_set_reactive (second_actor, TRUE);
   clutter_actor_add_child (stage, second_actor);
 
   clutter_actor_add_action (stage, CLUTTER_ACTION (gesture_1));
@@ -455,7 +455,7 @@ gesture_relationship_claim_new_sequence_while_already_recognizing_2 (void)
   clutter_actor_add_action (stage, CLUTTER_ACTION (gesture_1));
 
   clutter_actor_set_size (second_actor, 20, 20);
-  clutter_actor_set_reactive (second_actor, true);
+  clutter_actor_set_reactive (second_actor, TRUE);
   clutter_actor_add_child (stage, second_actor);
   clutter_actor_add_action (second_actor, CLUTTER_ACTION (gesture_2));
 
diff --git a/src/tests/clutter/conform/gesture.c b/src/tests/clutter/conform/gesture.c
index 1dadf8db6..7d259f61d 100644
--- a/src/tests/clutter/conform/gesture.c
+++ b/src/tests/clutter/conform/gesture.c
@@ -91,7 +91,7 @@ gesture_disposed_while_active (void)
 
   clutter_actor_set_size (second_actor, 20, 20);
   clutter_actor_set_x (second_actor, 15);
-  clutter_actor_set_reactive (second_actor, true);
+  clutter_actor_set_reactive (second_actor, TRUE);
   clutter_actor_add_child (stage, second_actor);
   clutter_actor_add_action (second_actor, CLUTTER_ACTION (gesture));
 
@@ -250,7 +250,7 @@ gesture_state_machine_move_to_cancelled_on_sequence_cancel (void)
   clutter_actor_add_action (stage, CLUTTER_ACTION (gesture));
 
   clutter_actor_set_size (second_actor, 20, 20);
-  clutter_actor_set_reactive (second_actor, true);
+  clutter_actor_set_reactive (second_actor, TRUE);
   clutter_actor_add_child (stage, second_actor);
 
   g_signal_connect (stage, "after-update", G_CALLBACK (on_after_update),
diff --git a/src/tests/test-runner.c b/src/tests/test-runner.c
index 001b7f436..41877335b 100644
--- a/src/tests/test-runner.c
+++ b/src/tests/test-runner.c
@@ -609,17 +609,19 @@ static gboolean
 str_to_bool (const char *str,
              gboolean   *val)
 {
-  if (g_ascii_strcasecmp (str, "true") == 0) {
-    if (val != NULL)
-      *val = true;
-    return TRUE;
-  }
+  if (g_ascii_strcasecmp (str, "true") == 0)
+    {
+      if (val != NULL)
+        *val = TRUE;
+      return TRUE;
+    }
 
-  if (g_ascii_strcasecmp (str, "false") == 0) {
-    if (val != NULL)
-      *val = false;
-    return TRUE;
-  }
+  if (g_ascii_strcasecmp (str, "false") == 0)
+    {
+      if (val != NULL)
+        *val = FALSE;
+      return TRUE;
+    }
 
   return FALSE;
 }