diff --git a/.travis.yml b/.travis.yml
index 3704d07..804737b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,8 @@ install:
   - docker-compose --version
 
 before_script:
-  - docker-compose up -d
+  - tests/generate_tests.sh
+  - docker-compose -f docker-compose.yaml -f docker-test.yaml up -d
   - docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' mailman-core
   - docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' mailman-web
   - docker-compose ps
diff --git a/tests/generate_tests.sh b/tests/generate_tests.sh
new file mode 100644
index 0000000..779cd13
--- /dev/null
+++ b/tests/generate_tests.sh
@@ -0,0 +1,15 @@
+if [ "$TRAVIS_BRANCH" = "master" ]; then
+    TAG="latest"
+else
+    TAG="$TRAVIS_BRANCH"
+fi
+
+
+cat > docker-test.yaml <<EOF
+services:
+  mailman-core:
+    image:maxking/mailman-core:$TAG
+
+  mailman-web:
+    image:maxking/mailman-web:$TAG
+EOF