diff --git a/.travis.yml b/.travis.yml
index 124afc7..0ba4a9e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ install:
   - if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then pip install astor --use-mirrors; fi
   - python setup.py -q install
 # # command to run tests
-script: nosetests
+script: make travis
 notifications:
   email:
     - paultag@gmail.com
diff --git a/Makefile b/Makefile
index e8651c8..07ae6db 100644
--- a/Makefile
+++ b/Makefile
@@ -52,5 +52,12 @@ diff:
 
 r: d tox diff
 
+travis:
+	nosetests -s
+ifeq (PyPy,$(findstring PyPy,$(shell python -V 2>&1 | tail -1)))
+	@echo "skipping flake8 on pypy"
+else
+	flake8 hy bin tests
+endif
 
 .PHONY: docs
diff --git a/hy/util.py b/hy/util.py
index b7581bc..c0fc193 100644
--- a/hy/util.py
+++ b/hy/util.py
@@ -25,4 +25,4 @@ import sys
 if sys.version_info[0] >= 3:
     str_type = str
 else:
-    str_type = unicode
+    str_type = unicode  # NOQA
diff --git a/requirements.txt b/requirements.txt
index a3b23d7..ef71c52 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,3 @@
 # Check site / dev for more deps!
+flake8
 -e git+https://github.com/hylang/rply.git#egg=rply