diff --git a/Makefile b/Makefile
index 95ea8b5b..84847472 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ endif
 
 # The "LOCALTGTS" defines the top-level targets that are implemented in this makefile
 # Any other target may also be given, in that case it will simply be passed through.
-LOCALTGTS := all checkout clean clean-fsw clean-sim clean-gsw config debug fsw gsw launch log prep real-clean sim stop stop-gsw
+LOCALTGTS := all checkout clean clean-fsw clean-sim clean-gsw config debug fsw gsw launch log prep real-clean sim stop stop-gsw test-fsw
 OTHERTGTS := $(filter-out $(LOCALTGTS),$(MAKECMDGOALS))
 
 # As this makefile does not build any real files, treat everything as a PHONY target
@@ -118,5 +118,10 @@ stop:
 stop-gsw:
 	./scripts/stop_gsw.sh
 
+test-fsw:
+	mkdir -p $(FSWBUILDDIR)
+	cd $(FSWBUILDDIR) && cmake $(PREP_OPTS) -DENABLE_UNIT_TESTS=true ../cfe
+	$(MAKE) --no-print-directory -C $(FSWBUILDDIR) mission-install
+
 igniter:
 	./scripts/igniter_launch.sh
diff --git a/components/sample b/components/sample
index 34260dd8..bf8dd3df 160000
--- a/components/sample
+++ b/components/sample
@@ -1 +1 @@
-Subproject commit 34260dd8a8d929b6d36c8805f08754aa847d6e97
+Subproject commit bf8dd3df09d4542b8784ca6e7b91dfef646aea10
diff --git a/fsw/psp b/fsw/psp
index 1159205e..cd5546b9 160000
--- a/fsw/psp
+++ b/fsw/psp
@@ -1 +1 @@
-Subproject commit 1159205edc17db5806ec89c6c2d97125d294c836
+Subproject commit cd5546b9b873fb50a5a7154d4072356dc6ba042e