diff --git a/.travis.yml b/.travis.yml
index c9080cc..fc97c87 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ node_js:
   - "0.8"
 before_install:
   - "npm install -g npm@4.3.0"
-  - "npm install -g voc"
+  - "npm install -g mocha@2.x voc"
   - "npm install codepage"
   - "npm install blanket"
   - "npm install coveralls mocha-lcov-reporter"
diff --git a/Makefile b/Makefile
index b209e7d..7218661 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ clean: clean-baseline ## Remove targets and build artifacts
 
 .PHONY: test mocha
 test mocha: test.js $(TARGET) baseline ## Run test suite
-	./node_modules/.bin/mocha -R spec -t 60000
+	mocha -R spec -t 60000
 
 .PHONY: ctest
 ctest: ## Build browser test (into ctest/ subdirectory)
@@ -88,11 +88,11 @@ flow: lint ## Run flow checker
 cov: misc/coverage.html ## Run coverage test
 
 misc/coverage.html: $(TARGET) test.js
-	./node_modules/.bin/mocha --require blanket -R html-cov -t 30000 > $@
+	mocha --require blanket -R html-cov -t 30000 > $@
 
 .PHONY: coveralls
 coveralls: ## Coverage Test + Send to coveralls.io
-	./node_modules/.bin/mocha --require blanket --reporter mocha-lcov-reporter -t 20000 | node ./node_modules/coveralls/bin/coveralls.js
+	mocha --require blanket --reporter mocha-lcov-reporter -t 20000 | node ./node_modules/coveralls/bin/coveralls.js
 
 MDLINT=README.md
 .PHONY: mdlint
diff --git a/package.json b/package.json
index eff2780..b10cf64 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
 	"description": "Pure-JS ADLER-32",
 	"keywords": [ "adler32", "checksum" ],
 	"main": "./adler32",
-	"types": "types/index.d.ts",
+	"types": "types",
 	"devDependencies": {
 		"mocha": "~2.5.3",
 		"blanket": "~1.2.3",