diff --git a/src/query/tests/astTest.cpp b/src/query/tests/astTest.cpp
index 7bd1c0bf8e5ecb1e60dad85b31adedcf5dc8b4b1..1143d00e8da9e77cd0f740d98fe77ffd1beac4bc 100644
--- a/src/query/tests/astTest.cpp
+++ b/src/query/tests/astTest.cpp
@@ -10,7 +10,7 @@
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wwrite-strings"
-#pragma GCC diagnostic ignored "-Werror=unused-function"
+#pragma GCC diagnostic ignored "-Wunused-function"
 
 typedef struct ResultObj {
   int32_t numOfResult;
diff --git a/src/query/tests/histogramTest.cpp b/src/query/tests/histogramTest.cpp
index 44a31f4241cf1def491982e9a466dbba6a7e1daf..0266ecffc11348dcd0184030584ed7b721d39aff 100644
--- a/src/query/tests/histogramTest.cpp
+++ b/src/query/tests/histogramTest.cpp
@@ -6,7 +6,9 @@
 #include "taos.h"
 #include "qHistogram.h"
 
-#pragma GCC diagnostic ignored "-Werror=unused-function"
+#pragma GCC diagnostic ignored "-Wunused-function"
+#pragma GCC diagnostic ignored "-Wunused-variable"
+
 namespace {
 void doHistogramAddTest() {
   SHistogramInfo* pHisto = NULL;
diff --git a/src/query/tests/patternMatchTest.cpp b/src/query/tests/patternMatchTest.cpp
index cd242afc848bf99ad69763669c2f5ba480872178..091604c65c0e8b7fcf998fdd69f6f82f101f8157 100644
--- a/src/query/tests/patternMatchTest.cpp
+++ b/src/query/tests/patternMatchTest.cpp
@@ -6,7 +6,8 @@
 #include "qAggMain.h"
 #include "tcompare.h"
 
-#pragma GCC diagnostic ignored "-Werror=unused-function"
+#pragma GCC diagnostic ignored "-Wunused-function"
+#pragma GCC diagnostic ignored "-Wunused-variable"
 
 TEST(testCase, patternMatchTest) {
   SPatternCompareInfo info = PATTERN_COMPARE_INFO_INITIALIZER;
diff --git a/src/query/tests/percentileTest.cpp b/src/query/tests/percentileTest.cpp
index 952129c8e7b335bf99c0e0306e0332cfe37d1bbc..1b6951201af5908378fb253b38cea01de1210d57 100644
--- a/src/query/tests/percentileTest.cpp
+++ b/src/query/tests/percentileTest.cpp
@@ -7,7 +7,8 @@
 
 #include "qPercentile.h"
 
-#pragma GCC diagnostic ignored "-Werror=unused-function"
+#pragma GCC diagnostic ignored "-Wunused-function"
+#pragma GCC diagnostic ignored "-Wunused-variable"
 
 namespace {
 tMemBucket *createBigIntDataBucket(int32_t start, int32_t end) {
diff --git a/src/query/tests/resultBufferTest.cpp b/src/query/tests/resultBufferTest.cpp
index 052e654066ae8db46f0f2f67e0d48d47783ab58c..54ac0bf4e5c78f2fcc7f0e3271eb3409ea072db7 100644
--- a/src/query/tests/resultBufferTest.cpp
+++ b/src/query/tests/resultBufferTest.cpp
@@ -6,7 +6,8 @@
 #include "taos.h"
 #include "tsdb.h"
 
-#pragma GCC diagnostic ignored "-Werror=unused-function"
+#pragma GCC diagnostic ignored "-Wunused-function"
+#pragma GCC diagnostic ignored "-Wunused-variable"
 
 namespace {
 // simple test
diff --git a/src/query/tests/tsBufTest.cpp b/src/query/tests/tsBufTest.cpp
index 30faed1bc27537a8e926f520b73826ffc14cf29b..04c5a152520d08329408253af271c4d43c5c0fe3 100644
--- a/src/query/tests/tsBufTest.cpp
+++ b/src/query/tests/tsBufTest.cpp
@@ -9,7 +9,9 @@
 #include "ttoken.h"
 #include "tutil.h"
 
-#pragma GCC diagnostic ignored "-Werror=unused-function"
+#pragma GCC diagnostic ignored "-Wunused-function"
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 
 namespace {
 /**
diff --git a/src/query/tests/unitTest.cpp b/src/query/tests/unitTest.cpp
index 75153a76ae127ddabcdf4a848f66daaf2f31ef68..fcfed49140d04d19658518544aee7c8937bfc309 100644
--- a/src/query/tests/unitTest.cpp
+++ b/src/query/tests/unitTest.cpp
@@ -6,14 +6,17 @@
 #include "taos.h"
 #include "tsdb.h"
 
+#pragma GCC diagnostic ignored "-Wwrite-strings"
+#pragma GCC diagnostic ignored "-Wunused-function"
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+#pragma GCC diagnostic ignored "-Wsign-compare"
+
 #include "../../client/inc/tscUtil.h"
 #include "tutil.h"
 #include "tvariant.h"
 #include "ttokendef.h"
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wwrite-strings"
-#pragma GCC diagnostic ignored "-Werror=unused-function"
 namespace {
 int32_t testValidateName(char* name) {
   SStrToken token = {0};