diff --git a/tests/src/fsfw_tests/unit/testcfg/events/subsystemIdRanges.h b/tests/src/fsfw_tests/unit/testcfg/events/subsystemIdRanges.h
index c9c7c20d..b88cd875 100644
--- a/tests/src/fsfw_tests/unit/testcfg/events/subsystemIdRanges.h
+++ b/tests/src/fsfw_tests/unit/testcfg/events/subsystemIdRanges.h
@@ -2,7 +2,6 @@
 #define CONFIG_EVENTS_SUBSYSTEMIDRANGES_H_
 
 #include "fsfw/events/fwSubsystemIdRanges.h"
-#include "common/events/commonSubsystemIds.h"
 #include <cstdint>
 
 
@@ -13,7 +12,7 @@
  */
 namespace SUBSYSTEM_ID {
 enum: uint8_t {
-	SUBSYSTEM_ID_START =  COMMON_SUBSYSTEM_ID_RANGE,
+	SUBSYSTEM_ID_START =  0,
 	SUBSYSTEM_ID_END // [EXPORT] : [END]
 };
 }
diff --git a/tests/src/fsfw_tests/unit/testcfg/returnvalues/classIds.h b/tests/src/fsfw_tests/unit/testcfg/returnvalues/classIds.h
index 919b9628..1001d012 100644
--- a/tests/src/fsfw_tests/unit/testcfg/returnvalues/classIds.h
+++ b/tests/src/fsfw_tests/unit/testcfg/returnvalues/classIds.h
@@ -1,7 +1,6 @@
 #ifndef CONFIG_RETURNVALUES_CLASSIDS_H_
 #define CONFIG_RETURNVALUES_CLASSIDS_H_
 
-#include "common/returnvalues/commonClassIds.h"
 #include "fsfw/returnvalues/FwClassIds.h"
 
 /**