diff --git a/Makefile b/Makefile
index b39dc1c..5116a4b 100644
--- a/Makefile
+++ b/Makefile
@@ -21,13 +21,13 @@ util.o: $(SDIR)/util.c $(SDIR)/kseq.h $(SDIR)/scythe.h
 prob.o: $(SDIR)/prob.c $(SDIR)/scythe.h
 	$(CC) $(CFLAGS) -c $(SDIR)/$*.c
 tests.o: $(SDIR)/tests/tests.c $(SDIR)/scythe.h
-	$(CC) $(CFLAGS) -c $(SDIR)/$*.c
+	$(CC) $(CFLAGS) -c $(SDIR)/tests/$*.c
 
 valgrind: build
 	valgrind --leak-check=full --show-reachable=yes ./scythe -a solexa_adapters.fa test.fastq
 
 test: match.o util.o prob.o tests.o
-	$(CC) $(CFLAGS) $(LDFLAGS) $? -o tests && ./tests
+	$(CC) $(CFLAGS) $? -o tests $(LDFLAGS) && ./tests 
 
 testclean:
 	rm -rf ./tests
@@ -42,7 +42,7 @@ dist:
 	tar -zcf $(ARCHIVE).tar.gz src Makefile
 
 build: match.o scythe.o util.o prob.o 
-	$(CC) $(CFLAGS) $(LDFLAGS) $? -o scythe
+	$(CC) $(CFLAGS) $? -o scythe $(LDFLAGS) 
 
 debug:
-	$(CC) $(LDFLAGS) $(DEBUG) -o scythe src/*.c
\ No newline at end of file
+	$(CC) $(DEBUG) -o scythe src/*.c $(LDFLAGS)