diff --git a/.travis.yml b/.travis.yml
index c281d3ed7..adf214064 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,8 +31,8 @@ language: minimal
 cache:
   ccache: true
   directories:
-    - depends/built
-    - depends/sdk-sources
+    - $TRAVIS_BUILD_DIR/depends/built
+    - $TRAVIS_BUILD_DIR/depends/sdk-sources
     - $HOME/.ccache
 stages:
   - lint
diff --git a/.travis/test_06_script_b.sh b/.travis/test_06_script_b.sh
index 0420acb99..e40055a6e 100755
--- a/.travis/test_06_script_b.sh
+++ b/.travis/test_06_script_b.sh
@@ -25,3 +25,5 @@ if [ "$RUN_FUZZ_TESTS" = "true" ]; then
   DOCKER_EXEC test/fuzz/test_runner.py -l DEBUG ${DIR_FUZZ_IN}
   END_FOLD
 fi
+
+cd ${TRAVIS_BUILD_DIR} || (echo "could not enter travis build dir $TRAVIS_BUILD_DIR"; exit 1)