diff --git a/.travis.yml b/.travis.yml
index 1b07da5f..a8fe1709 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,8 @@ env:
   - VERSION=$TRAVIS_BRANCH
 
 script:
+  # Default to mailu for DOCKER_ORG
+  - if [ -z "$DOCKER_ORG" ]; then; export DOCKER_ORG="mailu"; fi
   - docker-compose -f tests/build.yml -p Mailu build
   - tests/compose/test-script.sh
 
diff --git a/tests/compose/test-script.sh b/tests/compose/test-script.sh
index 30240bd0..a1ae2cf4 100755
--- a/tests/compose/test-script.sh
+++ b/tests/compose/test-script.sh
@@ -12,11 +12,6 @@ containers=(
 	front
 )
 
-# Default to mailu for DOCKER_ORG
-if [ -z "$DOCKER_ORG" ]; then
-	export DOCKER_ORG="mailu"
-fi
-
 # Verbose sleep, to prevent Travis to cancel the build
 # First argument is desired sleep time in minutes
 v_sleep() {