diff --git a/tools/travis_before_install.sh b/tools/travis_before_install.sh
index 8dad03f7..d1a03ab8 100755
--- a/tools/travis_before_install.sh
+++ b/tools/travis_before_install.sh
@@ -64,3 +64,5 @@ section_end () {
 export -f section
 export -f section_end
 export -f retry
+
+set +ex
diff --git a/tools/travis_script.sh b/tools/travis_script.sh
index ffd21f26..6e40e70c 100755
--- a/tools/travis_script.sh
+++ b/tools/travis_script.sh
@@ -73,11 +73,17 @@ section_end "Install optional dependencies"
 section "Run doc examples"
 
 # Matplotlib settings - do not show figures during doc examples
-MPL_DIR=$HOME/.config/matplotlib
+if [[ $TRAVIS_PYTHON_VERSION == 2.7* ]]; then
+    MPL_DIR=$HOME/.matplotlib
+else
+    MPL_DIR=$HOME/.config/matplotlib
+fi
+
 mkdir -p $MPL_DIR
 touch $MPL_DIR/matplotlibrc
 echo 'backend : Template' > $MPL_DIR/matplotlibrc
 
+
 for f in doc/examples/*.py; do
     python "$f"
     if [ $? -ne 0 ]; then