diff --git a/CMakeLists.txt b/CMakeLists.txt
index 958acb0..1bcfd26 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -175,6 +175,10 @@ endif(SQLITECPP_BUILD_EXAMPLES)
 option(SQLITECPP_BUILD_TESTS "Build and run tests." ON)
 if (SQLITECPP_BUILD_TESTS)
     # add the subdirectory containing the CMakeLists.txt for the gtest library
+    if (NOT MSVC)
+        add_definitions(-Wno-variadic-macros -Wno-long-long -Wno-conversion -Wno-switch-enum)
+    endif (NOT MSVC)
+    
     add_subdirectory(googletest) 
     include_directories("${PROJECT_SOURCE_DIR}/googletest/include")
 
diff --git a/tests/Statement_test.cpp b/tests/Statement_test.cpp
index c5950c6..2fb6aea 100644
--- a/tests/Statement_test.cpp
+++ b/tests/Statement_test.cpp
@@ -32,8 +32,8 @@ TEST(Statement, invalid) {
         SQLite::Statement   query(db, "SELECT * FROM test");
         EXPECT_STREQ("SELECT * FROM test", query.getQuery().c_str());
         EXPECT_EQ(2, query.getColumnCount ());
-        EXPECT_EQ(false, query.isOk());
-        EXPECT_EQ(false, query.isDone());
+        EXPECT_FALSE(query.isOk());
+        EXPECT_FALSE(query.isDone());
         EXPECT_THROW(query.isColumnNull(-1), SQLite::Exception);
         EXPECT_THROW(query.isColumnNull(0), SQLite::Exception);
         EXPECT_THROW(query.isColumnNull(1), SQLite::Exception);
@@ -44,15 +44,15 @@ TEST(Statement, invalid) {
         EXPECT_THROW(query.getColumn(2), SQLite::Exception);
 
         query.reset();
-        EXPECT_EQ(false, query.isOk());
-        EXPECT_EQ(false, query.isDone());
+        EXPECT_FALSE(query.isOk());
+        EXPECT_FALSE(query.isDone());
 
         query.exec();
-        EXPECT_EQ(false, query.isOk());
-        EXPECT_EQ(true,  query.isDone());
+        EXPECT_FALSE(query.isOk());
+        EXPECT_TRUE( query.isDone());
         query.reset();
-        EXPECT_EQ(false, query.isOk());
-        EXPECT_EQ(false, query.isDone());
+        EXPECT_FALSE(query.isOk());
+        EXPECT_FALSE(query.isDone());
 
         query.reset();
         EXPECT_THROW(query.bind(-1, 123), SQLite::Exception);