diff --git a/.travis.yml b/.travis.yml
index 083e4fc..0fe342a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,11 +2,9 @@ language: python
 sudo: required
 python:
   - "3.4"
-env:
-  matrix:
-    - TEST_SUITE=test-main
-  global:
-    - BOTO_CONFIG=/tmp/nowhere
+  - "3.5"
+  - "3.6"
+env: TEST_SUITE=test-main
 matrix:
   include:
   - python: "2.7"
@@ -14,26 +12,16 @@ matrix:
   - python: "3.6"
     env: TEST_SUITE=test-static-analysis
   - python: "3.4"
-    env: TEST_SUITE=backend
-    script:
-    - wget https://github.com/houstondatavis/slack-export/archive/master.zip
-    - mv master.zip slack-export-master.zip
-    - zulip/integrations/slack/slackdata2zulipdata.py $PWD/slack-export-master.zip
-    - mv zulip_data.tar.gz $HOME
-    - cd
-    - git clone --depth=50 --branch=slack\+\+ https://github.com/rht/zulip.git
-    - cd zulip
-    - mv ../zulip_data.tar.gz .
-    - tar xf zulip_data.tar.gz
-    - ls zulip_data
-    - ./tools/travis/setup-backend
-    - source tools/travis/activate-venv
-    - ./manage.py import --destroy-rebuild-database $PWD/zulip_data
+    env: TEST_SUITE=test-slack-importer
     addons:
       postgresql: "9.3"
 install:
+  - sudo rm -vf /etc/apt/sources.list.d/*
+  - sudo apt-get update
   - tools/provision --force
   - source zulip-api-py*-venv/bin/activate
+script:
+  - tools/$TEST_SUITE
 after_success:
   - pip install codecov
   - codecov
diff --git a/tools/test-slack-importer b/tools/test-slack-importer
new file mode 100755
index 0000000..78be948
--- /dev/null
+++ b/tools/test-slack-importer
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+set -ev
+
+wget https://github.com/houstondatavis/slack-export/archive/master.zip
+
+mv master.zip slack-export-master.zip
+zulip/integrations/slack/slackdata2zulipdata.py $PWD/slack-export-master.zip
+
+mv zulip_data.tar.gz $HOME
+cd
+git clone --depth=50 --branch=test-slack-importer https://github.com/rheaparekh/zulip.git
+cd zulip
+mv ../zulip_data.tar.gz .
+tar xf zulip_data.tar.gz
+
+./tools/travis/setup-backend
+source tools/travis/activate-venv
+./manage.py import --destroy-rebuild-database $PWD/zulip_data