diff --git a/tools/configure b/tools/configure
index 7c07b14c90..0bd0747af5 100755
--- a/tools/configure
+++ b/tools/configure
@@ -4609,7 +4609,7 @@ else
  if test "$gccnum" -ge "601"; then
    # gcc 6 adds a lot of warnings that while useful are too time-consuming
    # to clean up right away
-   GCCOPTS="$GCCOPTS -Wno-shift-negative-value -Wno-nonnull-compare -Wno-tautological-compare"
+   GCCOPTS="$GCCOPTS -Wno-tautological-compare"
  fi
 
  if test "$gccnum" -ge "700"; then