diff --git a/src/test/java/org/elasticsearch/test/integration/TestCluster.java b/src/test/java/org/elasticsearch/test/integration/TestCluster.java
index d6f7296b823..e61e2cef370 100644
--- a/src/test/java/org/elasticsearch/test/integration/TestCluster.java
+++ b/src/test/java/org/elasticsearch/test/integration/TestCluster.java
@@ -167,7 +167,7 @@ public class TestCluster {
 
     public Node buildNode(Settings settings) {
         ensureOpen();
-        String name = "node_" + nextNodeId.getAndIncrement();
+        String name = buildNodeName();
         String settingsSource = getClass().getName().replace('.', '/') + ".yml";
         Settings finalSettings = settingsBuilder()
                 .loadFromClasspath(settingsSource)
@@ -180,6 +180,10 @@ public class TestCluster {
         return node;
     }
 
+    private String buildNodeName() {
+        return "node_" + nextNodeId.getAndIncrement();
+    }
+
     public void setClientFactory(ClientFactory factory) {
         this.clientFactory = factory;
     }
@@ -374,7 +378,7 @@ public class TestCluster {
     public Client nodeClient() {
         ensureOpen();
         if (clientNode == null) {
-            String name = UUID.randomUUID().toString();
+            String name = buildNodeName();
             String settingsSource = getClass().getName().replace('.', '/') + ".yml";
             Settings finalSettings = settingsBuilder().loadFromClasspath(settingsSource).put(defaultSettings).put("node.client", true).put("name", name)
                     .build();