diff --git a/discovery/src/asapo_discovery/common/consts.go b/discovery/src/asapo_discovery/common/consts.go
index e43ea3b1e52bae972c34cb40e658b3d1cc99a98b..46cf71dcdae48f003e3471fab799e0fc243e4090 100644
--- a/discovery/src/asapo_discovery/common/consts.go
+++ b/discovery/src/asapo_discovery/common/consts.go
@@ -1,6 +1,6 @@
 package common
 
-const  (
+var  (
 	NameMongoService = "asapo-mongodb"
 	NameFtsService = "asapo-file-transfer"
 	NameBrokerService = "asapo-broker"
diff --git a/discovery/src/asapo_discovery/request_handler/request_handler_consul.go b/discovery/src/asapo_discovery/request_handler/request_handler_consul.go
index 9db9cb5eecb1e8b466f2a72c7ba3e42225bcbe93..a8180db1579e680eaa41fe2106c8540f84d5328a 100644
--- a/discovery/src/asapo_discovery/request_handler/request_handler_consul.go
+++ b/discovery/src/asapo_discovery/request_handler/request_handler_consul.go
@@ -67,7 +67,7 @@ func (rh *ConsulRequestHandler) GetReceivers(use_ib bool) ([]byte, error) {
 		return nil, errors.New("consul client not connected")
 	}
 	var err error
-	response.Uris, err = rh.GetServices("asapo-receiver",use_ib)
+	response.Uris, err = rh.GetServices(common.NameReceiverService,use_ib)
 	if err != nil {
 		return nil, err
 	}
diff --git a/discovery/src/asapo_discovery/request_handler/request_handler_consul_test.go b/discovery/src/asapo_discovery/request_handler/request_handler_consul_test.go
index 516928011dba75e384b3196d10203a7972bd3a80..44b6b7b101ebd62a22b59fd51eea7c619b88c2ad 100644
--- a/discovery/src/asapo_discovery/request_handler/request_handler_consul_test.go
+++ b/discovery/src/asapo_discovery/request_handler/request_handler_consul_test.go
@@ -48,16 +48,17 @@ func (suite *ConsulHandlerTestSuite) SetupTest() {
 	if err != nil {
 		panic(err)
 	}
-
-	suite.registerAgents("asapo-receiver")
-	suite.registerAgents("asapo-broker")
+	common.NameReceiverService = "asapo-receiver-test"
+	common.NameBrokerService = "asapo-broker-test"
+	suite.registerAgents("asapo-receiver-test")
+	suite.registerAgents("asapo-broker-test")
 }
 
 func (suite *ConsulHandlerTestSuite) TearDownTest() {
-	suite.client.Agent().ServiceDeregister("asapo-receiver1234")
-	suite.client.Agent().ServiceDeregister("asapo-receiver1235")
-	suite.client.Agent().ServiceDeregister("asapo-broker1234")
-	suite.client.Agent().ServiceDeregister("asapo-broker1235")
+	suite.client.Agent().ServiceDeregister("asapo-receiver-test1234")
+	suite.client.Agent().ServiceDeregister("asapo-receiver-test1235")
+	suite.client.Agent().ServiceDeregister("asapo-broker-test1234")
+	suite.client.Agent().ServiceDeregister("asapo-broker-test1235")
 }
 
 func (suite *ConsulHandlerTestSuite) TestInitDefaultUri() {
@@ -154,8 +155,8 @@ func (suite *ConsulHandlerTestSuite) TestGetBrokerStatic() {
 }
 
 func (suite *ConsulHandlerTestSuite) TestGetBrokerEmpty() {
-	suite.client.Agent().ServiceDeregister("asapo-broker1234")
-	suite.client.Agent().ServiceDeregister("asapo-broker1235")
+	suite.client.Agent().ServiceDeregister("asapo-broker-test1234")
+	suite.client.Agent().ServiceDeregister("asapo-broker-test1235")
 
 	suite.handler.Init(consul_settings)
 	res, err := suite.handler.GetSingleService(common.NameBrokerService)