diff --git a/.travis.yml b/.travis.yml
index ace0bfb243..0660779b2d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,34 @@
-language: python
 dist: trusty
 
-python:
-  - "2.7"
-  - "3.6"
-
-env:
-  - TEST_TYPE="Server Side Test"
-  - TEST_TYPE="Patch Test"
+language: python
 
 services:
   - mysql
 
+jobs:
+  include:
+  - name: "Python 2.7 Server Side Test"
+    python: 2.7
+    script: bench run-tests --app erpnext --coverage
+
+  - name: "Python 3.6 Server Side Test"
+    python: 3.6
+    script: bench run-tests --app erpnext --coverage
+
+  - name: "Python 2.7 Patch Test"
+    python: 2.7
+    before_script:
+      - wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz
+      - bench --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis
+    script: bench migrate
+
+  - name: "Python 3.6 Patch Test"
+    python: 3.6
+    before_script:
+      - wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz
+      - bench --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis
+    script: bench migrate
+
 install:
   # fix mongodb travis error
   - nvm install 10
@@ -38,8 +55,5 @@ before_script:
   - bench start &
   - sleep 10
 
-script:
-  - bash $TRAVIS_BUILD_DIR/travis/run-tests.sh
-
 after_script:
   - coveralls -b apps/erpnext -d ../../sites/.coverage
diff --git a/travis/run-tests.sh b/travis/run-tests.sh
deleted file mode 100755
index 7cfd64833b..0000000000
--- a/travis/run-tests.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [[ $TEST_TYPE == 'Server Side Test' ]]; then
-    bench run-tests --app erpnext --coverage
-
-elif [[ $TEST_TYPE == 'Patch Test' ]]; then
-    wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz
-    bench --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis
-    bench migrate
-fi