diff --git a/lib/java/Makefile b/lib/java/Makefile
index 4eed988db3d0499cb22c7a3c687de4bb0ae920b6..5b2b14d702365ea05de0ba85e0c6a4f0dd5c30a7 100644
--- a/lib/java/Makefile
+++ b/lib/java/Makefile
@@ -10,7 +10,8 @@ MODULES=LabCommDispatcher \
 	LabCommEncoder \
 	LabCommDecoderChannel \
 	LabCommWriter \
-	LabCommReader
+	LabCommReader \
+	WriterWrapper
 
 all: labcomm.jar
 
diff --git a/test/Makefile b/test/Makefile
index 48b46e450ad0e1c815447ba4c9dd90d1631ab7ae..de2dd411541dc90baeca1533999b9694b9c44e00 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -20,7 +20,7 @@ test_%: gen/%/signatures.py \
 	gen/%/java_code 
 	PYTHONPATH=../lib/python ./test_encoder_decoder.py \
 		--signatures=gen/$*/signatures.py \
-		--test /bin/tee gen/$*/testdata \
+		--test tee gen/$*/testdata \
 		--test gen/$*/c_relay /dev/stdin /dev/stdout \
 		--test mono gen/$*/cs_relay.exe /dev/stdin /dev/stdout \
 		--test java \\-cp gen/$*:../lib/java/labcomm.jar java_relay \