diff --git a/test/Makefile b/test/Makefile
index 2d23533..6b38d7b 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -5,8 +5,8 @@ LIBC99_STATIC=$(LIBC99_PATH)libc99.a
 LIBPEPDATATYPES_PATH=../src/
 LIBPEPDATATYPES_STATIC=$(LIBPEPDATATYPES_PATH)libpepdatatypes.a
 
-LDLIBS=-lstdc++ -lpEpEngine -lpEpCxx11 -lpEpAdapter -lPityTest11 -lpthread -ldl -lm
-CXXFLAGS:=-I$(LIBPEPDATATYPES_PATH) -I$(LIBC99_PATH) $(CXXFLAGS)
+LDLIBS=-lstdc++ -lpEpEngine -lpEpCxx11 -lpEpAdapter -lPityTest11 -lpthread -ldl -lm $(LIBC99_STATIC)
+CXXFLAGS+=-I$(LIBPEPDATATYPES_PATH) -I$(LIBC99_PATH)
 
 # Test
 SRC_TEST=$(wildcard test_*.cc)
@@ -21,9 +21,8 @@ libc99: $(LIBC99_STATIC)
 $(LIBC99_STATIC):
 	$(MAKE) -C ../examples/libc99
 
-tests: $(BIN_TEST) $(LIBC99_STATIC)
+tests: $(BIN_TEST)
 
-$(BIN_TEST): $(OBJ_FRAMEWORK)
 
 clean:
 	rm -f $(BIN_TEST)