diff --git a/deps/rabbitmq_federation/test/src/rabbit_federation_exchange_test.erl b/deps/rabbitmq_federation/test/src/rabbit_federation_exchange_test.erl
index cce16f856c..6fe45e995c 100644
--- a/deps/rabbitmq_federation/test/src/rabbit_federation_exchange_test.erl
+++ b/deps/rabbitmq_federation/test/src/rabbit_federation_exchange_test.erl
@@ -74,7 +74,7 @@ multiple_uris_test() ->
 expect_uris([])   -> ok;
 expect_uris(URIs) -> [Link] = rabbit_federation_status:status(),
                      URI = pget(uri, Link),
-                     kill_only_connection(n("rabbit-test")),
+                     kill_only_connection(n(os:getenv("RABBITMQ_NODENAME"))),
                      expect_uris(URIs -- [URI]).
 
 kill_only_connection(Node) ->
diff --git a/deps/rabbitmq_federation/test/src/rabbit_federation_test_util.erl b/deps/rabbitmq_federation/test/src/rabbit_federation_test_util.erl
index d70042e3a8..6d344d9bb7 100644
--- a/deps/rabbitmq_federation/test/src/rabbit_federation_test_util.erl
+++ b/deps/rabbitmq_federation/test/src/rabbit_federation_test_util.erl
@@ -114,8 +114,9 @@ no_plugins(Cfg) ->
 %% "fake" cfg to let us use various utility functions when running
 %% in-broker tests
 single_cfg() ->
-    [{nodename, 'rabbit-test'},
-     {node,     rabbit_nodes:make('rabbit-test')},
+    Nodename = list_to_atom(os:getenv("RABBITMQ_NODENAME")),
+    [{nodename, Nodename},
+     {node,     rabbit_nodes:make(Nodename)},
      {port,     5672}].
 
 %%----------------------------------------------------------------------------