diff --git a/unittest/testcfg/CatchFactory.cpp b/unittest/core/CatchFactory.cpp
similarity index 100%
rename from unittest/testcfg/CatchFactory.cpp
rename to unittest/core/CatchFactory.cpp
diff --git a/unittest/testcfg/CatchFactory.h b/unittest/core/CatchFactory.h
similarity index 71%
rename from unittest/testcfg/CatchFactory.h
rename to unittest/core/CatchFactory.h
index 84f9207e..f06e7ae5 100644
--- a/unittest/testcfg/CatchFactory.h
+++ b/unittest/core/CatchFactory.h
@@ -1,5 +1,5 @@
-#ifndef FACTORY_H_
-#define FACTORY_H_
+#ifndef FSFW_CATCHFACTORY_H_
+#define FSFW_CATCHFACTORY_H_
 
 #include <fsfw/objectmanager/SystemObjectIF.h>
 
@@ -13,4 +13,4 @@ namespace Factory {
 
 }
 
-#endif /* FACTORY_H_ */
+#endif /* FSFW_CATCHFACTORY_H_ */
diff --git a/unittest/core/CatchSetup.cpp b/unittest/core/CatchSetup.cpp
index 99ee63b5..c93cf032 100644
--- a/unittest/core/CatchSetup.cpp
+++ b/unittest/core/CatchSetup.cpp
@@ -1,6 +1,5 @@
+#include <fsfw/unittest/core/CatchFactory.h>
 #include "CatchDefinitions.h"
-#include <CatchFactory.h>
-
 #include <testcfg/cdatapool/dataPoolInit.h>
 
 #ifdef GCOV
diff --git a/unittest/testcfg/Makefile-FSFW-Tests b/unittest/testcfg/Makefile-FSFW-Tests
index 2017d2bd..550fd1de 100644
--- a/unittest/testcfg/Makefile-FSFW-Tests
+++ b/unittest/testcfg/Makefile-FSFW-Tests
@@ -15,7 +15,7 @@ SHELL = /bin/sh
 # (can be overriden by adding CHIP=chip and BOARD=board to the command-line)
 # Unit Test can only be run on host machine for now (Linux)
 FRAMEWORK_PATH = fsfw
-FILE_ROOT = $(FRAMEWORK_PATH)/unittest
+TEST_FILE_ROOT = $(FRAMEWORK_PATH)/unittest
 BOARD = unittest
 LINUX = 1
 OS_FSFW = linux
@@ -58,9 +58,10 @@ endif
 
 UNIT_TEST = 1
 # General folder paths
-CONFIG_PATH = $(FILE_ROOT)/config
-UNIT_TEST_PATH = $(FILE_ROOT)/tests
-CORE_PATH = $(FILE_ROOT)/core
+CONFIG_PATH = testcfg
+# Core copy has to be copied as well.
+CORE_PATH = core
+UNIT_TEST_PATH = $(TEST_FILE_ROOT)/tests
 
 # Output file basename
 BASENAME = fsfw
@@ -154,8 +155,8 @@ include $(S)/$(notdir $S).mk
 endef
 $(foreach S,$(SUBDIRS),$(eval $(INCLUDE_FILE)))
 
-INCLUDES += $(FILE_ROOT)
-INCLUDES += $(FILE_ROOT)/catch2/
+INCLUDES += $(TEST_FILE_ROOT)
+INCLUDES += $(TEST_FILE_ROOT)/catch2/
 
 #-------------------------------------------------------------------------------
 #		Source Files