diff --git a/src/test/check_getdns.c b/src/test/check_getdns.c
index 8e39fe6e..a437374d 100644
--- a/src/test/check_getdns.c
+++ b/src/test/check_getdns.c
@@ -30,10 +30,14 @@
 #include <string.h>
 #include <inttypes.h>
 #include <unistd.h>
+#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
+#endif
 #include <check.h>
+#ifdef __clang__
 #pragma clang diagnostic pop
+#endif
 #include "getdns/getdns.h"
 #include "check_getdns_common.h"
 #include "check_getdns_address.h"
diff --git a/src/test/check_getdns_common.c b/src/test/check_getdns_common.c
index 5a1409ad..8fe9f8c6 100644
--- a/src/test/check_getdns_common.c
+++ b/src/test/check_getdns_common.c
@@ -29,10 +29,14 @@
 #include <stdlib.h>
 #include <string.h>
 #include <inttypes.h>
+#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
+#endif
 #include <check.h>
+#ifdef __clang__
 #pragma clang diagnostic pop
+#endif
 #include "getdns/getdns.h"
 #include "config.h"
 #include "check_getdns_common.h"
diff --git a/src/test/check_getdns_context_set_timeout.h b/src/test/check_getdns_context_set_timeout.h
index c4ab14b8..fe89ee0f 100644
--- a/src/test/check_getdns_context_set_timeout.h
+++ b/src/test/check_getdns_context_set_timeout.h
@@ -27,10 +27,14 @@
 #ifndef _check_getdns_context_set_timeout_h_
 #define _check_getdns_context_set_timeout_h_
 
+#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
+#endif
 #include <check.h>
+#ifdef __clang__
 #pragma clang diagnostic pop
+#endif
 
 Suite *
 getdns_context_set_timeout_suite (void);
diff --git a/src/test/check_getdns_libev.c b/src/test/check_getdns_libev.c
index 0939f083..ffdc6e22 100644
--- a/src/test/check_getdns_libev.c
+++ b/src/test/check_getdns_libev.c
@@ -41,10 +41,14 @@
 #else
 #include <ev.h>
 #endif
+#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
+#endif
 #include <check.h>
+#ifdef __clang__
 #pragma clang diagnostic pop
+#endif
 #include "check_getdns_common.h"
 
 void run_event_loop_impl(struct getdns_context* context, void* eventloop) {
diff --git a/src/test/check_getdns_libevent.c b/src/test/check_getdns_libevent.c
index d3bd4f69..ee59854b 100644
--- a/src/test/check_getdns_libevent.c
+++ b/src/test/check_getdns_libevent.c
@@ -37,10 +37,14 @@
 
 #include "getdns/getdns_ext_libevent.h"
 #include "check_getdns_libevent.h"
+#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
+#endif
 #include <check.h>
+#ifdef __clang__
 #pragma clang diagnostic pop
+#endif
 #include "check_getdns_common.h"
 
 void run_event_loop_impl(struct getdns_context* context, void* eventloop) {
diff --git a/src/test/check_getdns_libuv.c b/src/test/check_getdns_libuv.c
index 722406e7..7aa88b51 100644
--- a/src/test/check_getdns_libuv.c
+++ b/src/test/check_getdns_libuv.c
@@ -37,10 +37,14 @@
 
 #include "getdns/getdns_ext_libuv.h"
 #include <uv.h>
+#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
+#endif
 #include <check.h>
+#ifdef __clang__
 #pragma clang diagnostic pop
+#endif
 #include "check_getdns_common.h"
 
 void run_event_loop_impl(struct getdns_context* context, void* eventloop) {
diff --git a/src/test/check_getdns_transport.h b/src/test/check_getdns_transport.h
index 6a18d0de..a5496a27 100644
--- a/src/test/check_getdns_transport.h
+++ b/src/test/check_getdns_transport.h
@@ -27,10 +27,14 @@
 #ifndef _check_getdns_transport_h_
 #define _check_getdns_transport_h_
 
+#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
+#endif
 #include <check.h>
+#ifdef __clang__
 #pragma clang diagnostic pop
+#endif
 
 Suite *
 getdns_transport_suite (void);