1 files changed, 10 insertions, 23 deletions
diff --git a/cpp/test/Ice/defaultValue/Client.cpp b/cpp/test/Ice/defaultValue/Client.cpp
index 2a78e52bfff..3057e93e872 100644
--- a/cpp/test/Ice/defaultValue/Client.cpp
+++ b/cpp/test/Ice/defaultValue/Client.cpp
@@ -8,37 +8,24 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 using namespace Test;
 
-DEFINE_TEST("client")
+class Client : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
 
-int
-run(int, char**)
+void
+Client::run(int argc, char** argv)
 {
     void allTests();
     allTests();
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-    int status;
-
-    try
-    {
-        status = run(argc, argv);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    return status;
-}
+DEFINE_TEST(Client)