diff --git a/.travis.yml b/.travis.yml
index 1e78cebc63e..59acb5c0e47 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,13 +18,14 @@ install:
   - pip install --editable .
 
 script:
-    cd ./test_sites/ &&
-	frappe --use test_site &&
-    frappe --reinstall &&
-    frappe --install_app erpnext --verbose &&
-    frappe --verbose --run_tests --app erpnext
+  - cd ./test_sites/
+  - frappe --use test_site
+  - frappe --reinstall
+  - frappe --install_app erpnext --verbose
+  - frappe -b
+  - frappe --serve_test &
+  - frappe --verbose --run_tests --app erpnext
 
 before_script:
-  - mysql -e 'create database test_site' &&
-  - echo "USE mysql;\nUPDATE user SET password=PASSWORD('test_site') WHERE user='test_site';\nFLUSH PRIVILEGES;\n" | mysql -u root
-
+  - mysql -e 'create database test_frappe'
+  - echo "USE mysql;\nCREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe';\nFLUSH PRIVILEGES;\n" | mysql -u root