diff --git a/.travis.yml b/.travis.yml
index a923ce0..01b069e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ jobs:
     # Docker Storm master
     - os: linux
       compiler: gcc
-      env: TASK=Test CONFIG=Release DOCKER=storm:travis PYTHON=python3
+      env: TASK=TestDocker CONFIG=Release DOCKER=storm:travis PYTHON=python3
       script:
         travis/build.sh
       deploy:
@@ -38,7 +38,7 @@ jobs:
     # Docker Storm master in debug mode
     - os: linux
       compiler: gcc
-      env: TASK=Test CONFIG=Debug DOCKER=storm:travis-debug PYTHON=python3
+      env: TASK=TestDocker CONFIG=Debug DOCKER=storm:travis-debug PYTHON=python3
       script:
         travis/build.sh
       deploy:
diff --git a/travis/build-helper.sh b/travis/build-helper.sh
index f6a9e41..5d407b9 100755
--- a/travis/build-helper.sh
+++ b/travis/build-helper.sh
@@ -58,27 +58,23 @@ run() {
   esac
   travis_fold end build_stormpy
 
-  # Perform task
-  case $TASK in
-  Test*)
+  # Perform tasks
+  if [[ "$TASK" == *Test* ]]
+  then
     # Run tests
     set +e
     python setup.py test
-    ;;
+  fi
 
-  Documentation*)
+  if [[ "$TASK" == *Documentation* ]]
+  then
     # Generate documentation
     pip install sphinx sphinx_bootstrap_theme
     cd doc
     make html
     touch build/html/.nojekyll
     rm -r build/html/_sources
-    ;;
-
-  *)
-    echo "Unrecognized value of TASK: $TASK"
-    exit 1
-  esac
+  fi
 }