1 files changed, 9 insertions, 22 deletions
diff --git a/ruby/test/Ice/facets/Client.rb b/ruby/test/Ice/facets/Client.rb
index b990ba03c40..d8dbd6f2a85 100755
--- a/ruby/test/Ice/facets/Client.rb
+++ b/ruby/test/Ice/facets/Client.rb
@@ -8,28 +8,15 @@
 #
 # **********************************************************************
 
-require 'pathname'
-require 'Ice'
-Ice::loadSlice('Test.ice')
+require "Ice"
+Ice::loadSlice("Test.ice")
 require './AllTests'
 
-def run(args, communicator)
-    g = allTests(communicator)
-    g.shutdown()
-    return true
+class Client < ::TestHelper
+    def run(args)
+        self.init(args:args) do |communicator|
+            proxy = allTests(self, communicator)
+            proxy.shutdown()
+        end
+    end
 end
-
-begin
-    communicator = Ice::initialize(ARGV)
-    status = run(ARGV, communicator)
-rescue => ex
-    puts $!
-    print ex.backtrace.join("\n")
-    status = false
-end
-
-if communicator
-    communicator.destroy()
-end
-
-exit(status ? 0 : 1)