diff --git a/docker-compose.yml b/docker-compose.yml
index f98aa61..d95c67d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -63,6 +63,8 @@ services:
             JAVA_TOOL_OPTIONS: "
                 -Dalfresco.secureComms.secret=alfresco-secret
                 "
+        healthcheck:
+            test: "curl -fsS http://localhost:8983/solr"
 
     activemq:
         image: alfresco/alfresco-activemq:${AAMQ_TAG}