diff --git a/docker-alfresco/test/.env b/docker-alfresco/test/.env
index ad8589921a..4f4e747cdd 100644
--- a/docker-alfresco/test/.env
+++ b/docker-alfresco/test/.env
@@ -2,4 +2,5 @@ ALFRESCO_TAG=latest
 SHARE_TAG=6.0.b
 SOLR6_TAG=1.1.1
 POSTGRES_TAG=10.1
+ACTIVEMQ_TAG=5.14.3
 REGISTRY=
\ No newline at end of file
diff --git a/docker-alfresco/test/docker-compose.yml b/docker-alfresco/test/docker-compose.yml
index e7f56aff0d..3cf8d91397 100644
--- a/docker-alfresco/test/docker-compose.yml
+++ b/docker-alfresco/test/docker-compose.yml
@@ -68,3 +68,11 @@ services:
             - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
         ports:
             - 8083:8983 #Browser port
+
+    activemq:
+        image: webcenter/activemq:${ACTIVEMQ_TAG}
+        ports:
+            - 8161:8161 # Web Console
+            - 5672:5672 # AMQP
+            - 61616:61616 # OpenWire
+            - 61613:61613 # STOMP
\ No newline at end of file
diff --git a/docker-alfresco/test/test.env b/docker-alfresco/test/test.env
index 8337d0ee58..55e87cb315 100644
--- a/docker-alfresco/test/test.env
+++ b/docker-alfresco/test/test.env
@@ -2,4 +2,5 @@ export ALFRESCO_TAG=latest
 export SHARE_TAG=6.0.b
 export SOLR6_TAG=1.1.1
 export POSTGRES_TAG=10.1
+export ACTIVEMQ_TAG=5.14.3
 export REGISTRY=
\ No newline at end of file