diff --git a/.travis.yml b/.travis.yml
index 8f33d0c04..952ff62b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,10 +10,13 @@ env:
   matrix:
     - PGVERSION=9.5
 before_install:
-  - git clone -b v0.3.3 --depth 1 https://github.com/citusdata/tools.git
-  - tools/travis/setup_apt.sh
-  - tools/travis/nuke_pg.sh
+  - git clone -b v0.4.0 --depth 1 https://github.com/citusdata/tools.git
+  - sudo make -C tools install
+  - setup_apt
+  - nuke_pg
 install:
-  - tools/travis/install_pg.sh
-script: tools/travis/pg_travis_multi_test.sh
-after_success: tools/travis/sync_to_enterprise
+  - install_uncrustify
+  - install_pg
+before_script: citus_indent --quiet --check
+script: pg_travis_multi_test
+after_success: sync_to_enterprise