1 files changed, 6 insertions, 5 deletions
diff --git a/cpp/src/tests/failover_soak.cpp b/cpp/src/tests/failover_soak.cpp
index 129c6b9745..5aad2b84e9 100644
--- a/cpp/src/tests/failover_soak.cpp
+++ b/cpp/src/tests/failover_soak.cpp
@@ -34,6 +34,8 @@
 
 #include <boost/assign.hpp>
 
+#include "qpid/framing/Uuid.h"
+
 #include <ForkedBroker.h>
 
 
@@ -42,6 +44,7 @@
 
 using namespace std;
 using boost::assign::list_of;
+using namespace qpid::framing;
 
 
 
@@ -240,10 +243,9 @@ mrand ( int minDesiredVal, int maxDesiredVal ) {
 
 
 void
-makeClusterName ( string & s, int & num ) {
-    num = mrand(1000);
+makeClusterName ( string & s ) {
     stringstream ss;
-    ss << "soakTestCluster_" << num;
+    ss << "soakTestCluster_" << Uuid(true).str();
     s = ss.str();
 }
 
@@ -492,12 +494,11 @@ main ( int argc, char const ** argv )
 
     allMyChildren.verbosity = verbosity;
 
-    int clusterNum;
     string clusterName;
 
     srand ( getpid() );
 
-    makeClusterName ( clusterName, clusterNum );
+    makeClusterName ( clusterName );
 
     brokerVector brokers;