diff --git a/.travis.yml b/.travis.yml
index bdda2b402..c58ed85f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,6 @@ install:
       export AWS_ACCESS_KEY_ID=foobar_key
     fi
 script:
-  - make lint
   - make test
 after_success:
   - coveralls
diff --git a/Makefile b/Makefile
index 82aef0cd1..300067296 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ init:
 lint:
 	flake8 moto
 
-test:
+test: lint
 	rm -f .coverage
 	rm -rf cover
 	@nosetests -sv --with-coverage --cover-html ./tests/