diff --git a/build-and-test-all.sh b/build-and-test-all.sh
index 6838480..9ab6083 100755
--- a/build-and-test-all.sh
+++ b/build-and-test-all.sh
@@ -2,16 +2,15 @@
 
 set -e
 
-. ./set-env.sh
+export EVENTUATE_EVENT_TRACKER_ITERATIONS=120
 
 ./gradlew testClasses
 
-docker-compose down -v
+docker="./gradlew compose"
 
-docker-compose up --build -d
-
-sleep 10
+${docker}Down
+${docker}Up
 
 ./gradlew $GRADLE_OPTIONS cleanTest build $GRADLE_TASK_OPTIONS
 
-docker-compose down -v
+${docker}Down
diff --git a/build.gradle b/build.gradle
index b1ae718..62a62a9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,9 +4,12 @@ buildscript {
     }
     dependencies {
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
+        classpath "com.avast.gradle:gradle-docker-compose-plugin:0.13.2"
     }
 }
 
+apply plugin: 'docker-compose'
+
 allprojects {
     group = "io.eventuate.messaging.activemq"
 }
@@ -74,12 +77,6 @@ subprojects {
     }
 }
 
-
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.4'
-}
-
-
 gradle.projectsEvaluated {
     task aggregateJavaDocs(type: Javadoc) {
         description = 'Aggregated Javadoc API documentation of all subprojects.'
@@ -92,6 +89,9 @@ gradle.projectsEvaluated {
     }
 }
 
+dockerCompose {
+    projectName = null
+}
 
 
 
diff --git a/eventuate-messaging-activemq-spring-integration-tests/src/test/resources/application.properties b/eventuate-messaging-activemq-spring-integration-tests/src/test/resources/application.properties
new file mode 100644
index 0000000..0f51adc
--- /dev/null
+++ b/eventuate-messaging-activemq-spring-integration-tests/src/test/resources/application.properties
@@ -0,0 +1,3 @@
+activemq.url=tcp://${DOCKER_HOST_IP:localhost}:61616
+activemq.user=eventuateuser
+activemq.password=eventuatepassword
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6ad117d..bb9a0b2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
diff --git a/set-env.sh b/set-env.sh
deleted file mode 100644
index ff61557..0000000
--- a/set-env.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-if [ -z "$DOCKER_HOST_IP" ] ; then
-    if [ -z "$DOCKER_HOST" ] ; then
-      export DOCKER_HOST_IP=`hostname`
-    else
-      echo using ${DOCKER_HOST?}
-      XX=${DOCKER_HOST%\:*}
-      export DOCKER_HOST_IP=${XX#tcp\:\/\/}
-    fi
-fi
-
-echo DOCKER_HOST_IP is $DOCKER_HOST_IP
-
-export EVENTUATE_EVENT_TRACKER_ITERATIONS=120
-export ACTIVEMQ_URL=tcp://${DOCKER_HOST_IP}:61616
-export ACTIVEMQ_USER=eventuateuser
-export ACTIVEMQ_PASSWORD=eventuatepassword