diff --git a/Examples/test-suite/enum_forward.i b/Examples/test-suite/enum_forward.i
index 330fd58a9..784f4fb02 100644
--- a/Examples/test-suite/enum_forward.i
+++ b/Examples/test-suite/enum_forward.i
@@ -8,7 +8,7 @@ enum ForwardEnum2 { CCC, DDD };
 %}
 
 %inline %{
-#if defined(__GNUC__)
+#if __GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
 /* ISO C forbids forward references to ‘enum’ types [-Werror=pedantic] */
 #pragma GCC diagnostic ignored "-Wpedantic"
 #endif
diff --git a/Examples/test-suite/enum_macro.i b/Examples/test-suite/enum_macro.i
index de6e93383..c058cdf72 100644
--- a/Examples/test-suite/enum_macro.i
+++ b/Examples/test-suite/enum_macro.i
@@ -2,7 +2,7 @@
 
 %inline %{
 
-#if defined(__GNUC__)
+#if __GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
 /* comma at end of enumerator list [-Werror=pedantic] */
 #pragma GCC diagnostic ignored "-Wpedantic"
 #endif
diff --git a/Examples/test-suite/li_std_auto_ptr.i b/Examples/test-suite/li_std_auto_ptr.i
index daa4b93a4..5fdc5fa35 100644
--- a/Examples/test-suite/li_std_auto_ptr.i
+++ b/Examples/test-suite/li_std_auto_ptr.i
@@ -1,7 +1,7 @@
 %module li_std_auto_ptr
 
 %{
-#if defined(__GNUC__)
+#if __GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations" // auto_ptr deprecation
 #endif
 %}
diff --git a/Examples/test-suite/nested_class.i b/Examples/test-suite/nested_class.i
index 4c908c799..ebfc65f3d 100644
--- a/Examples/test-suite/nested_class.i
+++ b/Examples/test-suite/nested_class.i
@@ -50,7 +50,7 @@
 
 %inline %{
 
-#if defined(__GNUC__)
+#if __GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
 /* ISO C++ prohibits anonymous structs [-Werror=pedantic] */
 #pragma GCC diagnostic ignored "-Wpedantic"
 #endif