diff --git a/.travis.yml b/.travis.yml
index 20e7159c..cab094db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ cache:
   - npm
 install:
   - set -eo pipefail
-  - pip install flake8
+  - pip install yapf flake8
   - make pydist
   - make install-dist
   - pip install -r server/requirements-dev.txt
diff --git a/Makefile b/Makefile
index de95fffe..94bf2961 100644
--- a/Makefile
+++ b/Makefile
@@ -62,6 +62,12 @@ fmt: fmt-client fmt-server
 fmt-%:
 	cd $(*) && $(MAKE) fmt
 
+.PHONY: lint
+lint: lint-server
+
+lint-%:
+	cd $(*) && $(MAKE) lint
+
 
 # CREATING DISTRIBUTION RELEASE
 
diff --git a/server/Makefile b/server/Makefile
index 71c5b56c..ae9bbd36 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -2,6 +2,10 @@
 fmt:
 	yapf -ir .
 
+.PHONY: lint
+lint:
+	flake8
+
 .PHONY: clean
 clean:
 	rm -f app/web/templates/index.html
diff --git a/travis-build.sh b/travis-build.sh
index 9f043d0e..ec8a64c7 100755
--- a/travis-build.sh
+++ b/travis-build.sh
@@ -1,5 +1,5 @@
 set -eo pipefail
-flake8 server
+make lint
 npm run --prefix client/ build
 npm run --prefix client/ unit-test
 pytest -s server/test