diff --git a/unittest/config/TestsConfig.h b/unittest/config/TestsConfig.h
index 7bf667f7..cd967fa7 100644
--- a/unittest/config/TestsConfig.h
+++ b/unittest/config/TestsConfig.h
@@ -2,7 +2,7 @@
 #define FSFW_UNITTEST_CONFIG_TESTSCONFIG_H_
 
 
-
+#define CUSTOM_UNITTEST_RUNNER 0
 
 
 #endif /* FSFW_UNITTEST_CONFIG_TESTSCONFIG_H_ */
diff --git a/unittest/core/CatchRunner.cpp b/unittest/core/CatchRunner.cpp
index e15c8b2a..35c53cd4 100644
--- a/unittest/core/CatchRunner.cpp
+++ b/unittest/core/CatchRunner.cpp
@@ -11,6 +11,8 @@
 #define CATCH_CONFIG_RUNNER
 #include <catch2/catch.hpp>
 
+#if CUSTOM_UNITTEST_RUNNER == 0
+
 extern int customSetup();
 
 int main( int argc, char* argv[] ) {
@@ -23,5 +25,7 @@ int main( int argc, char* argv[] ) {
     return result;
 }
 
+#endif
+
 
 #endif
diff --git a/unittest/core/CatchSetup.cpp b/unittest/core/CatchSetup.cpp
index ca5c456d..a623fb77 100644
--- a/unittest/core/CatchSetup.cpp
+++ b/unittest/core/CatchSetup.cpp
@@ -1,4 +1,5 @@
 #include "CatchDefinitions.h"
+
 #include "../config/cdatapool/dataPoolInit.h"
 #include "../config/objects/Factory.h"