diff --git a/Applications/DataExplorer/DataView/CMakeLists.txt b/Applications/DataExplorer/DataView/CMakeLists.txt
index ab078450d33b9cfb7b784e51b1fff29ab2615b74..744b1c9f4902d75e0d8b7abc28556a3e1c82d9dd 100644
--- a/Applications/DataExplorer/DataView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/CMakeLists.txt
@@ -110,6 +110,7 @@ include_directories(
     ${SOURCE_DIR_REL}/GeoLib
     ${SOURCE_DIR_REL}/MeshGeoToolsLib
     ${SOURCE_DIR_REL}/MeshLib
+    ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/DiagramView
     ${CMAKE_CURRENT_SOURCE_DIR}/StratView
     ${GUI_SOURCE_DIR_REL}/Base
diff --git a/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
index 2c1b2829949d015105bd75a1090bd77c381c9c9d..5fe4562e3005ed017ac76f3566880b22fcbc4d2d 100644
--- a/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
@@ -24,6 +24,7 @@ include_directories(
     ${SOURCE_DIR_REL}/BaseLib
     ${SOURCE_DIR_REL}/GeoLib
     ${SOURCE_DIR_REL}/MathLib
+    ${CMAKE_CURRENT_SOURCE_DIR}
     ${GUI_SOURCE_DIR_REL}/Base
     ${GUI_SOURCE_DIR_REL}/DataView
     ${CMAKE_CURRENT_BINARY_DIR}/../../DataView
diff --git a/Applications/DataExplorer/DataView/StratView/CMakeLists.txt b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
index 30eb701e1413adfb3933d3c7beea8a7e5fbc759a..4a98b67959554a7f8ffaa8a3723c7250abbfe1b1 100644
--- a/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
@@ -15,6 +15,8 @@ set(HEADERS
 set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../../../..)
 set(GUI_SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../..)
 include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
     ${SOURCE_DIR_REL}/BaseLib
     ${SOURCE_DIR_REL}/GeoLib
     ${SOURCE_DIR_REL}/MathLib
diff --git a/Applications/DataExplorer/VtkAct/CMakeLists.txt b/Applications/DataExplorer/VtkAct/CMakeLists.txt
index 06f2efc7b008bdafb9025fa5962a4669eec98493..0868f2ac068e82b8f1ef5889acaa90c7f64eaca7 100644
--- a/Applications/DataExplorer/VtkAct/CMakeLists.txt
+++ b/Applications/DataExplorer/VtkAct/CMakeLists.txt
@@ -9,6 +9,8 @@ set(HEADERS
 )
 
 include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../BaseLib
     ${CMAKE_CURRENT_SOURCE_DIR}/../../GeoLib
     ${CMAKE_CURRENT_SOURCE_DIR}/../../Applications/FileIO
diff --git a/Applications/DataExplorer/VtkVis/CMakeLists.txt b/Applications/DataExplorer/VtkVis/CMakeLists.txt
index 88d7d6b378062a36144b250515e6cc160922acbb..42679e611893a3a8cc87d39e2627894162b19b13 100644
--- a/Applications/DataExplorer/VtkVis/CMakeLists.txt
+++ b/Applications/DataExplorer/VtkVis/CMakeLists.txt
@@ -99,6 +99,8 @@ source_group("UI Files" FILES ${UIS})
 set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
 set(GUI_SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/..)
 include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
     ${SOURCE_DIR_REL}/Applications/FileIO
     ${SOURCE_DIR_REL}/BaseLib
     ${SOURCE_DIR_REL}/GeoLib
diff --git a/Tests/MaterialLib/TestCapillaryPressureSaturationModel.cpp b/Tests/MaterialLib/TestCapillaryPressureSaturationModel.cpp
index ee83511e85092e3f1f0eb9b8f732dc32db25bd7b..d61523da29983c3db90f80b9db3632a1f964ccac 100644
--- a/Tests/MaterialLib/TestCapillaryPressureSaturationModel.cpp
+++ b/Tests/MaterialLib/TestCapillaryPressureSaturationModel.cpp
@@ -17,7 +17,7 @@
 
 #include "BaseLib/ConfigTree.h"
 
-#include "TestTools.h"
+#include "Tests/TestTools.h"
 
 #include "MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CapillaryPressureSaturation.h"
 #include "MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CreateCapillaryPressureModel.h"
@@ -131,4 +131,4 @@ TEST(MaterialPorousMedium, checkCapillaryPressureCurve)
         else
             ASSERT_NEAR(S[i], pc_model->getSaturation(pc[i]), 1.e-5);
     }
-}
\ No newline at end of file
+}
diff --git a/Tests/MaterialLib/TestFluidDensity.cpp b/Tests/MaterialLib/TestFluidDensity.cpp
index 392890e1555ba42e659de4d230df05ce7998faf8..a9aa4096df354733cdb11c6be2ec2dfe2b5502e1 100644
--- a/Tests/MaterialLib/TestFluidDensity.cpp
+++ b/Tests/MaterialLib/TestFluidDensity.cpp
@@ -15,7 +15,7 @@
 
 #include <memory>
 
-#include "TestTools.h"
+#include "Tests/TestTools.h"
 
 #include "MaterialLib/Fluid/Density/createFluidDensityModel.h"
 #include "MaterialLib/PhysicalConstant.h"
diff --git a/Tests/MaterialLib/TestFluidViscosity.cpp b/Tests/MaterialLib/TestFluidViscosity.cpp
index 2ad04baeac3973d2f0013c6cb25d094c730a12ee..6be91542b0ed56b54fc33d9285085c56b94eb04b 100644
--- a/Tests/MaterialLib/TestFluidViscosity.cpp
+++ b/Tests/MaterialLib/TestFluidViscosity.cpp
@@ -16,7 +16,7 @@
 #include <memory>
 #include <cmath>
 
-#include "TestTools.h"
+#include "Tests/TestTools.h"
 
 #include "MaterialLib/Fluid/Viscosity/createViscosityModel.h"
 #include "MaterialLib/PhysicalConstant.h"
diff --git a/Tests/MaterialLib/TestPermeabilityModel.cpp b/Tests/MaterialLib/TestPermeabilityModel.cpp
index 323792b0f7c52faf442562c98322d974567ef571..832cb251779309bbd6a4a624c0290e87c8d37e20 100644
--- a/Tests/MaterialLib/TestPermeabilityModel.cpp
+++ b/Tests/MaterialLib/TestPermeabilityModel.cpp
@@ -13,7 +13,7 @@
 
 #include "BaseLib/ConfigTree.h"
 
-#include "TestTools.h"
+#include "Tests/TestTools.h"
 
 #include "MaterialLib/PorousMedium/Permeability/createPermeabilityModel.h"
 
diff --git a/Tests/MaterialLib/TestPorousMediumPorosity.cpp b/Tests/MaterialLib/TestPorousMediumPorosity.cpp
index 9785952aebb7ea6533d7390630420db58ae1b113..7bc2e236911d19dd07764d1d899e0684a93d74e9 100644
--- a/Tests/MaterialLib/TestPorousMediumPorosity.cpp
+++ b/Tests/MaterialLib/TestPorousMediumPorosity.cpp
@@ -13,7 +13,7 @@
 
 #include <memory>
 
-#include "TestTools.h"
+#include "Tests/TestTools.h"
 
 #include "BaseLib/ConfigTree.h"
 
diff --git a/Tests/MaterialLib/TestPorousMediumStorage.cpp b/Tests/MaterialLib/TestPorousMediumStorage.cpp
index 54b8181c40a10968f991d233a09730eea321b1d6..61ed7b9c99cee4a26edd1bc10e098e1bf481f8d1 100644
--- a/Tests/MaterialLib/TestPorousMediumStorage.cpp
+++ b/Tests/MaterialLib/TestPorousMediumStorage.cpp
@@ -13,7 +13,7 @@
 
 #include <memory>
 
-#include "TestTools.h"
+#include "Tests/TestTools.h"
 #include "BaseLib/ConfigTree.h"
 
 #include "MaterialLib/PorousMedium/Storage/ConstantStorage.h"
diff --git a/Tests/MaterialLib/TestRelativePermeabilityModel.cpp b/Tests/MaterialLib/TestRelativePermeabilityModel.cpp
index 70ce194070edbdb1cb0d97d892b654fa4c1fc9f7..451168c14c55ed730f8f97853c2ba6bfcd448303 100644
--- a/Tests/MaterialLib/TestRelativePermeabilityModel.cpp
+++ b/Tests/MaterialLib/TestRelativePermeabilityModel.cpp
@@ -17,7 +17,7 @@
 
 #include "BaseLib/ConfigTree.h"
 
-#include "TestTools.h"
+#include "Tests/TestTools.h"
 
 #include "MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/RelativePermeability.h"
 #include "MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/CreateRelativePermeabilityModel.h"
diff --git a/Tests/MathLib/TestDenseMatrix.cpp b/Tests/MathLib/TestDenseMatrix.cpp
index 55956a5ac0f36fce661241fc0697c09723c220f3..bad0a62b0f968b9079715be427eaaaa8d458e58c 100644
--- a/Tests/MathLib/TestDenseMatrix.cpp
+++ b/Tests/MathLib/TestDenseMatrix.cpp
@@ -9,7 +9,7 @@
 #include "gtest/gtest.h"
 
 #include "MathLib/LinAlg/Dense/DenseMatrix.h"
-#include "../TestTools.h"
+#include "Tests/TestTools.h"
 
 using namespace MathLib;
 
diff --git a/Tests/MathLib/TestGlobalVectorInterface.cpp b/Tests/MathLib/TestGlobalVectorInterface.cpp
index 6535fa19010ccc1a26b7f6a1eeab549dd6adf5cd..f118c0a31a04eac25ef118f3c484e909c5708944 100644
--- a/Tests/MathLib/TestGlobalVectorInterface.cpp
+++ b/Tests/MathLib/TestGlobalVectorInterface.cpp
@@ -14,7 +14,7 @@
  */
 
 #include <gtest/gtest.h>
-#include "../TestTools.h"
+#include "Tests/TestTools.h"
 
 #include "MathLib/LinAlg/LinAlg.h"
 
diff --git a/Tests/MathLib/TestPiecewiseLinearCurve.cpp b/Tests/MathLib/TestPiecewiseLinearCurve.cpp
index 51f36000222f1b7c59143f4a087f91ec827ed286..db1c3383965732d19cf66f2c30db5c964b5fd96c 100644
--- a/Tests/MathLib/TestPiecewiseLinearCurve.cpp
+++ b/Tests/MathLib/TestPiecewiseLinearCurve.cpp
@@ -14,7 +14,7 @@
 #include <limits>
 
 #include "gtest/gtest.h"
-#include "TestTools.h"
+#include "Tests/TestTools.h"
 
 #include "BaseLib/ConfigTree.h"
 
diff --git a/Tests/NumLib/TestCoordinatesMapping.cpp b/Tests/NumLib/TestCoordinatesMapping.cpp
index 2dbb7e48407ae1217f803f9431b5c7d353b9e28d..f5f1563b484ea09bd435ba7ef6ce3fdc376653e9 100644
--- a/Tests/NumLib/TestCoordinatesMapping.cpp
+++ b/Tests/NumLib/TestCoordinatesMapping.cpp
@@ -24,7 +24,7 @@
 #include "CoordinatesMappingTestData/TestQuad4.h"
 #include "CoordinatesMappingTestData/TestTri3.h"
 
-#include "../TestTools.h"
+#include "Tests/TestTools.h"
 
 using namespace NumLib;
 using namespace CoordinatesMappingTestData;
diff --git a/Tests/NumLib/TestDistribution.cpp b/Tests/NumLib/TestDistribution.cpp
index e848d00dcf060de030d24de0990583a18125bf62..6722b0d816bf677cec3d401834680acc84751d58 100644
--- a/Tests/NumLib/TestDistribution.cpp
+++ b/Tests/NumLib/TestDistribution.cpp
@@ -24,7 +24,7 @@
 #include "NumLib/Function/SpatialFunctionLinear.h"
 #include "NumLib/Distribution/Distribution.h"
 
-#include "../TestTools.h"
+#include "Tests/TestTools.h"
 
 class NumLibDistributionQuad : public testing::Test
 {
diff --git a/Tests/NumLib/TestSerialLinearSolver.cpp b/Tests/NumLib/TestSerialLinearSolver.cpp
index 8bd534486384097799d5757ec35b6d8f54a46731..bdd592a5ec32badd7d69443da2ba9d86ddf9947d 100644
--- a/Tests/NumLib/TestSerialLinearSolver.cpp
+++ b/Tests/NumLib/TestSerialLinearSolver.cpp
@@ -34,7 +34,7 @@
 #include "NumLib/NumericsConfig.h"
 #include "NumLib/DOF/DOFTableUtil.h"
 
-#include "../TestTools.h"
+#include "Tests/TestTools.h"
 #include "SteadyDiffusion2DExample1.h"
 
 TEST(NumLibSerialLinearSolver, Steady2DdiffusionQuadElem)
diff --git a/Tests/NumLib/TestShapeFunctions.cpp b/Tests/NumLib/TestShapeFunctions.cpp
index ad8edbee2368e08b5e46911be135ece7cd24e10c..fe1960c3960df7978edc48fbeb01052b0ac8559b 100644
--- a/Tests/NumLib/TestShapeFunctions.cpp
+++ b/Tests/NumLib/TestShapeFunctions.cpp
@@ -17,7 +17,7 @@
 
 #include "NumLib/Fem/ShapeFunction/ShapeQuad4.h"
 
-#include "../TestTools.h"
+#include "Tests/TestTools.h"
 
 using namespace NumLib;
 
diff --git a/Tests/NumLib/TestShapeMatrices.cpp b/Tests/NumLib/TestShapeMatrices.cpp
index 041adddeb1bb9c6d5e58c09a8fda85360cb73bb3..dd87825e06694945f86ce82352f1412a44ed8691 100644
--- a/Tests/NumLib/TestShapeMatrices.cpp
+++ b/Tests/NumLib/TestShapeMatrices.cpp
@@ -15,7 +15,7 @@
 
 #include "NumLib/Fem/CoordinatesMapping/ShapeMatrices.h"
 
-#include "../TestTools.h"
+#include "Tests/TestTools.h"
 
 using namespace NumLib;
 
diff --git a/Tests/NumLib/TestSpatialFunction.cpp b/Tests/NumLib/TestSpatialFunction.cpp
index df71535e0efc28393d526ce821b440b52eac55e0..f4b362a662e51a9ddff468ca5f06a18d3b6cc173 100644
--- a/Tests/NumLib/TestSpatialFunction.cpp
+++ b/Tests/NumLib/TestSpatialFunction.cpp
@@ -19,7 +19,7 @@
 #include "NumLib/Function/LinearInterpolationOnSurface.h"
 #include "NumLib/Function/SpatialFunctionLinear.h"
 
-#include "../TestTools.h"
+#include "Tests/TestTools.h"
 
 TEST(NumLib, SpatialFunctionLinear)
 {
diff --git a/Tests/NumLib/TestTimeSteppingFixed.cpp b/Tests/NumLib/TestTimeSteppingFixed.cpp
index 142bb7890e20dbc443253ce220422f031ea7fc57..9b68116882ff51c1f6e6f6c830bd67bb4cae5476 100644
--- a/Tests/NumLib/TestTimeSteppingFixed.cpp
+++ b/Tests/NumLib/TestTimeSteppingFixed.cpp
@@ -18,7 +18,7 @@
 #include "NumLib/TimeStepping/TimeStep.h"
 #include "NumLib/TimeStepping/Algorithms/FixedTimeStepping.h"
 
-#include "../TestTools.h"
+#include "Tests/TestTools.h"
 #include "TimeSteppingTestingTools.h"
 
 TEST(NumLib, TimeSteppingFixed)
diff --git a/Tests/NumLib/TestTimeSteppingIterationNumber.cpp b/Tests/NumLib/TestTimeSteppingIterationNumber.cpp
index b05ea9324145727e63cbbc1e05a7b113d650c4cb..a6fdc8f50add0c0e2a18dce729230736a65613e9 100644
--- a/Tests/NumLib/TestTimeSteppingIterationNumber.cpp
+++ b/Tests/NumLib/TestTimeSteppingIterationNumber.cpp
@@ -19,7 +19,7 @@
 #include "NumLib/TimeStepping/TimeStep.h"
 #include "NumLib/TimeStepping/Algorithms/IterationNumberBasedAdaptiveTimeStepping.h"
 
-#include "../TestTools.h"
+#include "Tests/TestTools.h"
 #include "TimeSteppingTestingTools.h"
 
 TEST(NumLib, TimeSteppingIterationNumberBased1)
diff --git a/Tests/ProcessLib/LiquidFlow/TestLiquidFlowMaterialProperties.cpp b/Tests/ProcessLib/LiquidFlow/TestLiquidFlowMaterialProperties.cpp
index 830711966af4e9543285f804ac6eccb2256b1d17..9aac2dcab3a476dde8026bf7c876e9e1c58c8214 100644
--- a/Tests/ProcessLib/LiquidFlow/TestLiquidFlowMaterialProperties.cpp
+++ b/Tests/ProcessLib/LiquidFlow/TestLiquidFlowMaterialProperties.cpp
@@ -13,7 +13,7 @@
 #include <gtest/gtest.h>
 #include <memory>
 
-#include "TestTools.h"
+#include "Tests/TestTools.h"
 
 #include "MeshLib/Mesh.h"
 #include "MeshLib/MeshGenerators/MeshGenerator.h"
diff --git a/Tests/TestTools.cpp b/Tests/TestTools.cpp
index 2d5078e539fce1e854cabea25d62ff1e420b8576..5a61b8db362be88380f4673f058e81bcb7316cbb 100644
--- a/Tests/TestTools.cpp
+++ b/Tests/TestTools.cpp
@@ -9,7 +9,7 @@
 
 #include <boost/property_tree/xml_parser.hpp>
 
-#include "TestTools.h"
+#include "Tests/TestTools.h"
 
 boost::property_tree::ptree
 readXml(const char xml[])
diff --git a/ThirdParty/gtest/CMakeLists.txt b/ThirdParty/gtest/CMakeLists.txt
index b4edeff3698b2564f26e68f128b0b7313c36d272..e1e88d24158b2ac64e4909e42d5a963d34ae9db5 100644
--- a/ThirdParty/gtest/CMakeLists.txt
+++ b/ThirdParty/gtest/CMakeLists.txt
@@ -10,7 +10,7 @@ else ()
   add_definitions (-DGTEST_HAS_PTHREAD=0)
 endif ()
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include)
 add_library (GTest src/gtest-all.cc)
 
 set_target_properties(GTest PROPERTIES FOLDER Testing)
diff --git a/scripts/cmake/CMakeSetup.cmake b/scripts/cmake/CMakeSetup.cmake
index f756662842d0a498ab31997110ee63aac2164859..4350954c6c0a849e3e63b2bb3e5d573e7cbf7be6 100644
--- a/scripts/cmake/CMakeSetup.cmake
+++ b/scripts/cmake/CMakeSetup.cmake
@@ -29,5 +29,3 @@ endif()
 
 # Get the hostname
 site_name(HOSTNAME)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)