diff --git a/.travis.yml b/.travis.yml
index dc97701..5815577 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,9 @@
 language: node_js
 node_js:
   - "0.8"
+
+before_script:
+  - npm install --quiet -g mocha
+
 services:
   - mongodb
diff --git a/makefile b/makefile
index 12944f7..46c38f2 100644
--- a/makefile
+++ b/makefile
@@ -2,10 +2,10 @@ REPORTER = dot
 
 check: test
 
-test: test-unit
+test: test-unit test-functional
 
 test-unit:
-	@NODE_ENV=test ./node_modules/.bin/mocha \
+	@NODE_ENV=test mocha \
 		--compilers coffee:coffee-script \
 		--recursive \
 		--reporter $(REPORTER) \
@@ -20,7 +20,7 @@ test-functional:
 		test/functional
 
 test-unit-report:
-	@NODE_ENV=test ./node_modules/.bin/mocha \
+	@NODE_ENV=test mocha \
 		--compilers coffee:coffee-script \
 		--recursive \
 		--reporter markdown \