1 files changed, 3 insertions, 4 deletions
diff --git a/qpid/cpp/src/tests/cluster_client.cpp b/qpid/cpp/src/tests/cluster_client.cpp
index 7620faa9fa..d3ce25540d 100644
--- a/qpid/cpp/src/tests/cluster_client.cpp
+++ b/qpid/cpp/src/tests/cluster_client.cpp
@@ -19,13 +19,14 @@
 #include "qpid/client/Connection.h"
 #include "qpid/shared_ptr.h"
 
-#define BOOST_AUTO_TEST_MAIN    // Must come before #include<boost/test/*>
 #include <boost/test/auto_unit_test.hpp>
+BOOST_AUTO_TEST_SUITE(cluster_client);
 
 #include <fstream>
 #include <vector>
 #include <functional>
 
+
 using namespace std;
 using namespace qpid;
 using namespace qpid::client;
@@ -77,6 +78,4 @@ BOOST_AUTO_TEST_CASE(testWiringReplication) {
     }
 }
 
-
-
-    
+BOOST_AUTO_TEST_SUITE_END();