diff --git a/Makefile b/Makefile
index ba2d8ad..8c54beb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,20 @@
+ROOT=$(shell pwd)
 
 test: test-unit test-integration
 
 test-unit:
+	@echo Running tests...
 	@NODE_ENV=test mocha test
 	
 test-integration:
-	npm link
+	@echo Running integration tests...
 	mkdir test_integration
 	cd test_integration; \
 		wget https://github.com/balderdashy/waterline/archive/master.zip; \
 		unzip -q master.zip
 	cd test_integration/waterline-master; \
-		npm link waterline-schema; \
 		npm install; \
+		rm -rf node_modules/waterline-schema; \
+		ln -s $(ROOT) node_modules/waterline-schema; \
 		npm test
 	rm -rf test_integration