diff --git a/.travis.yml b/.travis.yml
index 6b0bcbf7b01..2083ee376cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -68,7 +68,7 @@ before_script:
 - cd ..
 script: 
 - cd ./.travis
-- if [ -n "$CGAL_DEBUG_TRAVIS" ]; then  bash -x -e ./build_package.sh $PACKAGE; else bash -e ./build_package.sh $PACKAGE; fi
+- bash ./build_package.sh $PACKAGE
 notifications:
   email:
     on_success: change # default: always
diff --git a/.travis/build_package.sh b/.travis/build_package.sh
index a211a18ab5b..eb88324c187 100755
--- a/.travis/build_package.sh
+++ b/.travis/build_package.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -e
+[ -n "$CGAL_DEBUG_TRAVIS" ] && set -x
 
 CXX_FLAGS="-DCGAL_NDEBUG"
 
diff --git a/.travis/template.txt b/.travis/template.txt
index 624e017c441..2bf7648de68 100644
--- a/.travis/template.txt
+++ b/.travis/template.txt
@@ -25,7 +25,7 @@ before_script:
 - cd ..
 script: 
 - cd ./.travis
-- if [ -n "$CGAL_DEBUG_TRAVIS" ]; then  bash -x -e ./build_package.sh $PACKAGE; else bash -e ./build_package.sh $PACKAGE; fi
+- bash ./build_package.sh $PACKAGE
 notifications:
   email:
     on_success: change # default: always