diff --git a/include/rapidjson/schema.h b/include/rapidjson/schema.h
index 43f16e3..d480778 100644
--- a/include/rapidjson/schema.h
+++ b/include/rapidjson/schema.h
@@ -18,6 +18,12 @@
 #include "document.h"
 #include <cmath> // HUGE_VAL, fmod
 
+#if defined(__GNUC__)
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(effc++)
+RAPIDJSON_DIAG_OFF(float-equal)
+#endif
+
 RAPIDJSON_NAMESPACE_BEGIN
 
 template <typename Encoding>
@@ -862,4 +868,8 @@ typedef GenericSchemaValidator<UTF8<> > SchemaValidator;
 
 RAPIDJSON_NAMESPACE_END
 
+#if defined(__GNUC__)
+RAPIDJSON_DIAG_POP
+#endif
+
 #endif // RAPIDJSON_SCHEMA_H_
diff --git a/test/unittest/schematest.cpp b/test/unittest/schematest.cpp
index 1709bf9..ee8ce8a 100644
--- a/test/unittest/schematest.cpp
+++ b/test/unittest/schematest.cpp
@@ -26,7 +26,10 @@ using namespace rapidjson;
     Document d;\
     d.Parse(json);\
     EXPECT_FALSE(d.HasParseError());\
-    EXPECT_EQ(expected, d.Accept(validator));\
+    if (expected)\
+        EXPECT_TRUE(d.Accept(validator));\
+    else\
+        EXPECT_FALSE(d.Accept(validator));\
 }
 
 TEST(SchemaValidator, Typeless) {