diff --git a/.gitignore b/.gitignore
index e69de29..72523e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,3 @@
+run_tests
+tests/run_tests_in_isolation
+tests/helpers/helpers.sh
diff --git a/.travis.yml b/.travis.yml
index 1c814e6..7837e7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,14 @@
-# generic packages
+# generic packages and latest Tmux 1.9a
 before_install:
   - sudo apt-get update
   - sudo apt-get install -y git-core expect
   - sudo apt-get install -y python-software-properties software-properties-common
-
-# install latest Tmux 1.9a
-install:
   - sudo add-apt-repository -y ppa:pi-rho/dev
   - sudo apt-get update
   - sudo apt-get install -y tmux=1.9a-1~ppa1~p
 
+install:
+  - git fetch --unshallow --recurse-submodules || git fetch --recurse-submodules
+  - lib/tmux-test/setup
+
 script: ./tests/run_tests_in_isolation
diff --git a/tests/helpers/resurrect_helpers.sh b/tests/helpers/resurrect_helpers.sh
index e584085..0380051 100644
--- a/tests/helpers/resurrect_helpers.sh
+++ b/tests/helpers/resurrect_helpers.sh
@@ -1,11 +1,7 @@
 install_tmux_resurrect_helper() {
 	local plugin_path="${HOME}/.tmux/plugins/tmux-resurrect/"
 	rm -rf "$plugin_path"
-	if [ -n "$TRAVIS" ]; then
-		git clone --recursive https://github.com/tmux-plugins/tmux-resurrect --branch "$TRAVIS_BRANCH" "$plugin_path" >/dev/null 2>&1
-	else # used on vagrant
-		git clone --recursive "${CURRENT_DIR}/../" "$plugin_path" >/dev/null 2>&1
-	fi
+	git clone --recursive "${CURRENT_DIR}/../" "$plugin_path" >/dev/null 2>&1
 }
 
 # we want "fixed" dimensions no matter the size of real display