diff --git a/Makefile b/Makefile
index 12c00715b2..74630c7506 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ MOCHA_CMD = node_modules/mocha/bin/_mocha
 
 export NODE_ENV = test
 
-.PHONY: clean test test-cov test-travis test-browser publish bench build
+.PHONY: clean test test-cov tlint est-travis test-appveyor test-browser publish bench build
 
 clean:
 	rm -rf coverage templates.json test/tmp dist
@@ -15,16 +15,22 @@ bench:
 	npm install es6-transpiler traceur esnext es6now jstransform
 	node node_modules/matcha/bin/_matcha
 
-test:
+lint:
 	$(JSHINT_CMD) lib bin benchmark/index.js
+
+test:
+	make lint
 	$(MOCHA_CMD)
 
 test-cov:
 	rm -rf coverage
 	node $(ISTANBUL_CMD) $(MOCHA_CMD) --
 
-test-travis:
+test-appveyor:
 	node $(ISTANBUL_CMD) $(MOCHA_CMD) -- --reporter spec
+
+test-travis:
+	make test-appveyor
 	if test -n "$$CODECLIMATE_REPO_TOKEN"; then codeclimate < coverage/lcov.info; fi
 
 test-browser:
diff --git a/appveyor.yml b/appveyor.yml
index 00215b7d10..be93d797a7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,7 +10,7 @@ install:
 test_script:
  - "node --version"
  - "npm --version"
- - "make test"
+ - "make test-appveyor"
 
 build: "off"