diff --git a/test/Makefile b/test/Makefile
index 759c5cc..04a136c 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -22,14 +22,18 @@ OBJ_FRAMEWORK=$(subst .cc,.o,$(SRC_FRAMEWORK))
 #    -include $(DEPENDS)
 #endif
 
-.PHONY: all clean rmtestdata
+.PHONY: all clean rmtestdata peptest peptest_clean
 .DEFAULT_GOAL := all
 
-all: $(BIN_TEST)
+all: $(BIN_TEST) peptest
 
 $(BIN_TEST): $(OBJ_FRAMEWORK)
 
-clean:
+peptest:
+	$(MAKE) -C pEpTest
+
+
+clean: peptest_clean
 	rm -f $(BIN_TEST)
 	rm -f $(OBJ_FRAMEWORK)
 	rm -Rf *.dSYM
@@ -37,5 +41,8 @@ clean:
 	rm -f *.o
 	rm -Rf /tmp/test_pEp.*
 
+peptest_clean:
+	$(MAKE) -C pEpTest clean
+
 rmtestdata:
 	rm -Rf /tmp/test_pEp.*
diff --git a/test/pEpTest/Makefile b/test/pEpTest/Makefile
index 21de79e..770fbc2 100644
--- a/test/pEpTest/Makefile
+++ b/test/pEpTest/Makefile
@@ -1,4 +1,3 @@
-
 LDLIBS=-lstdc++ -lpEpAdapter
 LDFLAGS=-L../../src/
 CXXFLAGS=-std=c++11 -g