diff --git a/charts/alfresco-search-enterprise/tests/reindexing-job_test.yaml b/charts/alfresco-search-enterprise/tests/reindexing-job_test.yaml
index fb7ad33b..df977515 100644
--- a/charts/alfresco-search-enterprise/tests/reindexing-job_test.yaml
+++ b/charts/alfresco-search-enterprise/tests/reindexing-job_test.yaml
@@ -13,6 +13,22 @@ tests:
               configMapKeyRef:
                 name: RELEASE-NAME-alfresco-search-enterprise-repository
                 key: REPOSITORY_URL
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: BROKER_USERNAME
+            valueFrom:
+              secretKeyRef:
+                name: RELEASE-NAME-alfresco-search-enterprise-mq
+                key: BROKER_USERNAME
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: BROKER_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: RELEASE-NAME-alfresco-search-enterprise-mq
+                key: BROKER_PASSWORD
       - contains:
           path: spec.template.spec.containers[0].env
           content:
@@ -38,8 +54,14 @@ tests:
                 name: RELEASE-NAME-alfresco-database
                 key: DATABASE_URL
 
-  - it: should have overridden secret for spring database credentials when existingSecretName is set
+  - it: should have overridden secrets when existingSecret is set
     set:
+      messageBroker:
+        existingSecret:
+          name: mqsecret
+          keys:
+            username: MQUSER
+            password: MQPASS
       reindexing.db:
         existingSecret:
           name: my-custom-secret
@@ -51,6 +73,22 @@ tests:
           keys:
             url: CUSTOM_URL_KEY
     asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: BROKER_USERNAME
+            valueFrom:
+              secretKeyRef:
+                name: mqsecret
+                key: MQUSER
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: BROKER_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: mqsecret
+                key: MQPASS
       - contains:
           path: spec.template.spec.containers[0].env
           content:
diff --git a/charts/alfresco-search-enterprise/tests/secret-messagebroker_test.yaml b/charts/alfresco-search-enterprise/tests/secret-messagebroker_test.yaml
index 52e9dae1..1eea9c1a 100644
--- a/charts/alfresco-search-enterprise/tests/secret-messagebroker_test.yaml
+++ b/charts/alfresco-search-enterprise/tests/secret-messagebroker_test.yaml
@@ -18,8 +18,8 @@ tests:
     set:
       activemq.enabled: false
       messageBroker:
-        url: jdbc://
-        user: ext-admin
+        url: ssl://mq.domain.tld:61617
+        username: ext-admin
         password: ext-pass
     asserts:
       - equal: