diff --git a/tests/src/fsfw_tests/internal/InternalUnitTester.cpp b/tests/src/fsfw_tests/internal/InternalUnitTester.cpp
index f9fc1932..20998d64 100644
--- a/tests/src/fsfw_tests/internal/InternalUnitTester.cpp
+++ b/tests/src/fsfw_tests/internal/InternalUnitTester.cpp
@@ -16,15 +16,18 @@ 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
 
 	testserialize::test_serialization();
 	testmq::testMq();
-	testsemaph::testBinSemaph();
-	testsemaph::testCountingSemaph();
+	if(testConfig.testSemaphores) {
+	    testsemaph::testBinSemaph();
+	    testsemaph::testCountingSemaph();
+	}
 	testmutex::testMutex();
 	if(testConfig.testArrayPrinter) {
 	    arrayprinter::testArrayPrinter();
diff --git a/tests/src/fsfw_tests/internal/InternalUnitTester.h b/tests/src/fsfw_tests/internal/InternalUnitTester.h
index 50c89d77..433a0f1f 100644
--- a/tests/src/fsfw_tests/internal/InternalUnitTester.h
+++ b/tests/src/fsfw_tests/internal/InternalUnitTester.h
@@ -18,6 +18,7 @@ class InternalUnitTester: public HasReturnvaluesIF {
 public:
     struct TestConfig {
         bool testArrayPrinter = false;
+        bool testSemaphores = true;
     };
 
 	InternalUnitTester();
diff --git a/tests/src/fsfw_tests/internal/osal/IntTestMutex.cpp b/tests/src/fsfw_tests/internal/osal/IntTestMutex.cpp
index b1699a46..d9184cd8 100644
--- a/tests/src/fsfw_tests/internal/osal/IntTestMutex.cpp
+++ b/tests/src/fsfw_tests/internal/osal/IntTestMutex.cpp
@@ -1,10 +1,12 @@
 #include "fsfw_tests/internal/osal/IntTestMutex.h"
 #include "fsfw_tests/internal/UnittDefinitions.h"
+#include "fsfw/platform.h"
 
 #include <fsfw/ipc/MutexFactory.h>
 
-#if defined(WIN32) || defined(UNIX)
-#include <fsfw/osal/host/Mutex.h>
+#if defined PLATFORM_WIN || defined PLATFORM_UNIX
+#include "fsfw/osal/host/Mutex.h"
+
 #include <thread>
 #include <future>
 #endif
@@ -20,7 +22,7 @@ void testmutex::testMutex() {
 	// timed_mutex from the C++ library specifies undefined behaviour if
 	// the timed mutex is locked twice from the same thread.
     // TODO: we should pass a define like FSFW_OSAL_HOST to the build.
-#if defined(WIN32) || defined(UNIX)
+#if defined PLATFORM_WIN || defined PLATFORM_UNIX
 	// This calls the function from
 	// another thread and stores the returnvalue in a future.
 	auto future = std::async(&MutexIF::lockMutex, mutex, MutexIF::TimeoutType::WAITING, 1);
@@ -37,8 +39,7 @@ void testmutex::testMutex() {
 		unitt::put_error(id);
 	}
 
-	// TODO: we should pass a define like FSFW_OSAL_HOST to the build.
-#if !defined(WIN32) && !defined(UNIX)
+#if !defined PLATFORM_WIN && !defined PLATFORM_UNIX
     result = mutex->unlockMutex();
 	if(result != MutexIF::CURR_THREAD_DOES_NOT_OWN_MUTEX) {
 		unitt::put_error(id);
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();