diff --git a/Makefile b/Makefile
index 588c2cbd78..f73cb9776d 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,6 @@ watch: clean
 
 lint:
 	node node_modules/.bin/eslint packages/*/src
-	flow
 
 clean: test-clean
 	rm -rf packages/babel-polyfill/browser*
@@ -47,6 +46,7 @@ test-cov: clean
 test-ci:
 	make lint
 	NODE_ENV=test make bootstrap
+	./node_modules/.bin/flow check
 	./scripts/test-cov.sh
 	cat ./coverage/coverage.json | ./node_modules/codecov.io/bin/codecov.io.js
 
diff --git a/package.json b/package.json
index 66a71c1392..6b702ea164 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "derequire": "^2.0.2",
     "es5-shim": "^4.1.7",
     "eslint": "1.8.0",
+    "flow-bin": "^0.18.1",
     "fs-readdir-recursive": "^0.1.2",
     "gulp": "^3.9.0",
     "gulp-babel": "^5.3.0",