diff --git a/test/input.c b/test/input.c
index 6dcbdb7bcf..1898bccf3a 100644
--- a/test/input.c
+++ b/test/input.c
@@ -1826,7 +1826,7 @@ _mieq_test_generate_events(uint32_t start, uint32_t count)
     }
 }
 
-#define mieq_test_generate_events(c) { _mieq_test_generate_events(next, c); next += c; }
+#define mieq_test_generate_events(c) { _mieq_test_generate_events(next, (c)); next += (c); }
 
 static void
 mieq_test(void)
diff --git a/test/misc.c b/test/misc.c
index 957b8c5a53..c1baa06a49 100644
--- a/test/misc.c
+++ b/test/misc.c
@@ -92,10 +92,10 @@ dix_update_desktop_dimensions(void)
 
 #define assert_dimensions(_x, _y, _w, _h) \
     update_desktop_dimensions();          \
-    assert(screenInfo.x == _x);           \
-    assert(screenInfo.y == _y);           \
-    assert(screenInfo.width == _w);       \
-    assert(screenInfo.height == _h);
+    assert(screenInfo.x == (_x));         \
+    assert(screenInfo.y == (_y));         \
+    assert(screenInfo.width == (_w));     \
+    assert(screenInfo.height == (_h));
 
     /* single screen */
     screenInfo.numScreens = 1;
diff --git a/test/signal-logging.c b/test/signal-logging.c
index e0122e601b..0aa069d858 100644
--- a/test/signal-logging.c
+++ b/test/signal-logging.c
@@ -194,12 +194,12 @@ static void logging_format(void)
     free(fname);
 
 #define read_log_msg(msg) do {                                  \
-        msg = fgets(read_buf, sizeof(read_buf), f);             \
-        assert(msg != NULL);                                   \
-        msg = strchr(read_buf, ']');                            \
-        assert(msg != NULL);                                    \
-        assert(strlen(msg) > 2);                                \
-        msg = msg + 2; /* advance past [time.stamp] */          \
+        (msg) = fgets(read_buf, sizeof(read_buf), f);           \
+        assert((msg) != NULL);                                  \
+        (msg) = strchr(read_buf, ']');                          \
+        assert((msg) != NULL);                                  \
+        assert(strlen((msg)) > 2);                              \
+        (msg) = (msg) + 2; /* advance past [time.stamp] */      \
     } while (0)
 
     /* boring test message */