diff --git a/.travis.yml b/.travis.yml
index a6bd329..a7d6045 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,21 +10,21 @@ env:
 before_install:
   - sudo apt-get update -qq
   - sudo update-alternatives --remove-all postmaster.1.gz
-  - git clone --depth 1 https://gist.github.com/9963879.git tools
-  - tools/nuke_pg.sh
+  - git clone --depth 1 https://github.com/citusdata/tools.git
+  - tools/travis/nuke_pg.sh
 install:
   - sudo apt-get install protobuf-c-compiler
   - sudo apt-get install libprotobuf-c0-dev
   - sudo locale-gen da_DK
   - sudo locale-gen da_DK.utf8
   - sudo pip install cpp-coveralls
-  - tools/install_pg.sh
+  - tools/travis/install_pg.sh
 before_script:
   - chmod 777 .
   - chmod 777 data
   - chmod 666 data/*
-  - tools/config_and_start_cluster.sh
-script: tools/pg_travis_test.sh
+  - tools/travis/config_and_start_cluster.sh
+script: tools/travis/pg_travis_test.sh
 after_success:
   - sudo chmod 666 *.gcda
   - coveralls --exclude cstore.pb-c.c --exclude cstore.pb-c.h