diff --git a/src/Makefile.am b/src/Makefile.am
index 9fdba34..3fc251d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,8 +24,8 @@ AM_CFLAGS = -Wall -I ../include/
 bin_PROGRAMS = taskrambler
 
 taskrambler_SOURCES = taskrambler.c $(IFACE) $(UTILS)
-taskrambler_CFLAGS  = -Wall -I ../include/ $(COVERAGE_CFLAGS)
+taskrambler_CFLAGS  = -Wall -I ../include/# $(COVERAGE_CFLAGS)
 taskrambler_LDADD   = $(LIBS) -lrt -lssl -lldap
-taskrambler_LDFLAGS = $(COVERAGE_LDFLAGS)
+#taskrambler_LDFLAGS = $(COVERAGE_LDFLAGS)
 
 SUBDIRS = auth cbuf class hash http logger server session socket stream
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c4c28a9..6156972 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -63,6 +63,8 @@ EXTRA_DIST = runtest.h mock/mock_class.h mock/mock_logger.h
 stream:
 	$(MAKE) -C stream $(AM_MAKEFLAGS)
 
-check-build: stream $(check_PROGRAMS)
+check-build: stream (check_PROGRAMS)
+
+all-local: stream
 
 SUBDIRS = stream
diff --git a/tests/loggerTest b/tests/loggerTest
deleted file mode 100755
index 12851ef..0000000
Binary files a/tests/loggerTest and /dev/null differ
diff --git a/tests/stream/Makefile b/tests/stream/Makefile
new file mode 100644
index 0000000..66a78a4
--- /dev/null
+++ b/tests/stream/Makefile
@@ -0,0 +1,15 @@
+vpath %.c ../../src/stream
+vpath %.c ../../src/stream/interface
+
+OBJECTS  = stream.o read.o write.o reader.o writer.o
+
+%.o: %.c
+	gcc -Wall -ggdb -O0 -fprofile-arcs -ftest-coverage -I ../../include -c $< -o $@
+
+.PHONY: all clean check distclean check-build
+all:
+check: check-build
+check-build: $(OBJECTS)
+distclean: clean
+clean:
+	rm -rf $(OBJECTS)