diff --git a/Tests/Tactility/CMakeLists.txt b/Tests/Tactility/CMakeLists.txt
index 79d3fb7f..c31fd46e 100644
--- a/Tests/Tactility/CMakeLists.txt
+++ b/Tests/Tactility/CMakeLists.txt
@@ -2,7 +2,6 @@ project(TactilityTests)
 
 enable_language(C CXX ASM)
 
-set(CMAKE_CXX_COMPILER g++)
 
 file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/Source/*.cpp)
 add_executable(TactilityTests EXCLUDE_FROM_ALL ${TEST_SOURCES})
diff --git a/Tests/Tactility/Source/AppManifestParsingTest.cpp b/Tests/Tactility/Source/AppManifestParsingTest.cpp
index e57565b0..7b83c269 100644
--- a/Tests/Tactility/Source/AppManifestParsingTest.cpp
+++ b/Tests/Tactility/Source/AppManifestParsingTest.cpp
@@ -1,4 +1,4 @@
-#include "../../TactilityCore/Source/TestFile.h"
+#include "TestFile.h"
 #include "../../Tactility/Private/Tactility/app/AppManifestParsing.h"
 #include "../../Tactility/Private/Tactility/app/AppManifestParsingInternal.h"
 
diff --git a/Tests/Tactility/Source/PropertiesFileTest.cpp b/Tests/Tactility/Source/PropertiesFileTest.cpp
index fdf467d6..a8f7d7c6 100644
--- a/Tests/Tactility/Source/PropertiesFileTest.cpp
+++ b/Tests/Tactility/Source/PropertiesFileTest.cpp
@@ -1,4 +1,4 @@
-#include "../../TactilityCore/Source/TestFile.h"
+#include "TestFile.h"
 #include "../../Tactility/Include/Tactility/file/PropertiesFile.h"
 
 #include "doctest.h"
diff --git a/Tests/TactilityFreeRtos/CMakeLists.txt b/Tests/TactilityFreeRtos/CMakeLists.txt
index a2558f8e..312fc056 100644
--- a/Tests/TactilityFreeRtos/CMakeLists.txt
+++ b/Tests/TactilityFreeRtos/CMakeLists.txt
@@ -2,7 +2,6 @@ project(TactilityFreeRtosTests)
 
 enable_language(C CXX ASM)
 
-set(CMAKE_CXX_COMPILER g++)
 
 file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/Source/*.cpp)
 add_executable(TactilityFreeRtosTests EXCLUDE_FROM_ALL ${TEST_SOURCES})
diff --git a/Tests/TactilityKernel/CMakeLists.txt b/Tests/TactilityKernel/CMakeLists.txt
index c75098f9..b57060f3 100644
--- a/Tests/TactilityKernel/CMakeLists.txt
+++ b/Tests/TactilityKernel/CMakeLists.txt
@@ -2,7 +2,6 @@ project(TactilityKernelTests)
 
 enable_language(C CXX ASM)
 
-set(CMAKE_CXX_COMPILER g++)
 
 file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/Source/*.cpp)
 add_executable(TactilityKernelTests EXCLUDE_FROM_ALL ${TEST_SOURCES})
diff --git a/Tests/crypt-module/CMakeLists.txt b/Tests/crypt-module/CMakeLists.txt
index 49b66247..407a1353 100644
--- a/Tests/crypt-module/CMakeLists.txt
+++ b/Tests/crypt-module/CMakeLists.txt
@@ -2,8 +2,6 @@ project(CryptModuleTests)
 
 enable_language(C CXX ASM)
 
-set(CMAKE_CXX_COMPILER g++)
-
 file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/Source/*.cpp)
 add_executable(CryptModuleTests EXCLUDE_FROM_ALL ${TEST_SOURCES})