diff --git a/src/plugins/clangcodemodel/test/data/completion/completion.pro b/src/plugins/clangcodemodel/test/data/completion/completion.pro
index 832b9aac07f..a249b163393 100644
--- a/src/plugins/clangcodemodel/test/data/completion/completion.pro
+++ b/src/plugins/clangcodemodel/test/data/completion/completion.pro
@@ -27,7 +27,7 @@ SOURCES = \
     privateFuncDefCompletion.cpp \
     signalCompletion.cpp
 
-QMAKE_CXXFLAGS += -ffoo
+QMAKE_CXXFLAGS += -broken
 
 HEADERS = mainwindow.h
 FORMS = mainwindow.ui
diff --git a/src/plugins/clangcodemodel/test/data/find-usages/find-usages.pro b/src/plugins/clangcodemodel/test/data/find-usages/find-usages.pro
index cf511fee40a..e2b4ace37b3 100644
--- a/src/plugins/clangcodemodel/test/data/find-usages/find-usages.pro
+++ b/src/plugins/clangcodemodel/test/data/find-usages/find-usages.pro
@@ -2,4 +2,4 @@ TEMPLATE = app
 QT = core
 HEADERS = defs.h
 SOURCES = main.cpp
-QMAKE_CXXFLAGS += -ffoo
+QMAKE_CXXFLAGS += -broken
diff --git a/src/plugins/clangcodemodel/test/data/follow-symbol/follow-symbol.pro b/src/plugins/clangcodemodel/test/data/follow-symbol/follow-symbol.pro
index 8b0d6d1879b..9f9dee988b3 100644
--- a/src/plugins/clangcodemodel/test/data/follow-symbol/follow-symbol.pro
+++ b/src/plugins/clangcodemodel/test/data/follow-symbol/follow-symbol.pro
@@ -2,4 +2,4 @@ TEMPLATE = app
 CONFIG -= qt
 HEADERS = cursor.h header.h
 SOURCES = cursor.cpp main.cpp
-QMAKE_CXXFLAGS += -ffoo
+QMAKE_CXXFLAGS += -broken
diff --git a/src/plugins/clangcodemodel/test/data/highlighting/highlighting.pro b/src/plugins/clangcodemodel/test/data/highlighting/highlighting.pro
index 32196b9724f..33722d7d67b 100644
--- a/src/plugins/clangcodemodel/test/data/highlighting/highlighting.pro
+++ b/src/plugins/clangcodemodel/test/data/highlighting/highlighting.pro
@@ -1,4 +1,4 @@
 TEMPLATE = app
 CONFIG -= qt
 SOURCES = highlighting.cpp
-QMAKE_CXXFLAGS += -ffoo
+QMAKE_CXXFLAGS += -broken
diff --git a/src/plugins/clangcodemodel/test/data/local-references/local-references.pro b/src/plugins/clangcodemodel/test/data/local-references/local-references.pro
index f47c1c68154..3fa3891018a 100644
--- a/src/plugins/clangcodemodel/test/data/local-references/local-references.pro
+++ b/src/plugins/clangcodemodel/test/data/local-references/local-references.pro
@@ -1,4 +1,4 @@
 TEMPLATE = app
 CONFIG -= qt
 SOURCES = references.cpp
-QMAKE_CXXFLAGS += -ffoo
+QMAKE_CXXFLAGS += -broken
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index ee0a0e3e363..b3c827041f9 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -449,18 +449,14 @@ static QStringList filteredFlags(const QStringList &allFlags, bool considerSysro
                    || a == "-gcc-toolchain" || a == "-target" || a == "-mllvm" || a == "-isystem") {
             if (++i < allFlags.length())
                 filtered << a << allFlags.at(i);
-        } else if (a.startsWith("-m") || a == "-Os" || a == "-O0" || a == "-O1" || a == "-O2"
-                   || a == "-O3" || a == "-ffinite-math-only" || a == "-fshort-double"
-                   || a == "-fshort-wchar" || a == "-fsignaling-nans" || a == "-fno-inline"
-                   || a == "-fno-exceptions" || a == "-fstack-protector"
-                   || a == "-fstack-protector-all" || a == "-fsanitize=address"
-                   || a == "-fno-rtti" || a.startsWith("-std=") || a.startsWith("-stdlib=")
+        } else if (a.startsWith("-m") || a.startsWith("-f") || a.startsWith("-O")
+                   || a.startsWith("-std=") || a.startsWith("-stdlib=")
                    || a.startsWith("-specs=") || a == "-ansi" || a == "-undef"
-                   || a.startsWith("-D") || a.startsWith("-U") || a == "-fopenmp"
-                   || a == "-Wno-deprecated" || a == "-fPIC" || a == "-fpic" || a == "-fPIE"
-                   || a == "-fpie" || a.startsWith("-stdlib=") || a.startsWith("-B")
+                   || a.startsWith("-D") || a.startsWith("-U")
+                   || a.startsWith("-stdlib=") || a.startsWith("-B")
                    || a.startsWith("--target=")
                    || (a.startsWith("-isystem") && a.length() > 8)
+                   || a == "-Wno-deprecated"
                    || a == "-nostdinc" || a == "-nostdinc++") {
             filtered << a;
         }