1 files changed, 4 insertions, 2 deletions
diff --git a/qpid/cpp/src/tests/Url.cpp b/qpid/cpp/src/tests/Url.cpp
index faf802ba1e..a1ce2b8cf5 100644
--- a/qpid/cpp/src/tests/Url.cpp
+++ b/qpid/cpp/src/tests/Url.cpp
@@ -16,7 +16,7 @@
  *
  */
 
-#define BOOST_AUTO_TEST_MAIN    // Must come before #include<boost/test/*>
+
 #include <boost/test/auto_unit_test.hpp>
 #include "test_tools.h"
 #include "qpid/Url.h"
@@ -26,6 +26,8 @@ using namespace std;
 using namespace qpid;
 using namespace boost::assign;
 
+BOOST_AUTO_TEST_SUITE(Url);
+
 BOOST_AUTO_TEST_CASE(testUrl_str) {
     Url url;
     url.push_back(TcpAddress("foo.com"));
@@ -59,4 +61,4 @@ BOOST_AUTO_TEST_CASE(testUrl_parse) {
 }
 
 
-
+BOOST_AUTO_TEST_SUITE_END();