diff --git a/CMakeLists.txt b/CMakeLists.txt
index f57031cf..656ee3ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,6 +91,8 @@ set(EIVE_ADD_LINUX_FILES False)
if(EIVE_BUILD_UNITTESTS)
option(FSFW_ADD_UNITTESTS "Build the FSFW unittests as well" ON)
+ # Use FSFW custom main for unittests
+ set(FSFW_CUSTOM_UNITTEST_RUNNER ON)
endif()
if(FSFW_CUSTOM_UNITTEST_RUNNER OR FSFW_ADD_UNITTESTS)
diff --git a/fsfw b/fsfw
index 04cb8e82..3d0ce199 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 04cb8e82f1aaae89e20985539c74c1e36bb85ae3
+Subproject commit 3d0ce1998114c5d7a43034233ee03a800c8821b0
diff --git a/misc/eclipse/.cproject b/misc/eclipse/.cproject
index fe0208b8..7d7c4c09 100644
--- a/misc/eclipse/.cproject
+++ b/misc/eclipse/.cproject
@@ -1357,6 +1357,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1374,6 +1436,7 @@
+
@@ -1385,6 +1448,9 @@
+
+
+
diff --git a/misc/eclipse/.project b/misc/eclipse/.project
index 86d98589..62145ff4 100644
--- a/misc/eclipse/.project
+++ b/misc/eclipse/.project
@@ -7,7 +7,7 @@
org.eclipse.cdt.managedbuilder.core.genmakebuilder
- full,incremental,
+ clean,full,incremental,
diff --git a/misc/eclipse/Host/eive-linux-host-unittest.launch b/misc/eclipse/Host/eive-linux-host-unittest.launch
index 048b7f3d..85d54281 100644
--- a/misc/eclipse/Host/eive-linux-host-unittest.launch
+++ b/misc/eclipse/Host/eive-linux-host-unittest.launch
@@ -18,10 +18,10 @@
-
+
-
+
diff --git a/unittest/main.cpp b/unittest/main.cpp
index c76e214a..cd4f4b77 100644
--- a/unittest/main.cpp
+++ b/unittest/main.cpp
@@ -1,3 +1,4 @@
+#include "fsfw/serviceinterface/ServiceInterfaceStream.h"
#include "fsfw_tests/unit/CatchRunner.h"
int main(int argc, char* argv[]) {