diff --git a/.travis.yml b/.travis.yml
index 1c2c5db858cc191473185429fa29eff356a1f5dc..c9bab7c3080a8fea90c9aa04321043b9f0a4731f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -163,7 +163,7 @@ before_script:
 
 after_script:
   # change directory back to root travis dir
-  - cd $PIWIK_ROOT_DIR
+  - cd $TRAVIS_BUILD_DIR
 
   - if [ -z "$TEST_SUITE" ];
     then php vendor/bin/coveralls -v;
@@ -176,6 +176,7 @@ after_script:
   - cat $PIWIK_ROOT_DIR/config/config.ini.php
 
   # upload test artifacts (for debugging travis failures)
+  - cd $PIWIK_ROOT_DIR
   - ./tests/travis/upload_artifacts.sh
 
 after_success:
diff --git a/plugins/CoreConsole/templates/travis.yml.twig b/plugins/CoreConsole/templates/travis.yml.twig
index e3c8c30efa2ac5eb23579e1d55e924d7feddc636..255d761faa88685f4e491a60d5b284274f273689 100644
--- a/plugins/CoreConsole/templates/travis.yml.twig
+++ b/plugins/CoreConsole/templates/travis.yml.twig
@@ -186,7 +186,7 @@ after_script:
 
 {% endif %}
   # change directory back to root travis dir
-  - cd $PIWIK_ROOT_DIR
+  - cd $TRAVIS_BUILD_DIR
 
   - if [ -z "$TEST_SUITE" ];
     then php vendor/bin/coveralls -v;
@@ -199,6 +199,7 @@ after_script:
   - cat $PIWIK_ROOT_DIR/config/config.ini.php
 
   # upload test artifacts (for debugging travis failures)
+  - cd $PIWIK_ROOT_DIR
   - ./tests/travis/upload_artifacts.sh
 {% if customTravisBuildSteps.after_script.after|default is not empty %}