diff --git a/deps/rabbitmq_stomp/rabbitmq-components.mk b/deps/rabbitmq_stomp/rabbitmq-components.mk
index 4ff4451628..e3417856f8 100644
--- a/deps/rabbitmq_stomp/rabbitmq-components.mk
+++ b/deps/rabbitmq_stomp/rabbitmq-components.mk
@@ -123,7 +123,6 @@ RABBITMQ_COMPONENTS = amqp_client \
 		      rabbitmq_shovel \
 		      rabbitmq_shovel_management \
 		      rabbitmq_stomp \
-		      rabbitmq_test \
 		      rabbitmq_toke \
 		      rabbitmq_top \
 		      rabbitmq_tracing \
@@ -262,10 +261,13 @@ prepare-dist::
 ifneq ($(PROJECT),rabbit)
 ifeq ($(filter rabbit,$(DEPS) $(BUILD_DEPS)),)
 RUN_RMQ_TARGETS = run-broker \
+		  run-tls-broker \
 		  run-background-broker \
 		  run-node \
 		  run-background-node \
-		  start-background-node
+		  start-background-node \
+		  start-background-broker \
+		  start-rabbit-on-node
 
 ifneq ($(filter $(RUN_RMQ_TARGETS),$(MAKECMDGOALS)),)
 BUILD_DEPS += rabbit
@@ -273,7 +275,7 @@ endif
 endif
 
 ifeq ($(filter rabbit,$(DEPS) $(BUILD_DEPS) $(TEST_DEPS)),)
-ifneq ($(filter check tests tests-with-broker test,$(MAKECMDGOALS)),)
+ifneq ($(filter check tests,$(MAKECMDGOALS)),)
 TEST_DEPS += rabbit
 endif
 endif