1 files changed, 9 insertions, 14 deletions
diff --git a/csharp/test/Ice/acm/Client.cs b/csharp/test/Ice/acm/Client.cs
index 94430a12ed2..181eff97acd 100644
--- a/csharp/test/Ice/acm/Client.cs
+++ b/csharp/test/Ice/acm/Client.cs
@@ -8,7 +8,6 @@
 // **********************************************************************
 
 using System;
-using System.Diagnostics;
 using System.Reflection;
 
 [assembly: CLSCompliant(true)]
@@ -17,24 +16,20 @@ using System.Reflection;
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client : TestCommon.Application
+public class Client : Test.TestHelper
 {
-    public override int run(string[] args)
+    override public void run(string[] args)
     {
-        AllTests.allTests(this);
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        return initData;
+        Ice.Properties properties = createTestProperties(ref args);
+        properties.setProperty("Ice.Warn.Connections", "0");
+        using(var communicator = initialize(properties))
+        {
+            AllTests.allTests(this);
+        }
     }
 
     public static int Main(string[] args)
     {
-        Client app = new Client();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Client>(args);
     }
 }