diff --git a/.travis.yml b/.travis.yml
index d5114c0d..f1d36f3f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,4 +8,6 @@ env:
   - VERSION=$TRAVIS_BRANCH
 
 script:
-- docker-compose -f tests/build.yml -p Mailu build
+  - docker-compose -f tests/build.yml -p Mailu build
+  - tests/compose/test-script.sh
+
diff --git a/tests/compose/core.env b/tests/compose/core.env
index 9477448a..c92c977b 100644
--- a/tests/compose/core.env
+++ b/tests/compose/core.env
@@ -12,7 +12,7 @@
 ROOT=/mailu
 
 # Mailu version to run (1.0, 1.1, etc. or master)
-VERSION=master
+#VERSION=master
 
 # Set to a randomly generated 16 bytes string
 SECRET_KEY=ChangeMeChangeMe
diff --git a/tests/compose/run.yml b/tests/compose/run.yml
index c1667db3..ceee3a3a 100644
--- a/tests/compose/run.yml
+++ b/tests/compose/run.yml
@@ -4,8 +4,8 @@ services:
 
   front:
     image: mailu/nginx:$VERSION
-    restart: no
-    env_file: $ENV_FILE
+    restart: 'no'
+    env_file: $PWD/.env
     ports:
     - "$BIND_ADDRESS4:80:80"
     - "$BIND_ADDRESS4:443:443"
@@ -30,14 +30,14 @@ services:
 
   redis:
     image: redis:alpine
-    restart: no
+    restart: 'no'
     volumes:
       - "$ROOT/redis:/data"
 
   imap:
     image: mailu/dovecot:$VERSION
-    restart: no
-    env_file: $ENV_FILE
+    restart: 'no'
+    env_file: $PWD/.env
     volumes:
       - "$ROOT/data:/data"
       - "$ROOT/mail:/mail"
@@ -47,8 +47,8 @@ services:
 
   smtp:
     image: mailu/postfix:$VERSION
-    restart: no
-    env_file: $ENV_FILE
+    restart: 'no'
+    env_file: $PWD/.env
     volumes:
       - "$ROOT/data:/data"
       - "$ROOT/overrides:/overrides"
@@ -57,8 +57,8 @@ services:
 
   antispam:
     image: mailu/rspamd:$VERSION
-    restart: no
-    env_file: $ENV_FILE
+    restart: 'no'
+    env_file: $PWD/.env
     volumes:
       - "$ROOT/filter:/var/lib/rspamd"
       - "$ROOT/dkim:/dkim"
@@ -68,22 +68,22 @@ services:
 
   antivirus:
     image: mailu/$ANTIVIRUS:$VERSION
-    restart: no
-    env_file: $ENV_FILE
+    restart: 'no'
+    env_file: $PWD/.env
     volumes:
       - "$ROOT/filter:/data"
 
   webdav:
     image: mailu/$WEBDAV:$VERSION
-    restart: no
-    env_file: $ENV_FILE
+    restart: 'no'
+    env_file: $PWD/.env
     volumes:
       - "$ROOT/dav:/data"
 
   admin:
     image: mailu/admin:$VERSION
-    restart: no
-    env_file: $ENV_FILE
+    restart: 'no'
+    env_file: $PWD/.env
     volumes:
       - "$ROOT/data:/data"
       - "$ROOT/dkim:/dkim"
@@ -93,8 +93,8 @@ services:
 
   webmail:
     image: "mailu/$WEBMAIL:$VERSION"
-    restart: no
-    env_file: $ENV_FILE
+    restart: 'no'
+    env_file: $PWD/.env
     volumes:
       - "$ROOT/webmail:/data"
     depends_on:
@@ -102,7 +102,7 @@ services:
 
   fetchmail:
     image: mailu/fetchmail:$VERSION
-    restart: no
-    env_file: $ENV_FILE
+    restart: 'no'
+    env_file: $PWD/.env
     volumes:
       - "$ROOT/data:/data"
diff --git a/tests/compose/test-script.sh b/tests/compose/test-script.sh
new file mode 100755
index 00000000..2f33f12f
--- /dev/null
+++ b/tests/compose/test-script.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+for file in ../*.env ; do
+	cp $file .env
+	docker-compose -f ../run.yml up -d
+done