diff --git a/Makefile b/Makefile
index fc32bdd..ffc1a48 100644
--- a/Makefile
+++ b/Makefile
@@ -159,6 +159,8 @@ get-deps:
 	$(Q)${MAKE} -C libopencm3
 
 Test:
-	cd test && $(MAKE)
+	$(MAKE) -C test
+	$(MAKE) -C libopeninv/test
 cleanTest:
-	cd test && $(MAKE) clean
+	$(MAKE) -C test clean
+	$(MAKE) -C libopeninv/test clean
diff --git a/sinus.cbp b/sinus.cbp
index 831252e..56bd0ab 100644
--- a/sinus.cbp
+++ b/sinus.cbp
@@ -1722,18 +1722,37 @@
 		<Unit filename="libopeninv/test/Makefile">
 			<Option target="Test libopeninv" />
 		</Unit>
-		<Unit filename="libopeninv/test/stub_canhardware.cpp" />
-		<Unit filename="libopeninv/test/stub_canhardware.h" />
+		<Unit filename="libopeninv/test/stub_canhardware.cpp">
+			<Option target="Test libopeninv" />
+		</Unit>
+		<Unit filename="libopeninv/test/stub_canhardware.h">
+			<Option target="Test libopeninv" />
+		</Unit>
 		<Unit filename="libopeninv/test/stub_libopencm3.c">
 			<Option compilerVar="CC" />
+			<Option target="Test libopeninv" />
+		</Unit>
+		<Unit filename="libopeninv/test/test-include/hwdefs.h">
+			<Option target="Test libopeninv" />
+		</Unit>
+		<Unit filename="libopeninv/test/test-include/param_prj.h">
+			<Option target="Test libopeninv" />
+		</Unit>
+		<Unit filename="libopeninv/test/test.h">
+			<Option target="Test libopeninv" />
+		</Unit>
+		<Unit filename="libopeninv/test/test_canmap.cpp">
+			<Option target="Test libopeninv" />
+		</Unit>
+		<Unit filename="libopeninv/test/test_fp.cpp">
+			<Option target="Test libopeninv" />
+		</Unit>
+		<Unit filename="libopeninv/test/test_fu.cpp">
+			<Option target="Test libopeninv" />
+		</Unit>
+		<Unit filename="libopeninv/test/test_main.cpp">
+			<Option target="Test libopeninv" />
 		</Unit>
-		<Unit filename="libopeninv/test/test-include/hwdefs.h" />
-		<Unit filename="libopeninv/test/test-include/param_prj.h" />
-		<Unit filename="libopeninv/test/test.h" />
-		<Unit filename="libopeninv/test/test_canmap.cpp" />
-		<Unit filename="libopeninv/test/test_fp.cpp" />
-		<Unit filename="libopeninv/test/test_fu.cpp" />
-		<Unit filename="libopeninv/test/test_main.cpp" />
 		<Unit filename="src/GD31xxOI.cpp" />
 		<Unit filename="src/hwinit.cpp" />
 		<Unit filename="src/inc_encoder.cpp" />
@@ -1753,10 +1772,15 @@
 		<Unit filename="test/Makefile">
 			<Option target="Test" />
 		</Unit>
-		<Unit filename="test/stub_canhardware.cpp" />
-		<Unit filename="test/stub_canhardware.h" />
+		<Unit filename="test/stub_canhardware.cpp">
+			<Option target="Test" />
+		</Unit>
+		<Unit filename="test/stub_canhardware.h">
+			<Option target="Test" />
+		</Unit>
 		<Unit filename="test/stub_libopencm3.c">
 			<Option compilerVar="CC" />
+			<Option target="Test" />
 		</Unit>
 		<Unit filename="test/test.h" />
 		<Unit filename="test/test_fp.cpp" />