diff --git a/CMake/PickyWarnings.cmake b/CMake/PickyWarnings.cmake
index a711efaea7..57b176c3fe 100644
--- a/CMake/PickyWarnings.cmake
+++ b/CMake/PickyWarnings.cmake
@@ -206,7 +206,6 @@ if(PICKY_COMPILER)
         list(APPEND WPICKY_ENABLE
           -Walloc-zero                     #             gcc  7.0
           -Wduplicated-branches            #             gcc  7.0
-          -Wno-format-overflow             #             gcc  7.0
           -Wformat-truncation=2            #             gcc  7.0
           -Wimplicit-fallthrough           # clang  4.0  gcc  7.0
           -Wrestrict                       #             gcc  7.0
diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4
index 68ff47c602..180b23417a 100644
--- a/m4/curl-compilers.m4
+++ b/m4/curl-compilers.m4
@@ -1076,7 +1076,6 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [
             CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [duplicated-branches])
             CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [restrict])
             CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [alloc-zero])
-            tmp_CFLAGS="$tmp_CFLAGS -Wno-format-overflow"
             tmp_CFLAGS="$tmp_CFLAGS -Wformat-truncation=2"
             tmp_CFLAGS="$tmp_CFLAGS -Wimplicit-fallthrough"
           fi
diff --git a/tests/libtest/lib557.c b/tests/libtest/lib557.c
index 82b7f7f5a9..d715fc575c 100644
--- a/tests/libtest/lib557.c
+++ b/tests/libtest/lib557.c
@@ -41,6 +41,9 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat"
 #pragma GCC diagnostic ignored "-Wformat-extra-args"
+#if !defined(__clang__) && __GNUC__ >= 7
+#pragma GCC diagnostic ignored "-Wformat-overflow"
+#endif
 #endif
 
 #if (SIZEOF_CURL_OFF_T > SIZEOF_LONG)
diff --git a/tests/unit/unit1652.c b/tests/unit/unit1652.c
index 0052d0d680..a67e4c163d 100644
--- a/tests/unit/unit1652.c
+++ b/tests/unit/unit1652.c
@@ -30,6 +30,9 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat"
 #pragma GCC diagnostic ignored "-Wformat-zero-length"
+#if !defined(__clang__) && __GNUC__ >= 7
+#pragma GCC diagnostic ignored "-Wformat-overflow"
+#endif
 #endif
 
 /*