diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 307dcf48..b2694924 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,17 +1,21 @@
-include_directories(
-  ${PROJECT_SOURCE_DIR}/test/gtest/include
-  ${PROJECT_SOURCE_DIR}/test/gtest
-  ${PROJECT_SOURCE_DIR}/test
-)
-
 # Build gtest
 add_library(gtest STATIC gtest/src/gtest-all.cc)
 add_library(gtest_main STATIC gtest/src/gtest_main.cc)
+target_include_directories(gtest 
+  SYSTEM PUBLIC
+  ${PROJECT_SOURCE_DIR}/test/gtest/include
+  ${PROJECT_SOURCE_DIR}/test/gtest
+)
 
 target_link_libraries(gtest_main gtest)
+set_property(TARGET gtest_main PROPERTY CXX_STANDARD ${c++standard})
+set_property(TARGET gtest PROPERTY CXX_STANDARD ${c++standard})
 set(GTEST_LIBRARY "${PROJECT_BINARY_DIR}/test/libgtest.a")
 set(GTEST_MAIN_LIBRARY "${PROJECT_BINARY_DIR}/test/libgtest_main.a")
 
+execute_process(COMMAND cmake -E remove_directory ${CMAKE_BINARY_DIR}/test_results)
+execute_process(COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test_results)
+
 add_subdirectory(integration)
 add_subdirectory(performance)
 add_subdirectory(regression)
diff --git a/test/integration/CMakeLists.txt b/test/integration/CMakeLists.txt
index 696247ee..7ce88421 100644
--- a/test/integration/CMakeLists.txt
+++ b/test/integration/CMakeLists.txt
@@ -9,6 +9,7 @@ ign_build_tests(
   TYPE INTEGRATION
   SOURCES ${tests}
   LIB_DEPS ignition-common${IGN_COMMON_VER}-testing
+  INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/test
 )
 
 if(TARGET INTEGRATION_plugin)
diff --git a/test/performance/CMakeLists.txt b/test/performance/CMakeLists.txt
index bde3835b..ab0c4247 100644
--- a/test/performance/CMakeLists.txt
+++ b/test/performance/CMakeLists.txt
@@ -11,7 +11,8 @@ link_directories(${PROJECT_BINARY_DIR}/test)
 
 ign_build_tests(
   TYPE PERFORMANCE
-  SOURCES ${tests})
+  SOURCES ${tests}
+  INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/test)
   
 if(TARGET PERFORMANCE_plugin_specialization)
   # We add this dependency to make sure that DummyPlugins gets generated