diff --git a/.travis.yml b/.travis.yml
index bf15e5f7..88fd07c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,13 +8,10 @@ services:
   - docker
 
 install:
-  - docker-compose build
   - docker-compose up -d
-  - docker exec -it -u root frappe bash -c "cd /home/frappe && chown -R frappe:frappe ./*"
-  - docker exec -i frappe bash -c "cd .. && bench init frappe-bench --ignore-exist --skip-redis-config-generation && cd frappe-bench"
-  - docker exec -i frappe bash -c "mv Procfile_docker Procfile && mv sites/common_site_config_docker.json sites/common_site_config.json"
-  - docker exec -i frappe bash -c "bench new-site site1.local"
-  - docker exec -i -u root frappe bash -c "echo 127.0.0.1   site1.local >> /etc/hosts"
+  - ./bench init frappe-bench
+  - ./bench new-site site1.local
+  - ./bench -c "echo 127.0.0.1   site1.local >> /etc/hosts"
   - sudo su -c 'echo 127.0.0.1   site1.local >> /etc/hosts'
   - pip install --upgrade virtualenv
   - virtualenv -p python3 testenv
diff --git a/bench b/bench
new file mode 100644
index 00000000..9df8ab9f
--- /dev/null
+++ b/bench
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+if [ "$1" == 'init' ]; then
+    docker exec -it frappe bash -c "bench init frappe-bench --ignore-exist --skip-redis-config-generation && mv Procfile_docker Procfile && mv sites/common_site_config_docker.json sites/common_site_config.json && bench set-mariadb-host mariadb"
+elif [[ $# -eq 0 ]]; then
+    docker exec -it frappe bash
+elif [ "$1" == '-c' ]; then
+    shift
+    docker exec -it root frappe bash -c "$@"
+else
+    docker exec -it frappe bash -c "bench $@"
+fi
\ No newline at end of file