diff --git a/CMakeLists.txt b/CMakeLists.txt
index e98ad9a1..118bbeeb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,7 +66,7 @@ if(FSFW_OSAL MATCHES host)
 	set(FSFW_OSAL_HOST ON)
 elseif(FSFW_OSAL MATCHES linux)
 	set(OS_FSFW_NAME "Linux")
-	set(FSFW_OSAL_HOST ON)
+	set(FSFW_OSAL_LINUX ON)
 elseif(FSFW_OSAL MATCHES freertos)
 	set(OS_FSFW_NAME "FreeRTOS")
 	set(FSFW_OSAL_FREERTOS ON)
diff --git a/tests/src/fsfw_tests/internal/InternalUnitTester.cpp b/tests/src/fsfw_tests/internal/InternalUnitTester.cpp
index 709f9f38..20998d64 100644
--- a/tests/src/fsfw_tests/internal/InternalUnitTester.cpp
+++ b/tests/src/fsfw_tests/internal/InternalUnitTester.cpp
@@ -16,7 +16,8 @@ InternalUnitTester::~InternalUnitTester() {}
 ReturnValue_t InternalUnitTester::performTests(
         const struct InternalUnitTester::TestConfig& testConfig) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-	sif::info << "Running internal unit tests.." << std::endl;
+	sif::info << "Running internal unit tests.. Error messages might follow" <<
+	        std::endl;
 #else
 	sif::printInfo("Running internal unit tests..\n");
 #endif
diff --git a/tests/src/fsfw_tests/internal/osal/IntTestSemaphore.cpp b/tests/src/fsfw_tests/internal/osal/IntTestSemaphore.cpp
index 8b79f33b..4b28f961 100644
--- a/tests/src/fsfw_tests/internal/osal/IntTestSemaphore.cpp
+++ b/tests/src/fsfw_tests/internal/osal/IntTestSemaphore.cpp
@@ -1,9 +1,10 @@
+#include "fsfw/FSFW.h"
 #include "fsfw_tests/internal/osal/IntTestSemaphore.h"
 #include "fsfw_tests/internal/UnittDefinitions.h"
 
-#include <fsfw/tasks/SemaphoreFactory.h>
-#include <fsfw/serviceinterface/ServiceInterface.h>
-#include <fsfw/timemanager/Stopwatch.h>
+#include "fsfw/tasks/SemaphoreFactory.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/timemanager/Stopwatch.h"
 
 #include <cstdlib>
 
@@ -16,7 +17,7 @@ void testsemaph::testBinSemaph() {
 	}
 	testBinSemaphoreImplementation(binSemaph, id);
 	SemaphoreFactory::instance()->deleteSemaphore(binSemaph);
-#if defined(freeRTOS)
+#if defined FSFW_OSAL_FREERTOS
 	SemaphoreIF* binSemaphUsingTask =
 			SemaphoreFactory::instance()->createBinarySemaphore(1);
 	testBinSemaphoreImplementation(binSemaphUsingTask, id);
@@ -36,7 +37,7 @@ void testsemaph::testCountingSemaph() {
 		}
 		testBinSemaphoreImplementation(countingSemaph, id);
 		SemaphoreFactory::instance()->deleteSemaphore(countingSemaph);
-#if defined(freeRTOS)
+#if defined FSFW_OSAL_FREERTOS
 		countingSemaph = SemaphoreFactory::instance()->
 				createCountingSemaphore(1, 1, 1);
 		testBinSemaphoreImplementation(countingSemaph, id);
@@ -50,7 +51,7 @@ void testsemaph::testCountingSemaph() {
 				createCountingSemaphore(3,3);
 		testCountingSemaphImplementation(countingSemaph, id);
 		SemaphoreFactory::instance()->deleteSemaphore(countingSemaph);
-#if defined(freeRTOS)
+#if defined FSFW_OSAL_FREERTOS
 		countingSemaph = SemaphoreFactory::instance()->
 				createCountingSemaphore(3, 0, 1);
 		uint8_t semaphCount = countingSemaph->getSemaphoreCounter();