diff --git a/.travis.yml b/.travis.yml
index af37e44..d75502d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,7 @@ env: TEST_SUITE=test-main
 matrix:
   include:
   - python: "3.6"
-    env: TEST_SUITE=lint
-  - python: "3.6"
-    env: TEST_SUITE=run-mypy
+    env: TEST_SUITE=test-static-analysis
 install:
   - tools/provision
   - source zulip-api-py*-venv/bin/activate
diff --git a/tools/test-static-analysis b/tools/test-static-analysis
new file mode 100755
index 0000000..6e152e6
--- /dev/null
+++ b/tools/test-static-analysis
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ev
+
+tools/lint
+tools/run-mypy