diff --git a/selenium/bin/suite_template b/selenium/bin/suite_template
index c99e290204d..4b8427994df 100644
--- a/selenium/bin/suite_template
+++ b/selenium/bin/suite_template
@@ -513,13 +513,13 @@ elif [[ "$COMMAND" == "stop-rabbitmq" ]]
   fi
 }
 determine_required_components_including_rabbitmq() {
-  if [[ "$@" != *"rabbitmq"* ]]; then
-    REQUIRED_COMPONENTS+=("rabbitmq")
-  fi
   for (( i=1; i<=$#; i++)) {
     eval val='$'$i
     REQUIRED_COMPONENTS+=( "$val" )
   }
+  if [[ "$@" != *"rabbitmq"* ]]; then
+    REQUIRED_COMPONENTS+=("rabbitmq")
+  fi
 }
 determine_required_components_excluding_rabbitmq() {
   for (( i=1; i<=$#; i++)) {
diff --git a/selenium/suites/authnz-mgt/basic-auth-behind-proxy.sh b/selenium/suites/authnz-mgt/basic-auth-behind-proxy.sh
index 17c83430ebc..5fc83d8d981 100755
--- a/selenium/suites/authnz-mgt/basic-auth-behind-proxy.sh
+++ b/selenium/suites/authnz-mgt/basic-auth-behind-proxy.sh
@@ -6,4 +6,4 @@ TEST_CASES_PATH=/basic-auth
 PROFILES="proxy"
 
 source $SCRIPT/../../bin/suite_template
-runWith proxy
+runWith rabbitmq proxy
diff --git a/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-and-prefix-via-proxy.sh b/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-and-prefix-via-proxy.sh
index efbc223badc..1217a386a99 100755
--- a/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-and-prefix-via-proxy.sh
+++ b/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-and-prefix-via-proxy.sh
@@ -7,4 +7,4 @@ TEST_CONFIG_PATH=/oauth
 PROFILES="uaa fakeportal fakeproxy fakeportal-mgt-oauth-provider idp-initiated mgt-prefix uaa-oauth-provider"
 
 source $SCRIPT/../../bin/suite_template $@
-runWith uaa fakeportal fakeproxy
+runWith rabbitmq uaa fakeportal fakeproxy
diff --git a/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-via-proxy.sh b/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-via-proxy.sh
index 1de40086af1..fc348fb5e18 100755
--- a/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-via-proxy.sh
+++ b/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-via-proxy.sh
@@ -7,4 +7,4 @@ TEST_CONFIG_PATH=/oauth
 PROFILES="uaa fakeportal fakeproxy fakeportal-mgt-oauth-provider idp-initiated uaa-oauth-provider"
 
 source $SCRIPT/../../bin/suite_template $@
-runWith uaa fakeportal fakeproxy
+runWith rabbitmq uaa fakeportal fakeproxy