diff --git a/.travis.yml b/.travis.yml
index 387e968..5e4133a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,14 +4,15 @@ python:
   - "3.4"
   - "3.5"
   - "3.6"
+env: TEST_SUITE=test-main
 matrix:
   include:
   - python: "3.6"
-    env: TEST_SUITE=linter
+    env: TEST_SUITE=lint
 install:
   - pip install pycodestyle==2.3.1
   - pip install ./zulip
   - pip install ./zulip_bots
   - pip install ./zulip_botserver
 script:
-  - tools/travis_tests
+  - tools/$TEST_SUITE
diff --git a/tools/test-main b/tools/test-main
new file mode 100755
index 0000000..8304586
--- /dev/null
+++ b/tools/test-main
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -ev
+
+CURRENT_DIR=$(dirname $(dirname "$0"))
+cd "$CURRENT_DIR"
+
+python -m unittest discover -v zulip_botserver
+tools/test-bots
diff --git a/tools/travis_tests b/tools/travis_tests
deleted file mode 100755
index 336fbf4..0000000
--- a/tools/travis_tests
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-set -ev
-
-CURRENT_DIR=$(dirname "$0")
-cd "$CURRENT_DIR"
-cd ..
-
-if [ "$TEST_SUITE" == "linter" ]
-then
-    tools/lint
-else
-    python -m unittest discover -v zulip_botserver
-    tools/test-bots
-fi