diff --git a/tests/src/collectionbackend_test.cpp b/tests/src/collectionbackend_test.cpp
index e2a90c98c..8a5f1d816 100644
--- a/tests/src/collectionbackend_test.cpp
+++ b/tests/src/collectionbackend_test.cpp
@@ -21,7 +21,7 @@
 
 #include <memory>
 
-#include <gtest/gtest.h>
+#include "gtest_include.h"
 
 #include <QFileInfo>
 #include <QSignalSpy>
diff --git a/tests/src/collectionmodel_test.cpp b/tests/src/collectionmodel_test.cpp
index 5778bd455..71404630f 100644
--- a/tests/src/collectionmodel_test.cpp
+++ b/tests/src/collectionmodel_test.cpp
@@ -21,7 +21,7 @@
 
 #include <memory>
 
-#include <gtest/gtest.h>
+#include "gtest_include.h"
 
 #include <QMap>
 #include <QString>
diff --git a/tests/src/concurrentrun_test.cpp b/tests/src/concurrentrun_test.cpp
index ec7b40c2f..9b817e7e4 100644
--- a/tests/src/concurrentrun_test.cpp
+++ b/tests/src/concurrentrun_test.cpp
@@ -1,6 +1,6 @@
 #include <functional>
 
-#include <gtest/gtest.h>
+#include "gtest_include.h"
 
 #include <QtConcurrentRun>
 #include <QThreadPool>
diff --git a/tests/src/gmock_include.h b/tests/src/gmock_include.h
new file mode 100644
index 000000000..98ddda8f6
--- /dev/null
+++ b/tests/src/gmock_include.h
@@ -0,0 +1,8 @@
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcpp"
+#endif
+#include <gmock/gmock.h>
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
diff --git a/tests/src/gtest_include.h b/tests/src/gtest_include.h
new file mode 100644
index 000000000..cc14bd548
--- /dev/null
+++ b/tests/src/gtest_include.h
@@ -0,0 +1,8 @@
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcpp"
+#endif
+#include <gtest/gtest.h>
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
diff --git a/tests/src/logging_env.h b/tests/src/logging_env.h
index dd82a476c..0d1f8d165 100644
--- a/tests/src/logging_env.h
+++ b/tests/src/logging_env.h
@@ -21,7 +21,7 @@
 #ifndef LOGGING_ENV_H
 #define LOGGING_ENV_H
 
-#include <gtest/gtest.h>
+#include "gtest_include.h"
 
 #include "core/logging.h"
 
diff --git a/tests/src/main.cpp b/tests/src/main.cpp
index dc9b0a1a1..2e856d6a7 100644
--- a/tests/src/main.cpp
+++ b/tests/src/main.cpp
@@ -18,7 +18,7 @@
  *
  */
 
-#include <gmock/gmock.h>
+#include "gmock_include.h"
 
 #ifdef GUI
 #  include <QApplication>
diff --git a/tests/src/mergedproxymodel_test.cpp b/tests/src/mergedproxymodel_test.cpp
index 9258dfcfc..2571ed93c 100644
--- a/tests/src/mergedproxymodel_test.cpp
+++ b/tests/src/mergedproxymodel_test.cpp
@@ -19,7 +19,8 @@
  */
 
 
-#include "gtest/gtest.h"
+#include "gtest_include.h"
+
 #include "test_utils.h"
 #include "core/mergedproxymodel.h"
 
diff --git a/tests/src/metatypes_env.h b/tests/src/metatypes_env.h
index 61cdf1fe2..ef83fe822 100644
--- a/tests/src/metatypes_env.h
+++ b/tests/src/metatypes_env.h
@@ -21,7 +21,7 @@
 #ifndef METATYPES_ENV_H
 #define METATYPES_ENV_H
 
-#include <gtest/gtest.h>
+#include "gtest_include.h"
 
 #include <QMetaType>
 #include <QModelIndex>
diff --git a/tests/src/mock_collectionbackend.h b/tests/src/mock_collectionbackend.h
index 6fe8a350a..4fb63d726 100644
--- a/tests/src/mock_collectionbackend.h
+++ b/tests/src/mock_collectionbackend.h
@@ -21,7 +21,7 @@
 #ifndef MOCKCOLLECTIONBACKEND_H
 #define MOCKCOLLECTIONBACKEND_H
 
-#include <gmock/gmock.h>
+#include "gmock_include.h"
 
 #include "collection/collectionbackend.h"
 
diff --git a/tests/src/mock_networkaccessmanager.h b/tests/src/mock_networkaccessmanager.h
index d549860c3..ed328ca4c 100644
--- a/tests/src/mock_networkaccessmanager.h
+++ b/tests/src/mock_networkaccessmanager.h
@@ -21,7 +21,7 @@
 #ifndef MOCK_NETWORKACCESSMANAGER_H
 #define MOCK_NETWORKACCESSMANAGER_H
 
-#include <gmock/gmock.h>
+#include "gmock_include.h"
 
 #include <QtGlobal>
 #include <QMap>
diff --git a/tests/src/mock_playlistitem.h b/tests/src/mock_playlistitem.h
index 5124dbac7..4f2e8f3bf 100644
--- a/tests/src/mock_playlistitem.h
+++ b/tests/src/mock_playlistitem.h
@@ -21,7 +21,7 @@
 #ifndef MOCK_PLAYLISTITEM_H
 #define MOCK_PLAYLISTITEM_H
 
-#include <gmock/gmock.h>
+#include "gmock_include.h"
 
 #include <QVariant>
 #include <QUrl>
diff --git a/tests/src/mock_settingsprovider.h b/tests/src/mock_settingsprovider.h
index dfa1b9d01..c34775f12 100644
--- a/tests/src/mock_settingsprovider.h
+++ b/tests/src/mock_settingsprovider.h
@@ -21,7 +21,7 @@
 #ifndef MOCK_SETTINGSPROVIDER_H
 #define MOCK_SETTINGSPROVIDER_H
 
-#include <gmock/gmock.h>
+#include "gmock_include.h"
 
 #include "core/settingsprovider.h"
 
diff --git a/tests/src/mutex_protected_test.cpp b/tests/src/mutex_protected_test.cpp
index 8e603c1e0..4976d90a7 100644
--- a/tests/src/mutex_protected_test.cpp
+++ b/tests/src/mutex_protected_test.cpp
@@ -1,4 +1,4 @@
-#include <gtest/gtest.h>
+#include "gtest_include.h"
 
 #include "includes/mutex_protected.h"
 
diff --git a/tests/src/organizeformat_test.cpp b/tests/src/organizeformat_test.cpp
index 76739af00..bb65e56ab 100644
--- a/tests/src/organizeformat_test.cpp
+++ b/tests/src/organizeformat_test.cpp
@@ -19,7 +19,8 @@
  *
  */
 
-#include <gtest/gtest.h>
+#include "gtest_include.h"
+
 #include "test_utils.h"
 
 #include "constants/timeconstants.h"
diff --git a/tests/src/playlist_test.cpp b/tests/src/playlist_test.cpp
index 8ab20d5e0..1f8f0d3dc 100644
--- a/tests/src/playlist_test.cpp
+++ b/tests/src/playlist_test.cpp
@@ -21,7 +21,7 @@
 
 #include <memory>
 
-#include <gtest/gtest.h>
+#include "gtest_include.h"
 
 #include "test_utils.h"
 
diff --git a/tests/src/resources_env.h b/tests/src/resources_env.h
index 27035db1f..6411a4314 100644
--- a/tests/src/resources_env.h
+++ b/tests/src/resources_env.h
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include <gtest/gtest.h>
+#include "gtest_include.h"
 
 #include <QResource>
 
diff --git a/tests/src/songplaylistitem_test.cpp b/tests/src/songplaylistitem_test.cpp
index 858ac779f..c5ab7984f 100644
--- a/tests/src/songplaylistitem_test.cpp
+++ b/tests/src/songplaylistitem_test.cpp
@@ -20,7 +20,7 @@
 
 #include <memory>
 
-#include <gtest/gtest.h>
+#include "gtest_include.h"
 
 #include <QTemporaryFile>
 #include <QFileInfo>
diff --git a/tests/src/sqlite_test.cpp b/tests/src/sqlite_test.cpp
index 1e778b62c..4fbc7812a 100644
--- a/tests/src/sqlite_test.cpp
+++ b/tests/src/sqlite_test.cpp
@@ -1,4 +1,5 @@
-#include <gtest/gtest.h>
+#include "gtest_include.h"
+
 #include <sqlite3.h>
 
 // clazy:excludeall=returning-void-expression
diff --git a/tests/src/tagreader_test.cpp b/tests/src/tagreader_test.cpp
index b1507188f..9ef9c3ff0 100644
--- a/tests/src/tagreader_test.cpp
+++ b/tests/src/tagreader_test.cpp
@@ -19,8 +19,8 @@
 
 #include "config.h"
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "gtest_include.h"
+#include "gmock_include.h"
 
 #include <QFile>
 #include <QByteArray>
diff --git a/tests/src/utilities_test.cpp b/tests/src/utilities_test.cpp
index cfaf7e945..58162d299 100644
--- a/tests/src/utilities_test.cpp
+++ b/tests/src/utilities_test.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include <gtest/gtest.h>
+#include "gtest_include.h"
 
 #include <QByteArray>
 #include <QString>