http://bugzilla/bugzilla/show_bug.cgi?id=4333

- Fix bug with the WatchdogThread, which caused hangs if the test failed.
- Get rid of TestUtil.cleanup()

186 files changed, 20 insertions, 224 deletions

diff --git a/cpp/test/Freeze/complex/run.py b/cpp/test/Freeze/complex/run.py
index 5f17077333d..fbf2f56ffd7 100755
--- a/cpp/test/Freeze/complex/run.py
+++ b/cpp/test/Freeze/complex/run.py
@@ -42,4 +42,3 @@ print "ok"
 clientProc.startReader()
 clientProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/cpp/test/Freeze/dbmap/run.py b/cpp/test/Freeze/dbmap/run.py
index 9a8947fa80b..4ae3483a5b9 100755
--- a/cpp/test/Freeze/dbmap/run.py
+++ b/cpp/test/Freeze/dbmap/run.py
@@ -28,4 +28,3 @@ client = os.path.join(os.getcwd(), "client")
 clientProc = TestUtil.startClient(client, " --Freeze.Warn.Rollback=0 %s" % os.getcwd())
 clientProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/cpp/test/Freeze/evictor/run.py b/cpp/test/Freeze/evictor/run.py
index 373caccacaf..b895339b126 100755
--- a/cpp/test/Freeze/evictor/run.py
+++ b/cpp/test/Freeze/evictor/run.py
@@ -27,4 +27,3 @@ testOptions = " --Freeze.DbEnv.db.DbHome=%s --Ice.Config=%s" % (dbdir, os.path.j
 
 TestUtil.clientServerTest(additionalServerOptions= testOptions, additionalClientOptions= testOptions)
 
-TestUtil.cleanup()
diff --git a/cpp/test/FreezeScript/dbmap/run.py b/cpp/test/FreezeScript/dbmap/run.py
index e1e69086096..1cbc620a9dc 100755
--- a/cpp/test/FreezeScript/dbmap/run.py
+++ b/cpp/test/FreezeScript/dbmap/run.py
@@ -138,4 +138,3 @@ if os.system(command) != 0:
 
 print "ok"
 
-TestUtil.cleanup()
diff --git a/cpp/test/FreezeScript/evictor/run.py b/cpp/test/FreezeScript/evictor/run.py
index d37f8c62a69..2c0d5d77d9f 100755
--- a/cpp/test/FreezeScript/evictor/run.py
+++ b/cpp/test/FreezeScript/evictor/run.py
@@ -66,4 +66,3 @@ proc = TestUtil.spawn(command)
 proc.waitTestSuccess()
 print "ok"
 
-TestUtil.cleanup()
diff --git a/cpp/test/Glacier2/attack/run.py b/cpp/test/Glacier2/attack/run.py
index 5290d5b9046..0f29d74b466 100755
--- a/cpp/test/Glacier2/attack/run.py
+++ b/cpp/test/Glacier2/attack/run.py
@@ -37,4 +37,3 @@ TestUtil.clientServerTest()
 
 starterProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/cpp/test/Glacier2/dynamicFiltering/run.py b/cpp/test/Glacier2/dynamicFiltering/run.py
index 42e3b58df51..9fd48964884 100755
--- a/cpp/test/Glacier2/dynamicFiltering/run.py
+++ b/cpp/test/Glacier2/dynamicFiltering/run.py
@@ -51,4 +51,3 @@ proc.waitTestSuccess()
 serverProc.waitTestSuccess()
 starterProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/cpp/test/Glacier2/router/run.py b/cpp/test/Glacier2/router/run.py
index b2a8ae9ba6f..0a402d20def 100755
--- a/cpp/test/Glacier2/router/run.py
+++ b/cpp/test/Glacier2/router/run.py
@@ -71,4 +71,3 @@ TestUtil.clientServerTest(name, additionalClientOptions = " --shutdown")
 
 starterProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/cpp/test/Glacier2/sessionControl/run.py b/cpp/test/Glacier2/sessionControl/run.py
index d767c06626d..1acbd18ae7f 100755
--- a/cpp/test/Glacier2/sessionControl/run.py
+++ b/cpp/test/Glacier2/sessionControl/run.py
@@ -55,4 +55,3 @@ clientProc.waitTestSuccess()
 serverProc.waitTestSuccess()
 starterProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/cpp/test/Glacier2/ssl/run.py b/cpp/test/Glacier2/ssl/run.py
index 725577afd29..75ea6ded937 100755
--- a/cpp/test/Glacier2/ssl/run.py
+++ b/cpp/test/Glacier2/ssl/run.py
@@ -58,4 +58,3 @@ clientProc.waitTestSuccess()
 serverProc.waitTestSuccess()
 starterProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/cpp/test/Glacier2/staticFiltering/run.py b/cpp/test/Glacier2/staticFiltering/run.py
index bc77d572d76..51be16b17e2 100755
--- a/cpp/test/Glacier2/staticFiltering/run.py
+++ b/cpp/test/Glacier2/staticFiltering/run.py
@@ -353,4 +353,3 @@ for testcase in testcases:
     serverProc.waitTestSuccess()
     starterProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/cpp/test/Ice/adapterDeactivation/run.py b/cpp/test/Ice/adapterDeactivation/run.py
index 979b91c2544..2be64dd0b5c 100755
--- a/cpp/test/Ice/adapterDeactivation/run.py
+++ b/cpp/test/Ice/adapterDeactivation/run.py
@@ -23,4 +23,3 @@ from scripts import *
 TestUtil.clientServerTest()
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/cpp/test/Ice/background/run.py b/cpp/test/Ice/background/run.py
index 56d48e628de..801c69ddd03 100755
--- a/cpp/test/Ice/background/run.py
+++ b/cpp/test/Ice/background/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/cpp/test/Ice/binding/run.py b/cpp/test/Ice/binding/run.py
index 56d48e628de..801c69ddd03 100755
--- a/cpp/test/Ice/binding/run.py
+++ b/cpp/test/Ice/binding/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/cpp/test/Ice/checksum/run.py b/cpp/test/Ice/checksum/run.py
index d0a42ae3d24..ae9ef27f2b8 100755
--- a/cpp/test/Ice/checksum/run.py
+++ b/cpp/test/Ice/checksum/run.py
@@ -23,4 +23,3 @@ from scripts import *
 server = os.path.join(os.getcwd(), "server", "server")
 TestUtil.clientServerTest(server = server)
 
-TestUtil.cleanup()
diff --git a/cpp/test/Ice/custom/run.py b/cpp/test/Ice/custom/run.py
index e0779dbf6d2..583856cc44f 100755
--- a/cpp/test/Ice/custom/run.py
+++ b/cpp/test/Ice/custom/run.py
@@ -27,4 +27,3 @@ TestUtil.clientServerTest(server = "serveramd")
 print "tests with collocated server."
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/cpp/test/Ice/defaultServant/run.py b/cpp/test/Ice/defaultServant/run.py
index e46056e57f0..61e942c8177 100755
--- a/cpp/test/Ice/defaultServant/run.py
+++ b/cpp/test/Ice/defaultServant/run.py
@@ -24,4 +24,3 @@ client = os.path.join(os.getcwd(), "client")
 
 TestUtil.simpleTest(client)
 
-TestUtil.cleanup()
diff --git a/cpp/test/Ice/exceptions/run.py b/cpp/test/Ice/exceptions/run.py
index e0779dbf6d2..583856cc44f 100755
--- a/cpp/test/Ice/exceptions/run.py
+++ b/cpp/test/Ice/exceptions/run.py
@@ -27,4 +27,3 @@ TestUtil.clientServerTest(server = "serveramd")
 print "tests with collocated server."
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/cpp/test/Ice/facets/run.py b/cpp/test/Ice/facets/run.py
index 979b91c2544..2be64dd0b5c 100755
--- a/cpp/test/Ice/facets/run.py
+++ b/cpp/test/Ice/facets/run.py
@@ -23,4 +23,3 @@ from scripts import *
 TestUtil.clientServerTest()
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/cpp/test/Ice/faultTolerance/run.py b/cpp/test/Ice/faultTolerance/run.py
index 57e86835cf5..5940db9bef1 100755
--- a/cpp/test/Ice/faultTolerance/run.py
+++ b/cpp/test/Ice/faultTolerance/run.py
@@ -45,4 +45,3 @@ clientProc.waitTestSuccess()
 for p in serverProc:
     p.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/cpp/test/Ice/gc/run.py b/cpp/test/Ice/gc/run.py
index c19f72b7a52..48cf7fc8ad5 100755
--- a/cpp/test/Ice/gc/run.py
+++ b/cpp/test/Ice/gc/run.py
@@ -28,4 +28,3 @@ TestUtil.simpleTest(client, seedfile)
 
 os.remove(seedfile)
 
-TestUtil.cleanup()
diff --git a/cpp/test/Ice/hold/run.py b/cpp/test/Ice/hold/run.py
index 56d48e628de..801c69ddd03 100755
--- a/cpp/test/Ice/hold/run.py
+++ b/cpp/test/Ice/hold/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/cpp/test/Ice/info/run.py b/cpp/test/Ice/info/run.py
index 56d48e628de..801c69ddd03 100755
--- a/cpp/test/Ice/info/run.py
+++ b/cpp/test/Ice/info/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/cpp/test/Ice/inheritance/run.py b/cpp/test/Ice/inheritance/run.py
index 979b91c2544..2be64dd0b5c 100755
--- a/cpp/test/Ice/inheritance/run.py
+++ b/cpp/test/Ice/inheritance/run.py
@@ -23,4 +23,3 @@ from scripts import *
 TestUtil.clientServerTest()
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/cpp/test/Ice/interceptor/run.py b/cpp/test/Ice/interceptor/run.py
index 8dc7158f9da..4e58eaa7849 100755
--- a/cpp/test/Ice/interceptor/run.py
+++ b/cpp/test/Ice/interceptor/run.py
@@ -24,4 +24,3 @@ client = os.path.join(os.getcwd(), "client")
 
 TestUtil.simpleTest(client, " --Ice.Warn.Dispatch=0")
 
-TestUtil.cleanup()
diff --git a/cpp/test/Ice/location/run.py b/cpp/test/Ice/location/run.py
index 56d48e628de..801c69ddd03 100755
--- a/cpp/test/Ice/location/run.py
+++ b/cpp/test/Ice/location/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/cpp/test/Ice/objects/run.py b/cpp/test/Ice/objects/run.py
index 979b91c2544..2be64dd0b5c 100755
--- a/cpp/test/Ice/objects/run.py
+++ b/cpp/test/Ice/objects/run.py
@@ -23,4 +23,3 @@ from scripts import *
 TestUtil.clientServerTest()
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/cpp/test/Ice/operations/run.py b/cpp/test/Ice/operations/run.py
index e0779dbf6d2..583856cc44f 100755
--- a/cpp/test/Ice/operations/run.py
+++ b/cpp/test/Ice/operations/run.py
@@ -27,4 +27,3 @@ TestUtil.clientServerTest(server = "serveramd")
 print "tests with collocated server."
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/cpp/test/Ice/proxy/run.py b/cpp/test/Ice/proxy/run.py
index e0779dbf6d2..583856cc44f 100755
--- a/cpp/test/Ice/proxy/run.py
+++ b/cpp/test/Ice/proxy/run.py
@@ -27,4 +27,3 @@ TestUtil.clientServerTest(server = "serveramd")
 print "tests with collocated server."
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/cpp/test/Ice/retry/run.py b/cpp/test/Ice/retry/run.py
index 56d48e628de..801c69ddd03 100755
--- a/cpp/test/Ice/retry/run.py
+++ b/cpp/test/Ice/retry/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/cpp/test/Ice/servantLocator/run.py b/cpp/test/Ice/servantLocator/run.py
index e0779dbf6d2..583856cc44f 100755
--- a/cpp/test/Ice/servantLocator/run.py
+++ b/cpp/test/Ice/servantLocator/run.py
@@ -27,4 +27,3 @@ TestUtil.clientServerTest(server = "serveramd")
 print "tests with collocated server."
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/cpp/test/Ice/slicing/exceptions/run.py b/cpp/test/Ice/slicing/exceptions/run.py
index eecf185132f..a5e992cd11d 100755
--- a/cpp/test/Ice/slicing/exceptions/run.py
+++ b/cpp/test/Ice/slicing/exceptions/run.py
@@ -25,4 +25,3 @@ TestUtil.clientServerTest()
 print "tests with AMD server."
 TestUtil.clientServerTest(server = "serveramd")
 
-TestUtil.cleanup()
diff --git a/cpp/test/Ice/slicing/objects/run.py b/cpp/test/Ice/slicing/objects/run.py
index 474ffa359c9..14784af0ba6 100755
--- a/cpp/test/Ice/slicing/objects/run.py
+++ b/cpp/test/Ice/slicing/objects/run.py
@@ -25,4 +25,3 @@ TestUtil.clientServerTest()
 print "tests with AMD server."
 TestUtil.clientServerTest(server = "serveramd")
 
-TestUtil.cleanup()
diff --git a/cpp/test/Ice/stream/run.py b/cpp/test/Ice/stream/run.py
index 93807972504..a4d9254f0e5 100755
--- a/cpp/test/Ice/stream/run.py
+++ b/cpp/test/Ice/stream/run.py
@@ -23,4 +23,3 @@ from scripts import *
 client = os.path.join(os.getcwd(), "client")
 TestUtil.simpleTest(client)
 
-TestUtil.cleanup()
diff --git a/cpp/test/Ice/stringConverter/run.py b/cpp/test/Ice/stringConverter/run.py
index 066de70501d..2519ba44cfb 100755
--- a/cpp/test/Ice/stringConverter/run.py
+++ b/cpp/test/Ice/stringConverter/run.py
@@ -24,4 +24,3 @@ client = os.path.join(os.getcwd(), "client")
 
 TestUtil.simpleTest(client)
 
-TestUtil.cleanup()
diff --git a/cpp/test/Ice/threadPoolPriority/run.py b/cpp/test/Ice/threadPoolPriority/run.py
index b2a6468f1e5..22810aabea0 100755
--- a/cpp/test/Ice/threadPoolPriority/run.py
+++ b/cpp/test/Ice/threadPoolPriority/run.py
@@ -25,4 +25,3 @@ TestUtil.clientServerTest()
 print "tests custom server thread pool."
 TestUtil.clientServerTest(server = "servercustom")
 
-TestUtil.cleanup()
diff --git a/cpp/test/Ice/timeout/run.py b/cpp/test/Ice/timeout/run.py
index 56d48e628de..801c69ddd03 100755
--- a/cpp/test/Ice/timeout/run.py
+++ b/cpp/test/Ice/timeout/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/cpp/test/Ice/udp/run.py b/cpp/test/Ice/udp/run.py
index e0165ff92a1..a96c7495ccd 100755
--- a/cpp/test/Ice/udp/run.py
+++ b/cpp/test/Ice/udp/run.py
@@ -40,4 +40,3 @@ clientProc.waitTestSuccess()
 for p in serverProc:
     p.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/cpp/test/IceBox/configuration/run.py b/cpp/test/IceBox/configuration/run.py
index 9064dc1b134..9b8395cb7ae 100755
--- a/cpp/test/IceBox/configuration/run.py
+++ b/cpp/test/IceBox/configuration/run.py
@@ -28,4 +28,3 @@ config2 = os.path.join(os.getcwd(), "config.icebox2")
 TestUtil.clientServerTest(additionalServerOptions= "--Ice.Config=%s" % config, server = icebox)
 TestUtil.clientServerTest(additionalServerOptions= "--Ice.Config=%s" % config2, server = icebox)
 
-TestUtil.cleanup()
diff --git a/cpp/test/IceGrid/activation/run.py b/cpp/test/IceGrid/activation/run.py
index 00134fb51e1..de13d8e8020 100755
--- a/cpp/test/IceGrid/activation/run.py
+++ b/cpp/test/IceGrid/activation/run.py
@@ -23,4 +23,3 @@ from scripts import *
 IceGridAdmin.iceGridTest("application.xml", "",
 	" 'properties-override=%s'" % TestUtil.getCommandLine("", TestUtil.DriverConfig("colloc")).replace("--", ""))
 
-TestUtil.cleanup()
diff --git a/cpp/test/IceGrid/admin/run.py b/cpp/test/IceGrid/admin/run.py
index aa7a63f38be..d051bc4f2bc 100755
--- a/cpp/test/IceGrid/admin/run.py
+++ b/cpp/test/IceGrid/admin/run.py
@@ -254,4 +254,3 @@ IceGridAdmin.iceGridAdmin("node shutdown localnode")
 IceGridAdmin.shutdownIceGridRegistry(registryProcs)
 nodeProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/cpp/test/IceGrid/allocation/run.py b/cpp/test/IceGrid/allocation/run.py
index 9f464fdcd5f..017b208125f 100755
--- a/cpp/test/IceGrid/allocation/run.py
+++ b/cpp/test/IceGrid/allocation/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 IceGridAdmin.iceGridTest("application.xml")
 
-TestUtil.cleanup()
diff --git a/cpp/test/IceGrid/deployer/run.py b/cpp/test/IceGrid/deployer/run.py
index b62a9841b3b..3595970fa14 100755
--- a/cpp/test/IceGrid/deployer/run.py
+++ b/cpp/test/IceGrid/deployer/run.py
@@ -26,4 +26,3 @@ IceGridAdmin.iceGridTest("application.xml", '--TestDir="%s"' % os.getcwd(), '"ic
 IceGridAdmin.iceGridTest("application.xml", '-t --TestDir="%s"' % os.getcwd(),
                          "icebox.exe=%s moreservers moreservices moreproperties" % TestUtil.getIceBox())
 
-TestUtil.cleanup()
diff --git a/cpp/test/IceGrid/distribution/run.py b/cpp/test/IceGrid/distribution/run.py
index d3b61508879..b7b0fdee619 100755
--- a/cpp/test/IceGrid/distribution/run.py
+++ b/cpp/test/IceGrid/distribution/run.py
@@ -66,4 +66,3 @@ IceGridAdmin.iceGridTest("application.xml")
 IceGridAdmin.cleanDbDir(datadir)
 os.rmdir(datadir)
 
-TestUtil.cleanup()
diff --git a/cpp/test/IceGrid/replicaGroup/run.py b/cpp/test/IceGrid/replicaGroup/run.py
index f642d596cc2..3ef3f4a3169 100755
--- a/cpp/test/IceGrid/replicaGroup/run.py
+++ b/cpp/test/IceGrid/replicaGroup/run.py
@@ -23,4 +23,3 @@ from scripts import *
 IceGridAdmin.iceGridTest("application.xml", "--Ice.RetryIntervals=\"0 50 100 250\"",
                          "icebox.exe=%s" % TestUtil.getIceBox())
 
-TestUtil.cleanup()
diff --git a/cpp/test/IceGrid/replication/run.py b/cpp/test/IceGrid/replication/run.py
index 12adf8c0d38..2fef9022081 100755
--- a/cpp/test/IceGrid/replication/run.py
+++ b/cpp/test/IceGrid/replication/run.py
@@ -36,4 +36,3 @@ else:
 
 IceGridAdmin.iceGridTest("application.xml", '--IceDir="%s" --TestDir="%s"' % (TestUtil.toplevel, os.getcwd()),
                          variables)
-TestUtil.cleanup()
diff --git a/cpp/test/IceGrid/session/run.py b/cpp/test/IceGrid/session/run.py
index 5f9d45d0c40..62b7513b69f 100755
--- a/cpp/test/IceGrid/session/run.py
+++ b/cpp/test/IceGrid/session/run.py
@@ -52,4 +52,3 @@ IceGridAdmin.iceGridTest("application.xml",
 
 verifierProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/cpp/test/IceGrid/simple/run.py b/cpp/test/IceGrid/simple/run.py
index ce382bc51f3..5a00b18693d 100755
--- a/cpp/test/IceGrid/simple/run.py
+++ b/cpp/test/IceGrid/simple/run.py
@@ -30,4 +30,3 @@ IceGridAdmin.iceGridClientServerTest("", "--TestAdapter.Endpoints=default --Test
 #
 IceGridAdmin.iceGridTest("simple_server.xml", "--with-deploy")
 
-TestUtil.cleanup()
diff --git a/cpp/test/IceGrid/update/run.py b/cpp/test/IceGrid/update/run.py
index 589e5379762..3a721ebb429 100755
--- a/cpp/test/IceGrid/update/run.py
+++ b/cpp/test/IceGrid/update/run.py
@@ -41,4 +41,3 @@ nodeOverrideOptions = '--IceBinDir="%s" --TestDir="%s" --NodePropertiesOverride=
 
 IceGridAdmin.iceGridTest("", nodeOverrideOptions)
 
-TestUtil.cleanup()
diff --git a/cpp/test/IceSSL/configuration/run.py b/cpp/test/IceSSL/configuration/run.py
index a2276ef921c..4c9cbc476a8 100755
--- a/cpp/test/IceSSL/configuration/run.py
+++ b/cpp/test/IceSSL/configuration/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest(additionalClientOptions = os.getcwd())
 
-TestUtil.cleanup()
diff --git a/cpp/test/IceStorm/federation/run.py b/cpp/test/IceStorm/federation/run.py
index 8183283c508..bfd0d7a83ea 100755
--- a/cpp/test/IceStorm/federation/run.py
+++ b/cpp/test/IceStorm/federation/run.py
@@ -86,4 +86,3 @@ runtest("transient")
 runtest("replicated", replicatedPublisher = False)
 runtest("replicated", replicatedPublisher = True)
 
-TestUtil.cleanup()
diff --git a/cpp/test/IceStorm/federation2/run.py b/cpp/test/IceStorm/federation2/run.py
index 8745a37e452..43f3e11bb36 100755
--- a/cpp/test/IceStorm/federation2/run.py
+++ b/cpp/test/IceStorm/federation2/run.py
@@ -267,5 +267,4 @@ runtest("persistent")
 runtest("replicated", replicatedPublisher = False)
 runtest("replicated", replicatedPublisher = True)
 
-TestUtil.cleanup()
 sys.exit(0)
diff --git a/cpp/test/IceStorm/rep1/run.py b/cpp/test/IceStorm/rep1/run.py
index ebf81e27454..101b88d70df 100755
--- a/cpp/test/IceStorm/rep1/run.py
+++ b/cpp/test/IceStorm/rep1/run.py
@@ -282,4 +282,3 @@ sys.stdout.flush()
 icestorm.stop()
 print "ok"
 
-TestUtil.cleanup()
diff --git a/cpp/test/IceStorm/repgrid/run.py b/cpp/test/IceStorm/repgrid/run.py
index 1b0f3dd4a80..516c42d48e2 100755
--- a/cpp/test/IceStorm/repgrid/run.py
+++ b/cpp/test/IceStorm/repgrid/run.py
@@ -38,4 +38,3 @@ else:
 #
 IceGridAdmin.iceGridTest("application.xml", "", variables)
 
-TestUtil.cleanup()
diff --git a/cpp/test/IceStorm/repstress/run.py b/cpp/test/IceStorm/repstress/run.py
index fec7f4c2f40..0248a86e982 100755
--- a/cpp/test/IceStorm/repstress/run.py
+++ b/cpp/test/IceStorm/repstress/run.py
@@ -115,4 +115,3 @@ print "ok"
 
 print "publisher published %s events, subscriber received %s events" % (publisherCount, subscriberCount)
 
-TestUtil.cleanup()
diff --git a/cpp/test/IceStorm/single/run.py b/cpp/test/IceStorm/single/run.py
index 786dc8ada1a..c3bfc29607b 100755
--- a/cpp/test/IceStorm/single/run.py
+++ b/cpp/test/IceStorm/single/run.py
@@ -69,5 +69,4 @@ dotest("persistent")
 dotest("transient")
 dotest("replicated")
 
-TestUtil.cleanup()
 sys.exit(0)
diff --git a/cpp/test/IceStorm/stress/run.py b/cpp/test/IceStorm/stress/run.py
index e0b687aadc2..00a0cfd8a06 100755
--- a/cpp/test/IceStorm/stress/run.py
+++ b/cpp/test/IceStorm/stress/run.py
@@ -174,4 +174,3 @@ def runtest(type):
 runtest("persistent")
 runtest("replicated")
 
-TestUtil.cleanup()
diff --git a/cpp/test/IceUtil/condvar/run.py b/cpp/test/IceUtil/condvar/run.py
index 9d5aed0aa5f..64348483c65 100755
--- a/cpp/test/IceUtil/condvar/run.py
+++ b/cpp/test/IceUtil/condvar/run.py
@@ -30,4 +30,3 @@ TestUtil.simpleTest(match)
 
 TestUtil.simpleTest(match + " -b")
 
-TestUtil.cleanup()
diff --git a/cpp/test/IceUtil/inputUtil/run.py b/cpp/test/IceUtil/inputUtil/run.py
index 0800b486b30..6ba9edffe00 100755
--- a/cpp/test/IceUtil/inputUtil/run.py
+++ b/cpp/test/IceUtil/inputUtil/run.py
@@ -23,4 +23,3 @@ from scripts import *
 client = os.path.join(os.getcwd(), "client")
 TestUtil.simpleTest(client, os.getcwd())
 
-TestUtil.cleanup()
diff --git a/cpp/test/IceUtil/priority/run.py b/cpp/test/IceUtil/priority/run.py
index 4032afa8644..ecf8320daf9 100755
--- a/cpp/test/IceUtil/priority/run.py
+++ b/cpp/test/IceUtil/priority/run.py
@@ -24,4 +24,3 @@ client = os.path.join(os.getcwd(), "client")
 
 TestUtil.simpleTest(client, os.getcwd())
 
-TestUtil.cleanup()
diff --git a/cpp/test/IceUtil/thread/run.py b/cpp/test/IceUtil/thread/run.py
index aa7bdeaf8ee..123c56353f2 100755
--- a/cpp/test/IceUtil/thread/run.py
+++ b/cpp/test/IceUtil/thread/run.py
@@ -24,4 +24,3 @@ client = os.path.join(os.getcwd(), "client")
 
 TestUtil.simpleTest(client, os.getcwd())
 
-TestUtil.cleanup()
diff --git a/cpp/test/IceUtil/timer/run.py b/cpp/test/IceUtil/timer/run.py
index 93807972504..a4d9254f0e5 100755
--- a/cpp/test/IceUtil/timer/run.py
+++ b/cpp/test/IceUtil/timer/run.py
@@ -23,4 +23,3 @@ from scripts import *
 client = os.path.join(os.getcwd(), "client")
 TestUtil.simpleTest(client)
 
-TestUtil.cleanup()
diff --git a/cpp/test/IceUtil/unicode/run.py b/cpp/test/IceUtil/unicode/run.py
index aa7bdeaf8ee..123c56353f2 100755
--- a/cpp/test/IceUtil/unicode/run.py
+++ b/cpp/test/IceUtil/unicode/run.py
@@ -24,4 +24,3 @@ client = os.path.join(os.getcwd(), "client")
 
 TestUtil.simpleTest(client, os.getcwd())
 
-TestUtil.cleanup()
diff --git a/cpp/test/IceUtil/uuid/run.py b/cpp/test/IceUtil/uuid/run.py
index 93807972504..a4d9254f0e5 100755
--- a/cpp/test/IceUtil/uuid/run.py
+++ b/cpp/test/IceUtil/uuid/run.py
@@ -23,4 +23,3 @@ from scripts import *
 client = os.path.join(os.getcwd(), "client")
 TestUtil.simpleTest(client)
 
-TestUtil.cleanup()
diff --git a/cpp/test/Slice/errorDetection/run.py b/cpp/test/Slice/errorDetection/run.py
index 1cca143dcd0..e27fbfc76af 100755
--- a/cpp/test/Slice/errorDetection/run.py
+++ b/cpp/test/Slice/errorDetection/run.py
@@ -54,5 +54,4 @@ for file in files:
     else:
         print "ok"
 
-TestUtil.cleanup()
 sys.exit(0)
diff --git a/cpp/test/Slice/keyword/run.py b/cpp/test/Slice/keyword/run.py
index 93807972504..a4d9254f0e5 100755
--- a/cpp/test/Slice/keyword/run.py
+++ b/cpp/test/Slice/keyword/run.py
@@ -23,4 +23,3 @@ from scripts import *
 client = os.path.join(os.getcwd(), "client")
 TestUtil.simpleTest(client)
 
-TestUtil.cleanup()
diff --git a/cs/test/Glacier2/router/run.py b/cs/test/Glacier2/router/run.py
index e030392e0a4..f2adb727b59 100755
--- a/cs/test/Glacier2/router/run.py
+++ b/cs/test/Glacier2/router/run.py
@@ -50,4 +50,3 @@ TestUtil.clientServerTest(additionalClientOptions=" --shutdown")
 
 starterProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/cs/test/Ice/adapterDeactivation/run.py b/cs/test/Ice/adapterDeactivation/run.py
index e50097108fa..7325197c499 100755
--- a/cs/test/Ice/adapterDeactivation/run.py
+++ b/cs/test/Ice/adapterDeactivation/run.py
@@ -23,4 +23,3 @@ from scripts import *
 TestUtil.clientServerTest()
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/cs/test/Ice/background/run.py b/cs/test/Ice/background/run.py
index 8b4f9543191..13b35ca9507 100755
--- a/cs/test/Ice/background/run.py
+++ b/cs/test/Ice/background/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/cs/test/Ice/binding/run.py b/cs/test/Ice/binding/run.py
index 8b4f9543191..13b35ca9507 100755
--- a/cs/test/Ice/binding/run.py
+++ b/cs/test/Ice/binding/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/cs/test/Ice/checksum/run.py b/cs/test/Ice/checksum/run.py
index 862049349d9..c68cd54792e 100755
--- a/cs/test/Ice/checksum/run.py
+++ b/cs/test/Ice/checksum/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest(server = os.path.join(os.getcwd(), "server", "server"))
 
-TestUtil.cleanup()
diff --git a/cs/test/Ice/defaultServant/run.py b/cs/test/Ice/defaultServant/run.py
index ab9e282f950..1eb8551fc5e 100755
--- a/cs/test/Ice/defaultServant/run.py
+++ b/cs/test/Ice/defaultServant/run.py
@@ -29,4 +29,3 @@ clientProc.startReader()
 
 clientProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/cs/test/Ice/dictMapping/run.py b/cs/test/Ice/dictMapping/run.py
index 4e847a9908f..cc348a586c3 100755
--- a/cs/test/Ice/dictMapping/run.py
+++ b/cs/test/Ice/dictMapping/run.py
@@ -27,4 +27,3 @@ TestUtil.clientServerTest(server="serveramd")
 print "tests with collocated server."
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/cs/test/Ice/exceptions/run.py b/cs/test/Ice/exceptions/run.py
index 3b550e943f8..6c62f6014cb 100755
--- a/cs/test/Ice/exceptions/run.py
+++ b/cs/test/Ice/exceptions/run.py
@@ -27,4 +27,3 @@ TestUtil.clientServerTest(server="serveramd")
 print "tests with collocated server."
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/cs/test/Ice/facets/run.py b/cs/test/Ice/facets/run.py
index e50097108fa..7325197c499 100755
--- a/cs/test/Ice/facets/run.py
+++ b/cs/test/Ice/facets/run.py
@@ -23,4 +23,3 @@ from scripts import *
 TestUtil.clientServerTest()
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/cs/test/Ice/faultTolerance/run.py b/cs/test/Ice/faultTolerance/run.py
index 956154f5006..6378cb596f0 100755
--- a/cs/test/Ice/faultTolerance/run.py
+++ b/cs/test/Ice/faultTolerance/run.py
@@ -52,4 +52,3 @@ for p in serverProc:
     # results in a non-zero exit status. Therefore we ignore the status.
     p.wait()
 
-TestUtil.cleanup()
diff --git a/cs/test/Ice/hold/run.py b/cs/test/Ice/hold/run.py
index 8b4f9543191..13b35ca9507 100755
--- a/cs/test/Ice/hold/run.py
+++ b/cs/test/Ice/hold/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/cs/test/Ice/info/run.py b/cs/test/Ice/info/run.py
index 56d48e628de..801c69ddd03 100755
--- a/cs/test/Ice/info/run.py
+++ b/cs/test/Ice/info/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/cs/test/Ice/inheritance/run.py b/cs/test/Ice/inheritance/run.py
index e50097108fa..7325197c499 100755
--- a/cs/test/Ice/inheritance/run.py
+++ b/cs/test/Ice/inheritance/run.py
@@ -23,4 +23,3 @@ from scripts import *
 TestUtil.clientServerTest()
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/cs/test/Ice/interceptor/run.py b/cs/test/Ice/interceptor/run.py
index ab9e282f950..1eb8551fc5e 100755
--- a/cs/test/Ice/interceptor/run.py
+++ b/cs/test/Ice/interceptor/run.py
@@ -29,4 +29,3 @@ clientProc.startReader()
 
 clientProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/cs/test/Ice/location/run.py b/cs/test/Ice/location/run.py
index 8b4f9543191..13b35ca9507 100755
--- a/cs/test/Ice/location/run.py
+++ b/cs/test/Ice/location/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/cs/test/Ice/objects/run.py b/cs/test/Ice/objects/run.py
index e50097108fa..7325197c499 100755
--- a/cs/test/Ice/objects/run.py
+++ b/cs/test/Ice/objects/run.py
@@ -23,4 +23,3 @@ from scripts import *
 TestUtil.clientServerTest()
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/cs/test/Ice/operations/run.py b/cs/test/Ice/operations/run.py
index 4e847a9908f..cc348a586c3 100755
--- a/cs/test/Ice/operations/run.py
+++ b/cs/test/Ice/operations/run.py
@@ -27,4 +27,3 @@ TestUtil.clientServerTest(server="serveramd")
 print "tests with collocated server."
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/cs/test/Ice/proxy/run.py b/cs/test/Ice/proxy/run.py
index 4e847a9908f..cc348a586c3 100755
--- a/cs/test/Ice/proxy/run.py
+++ b/cs/test/Ice/proxy/run.py
@@ -27,4 +27,3 @@ TestUtil.clientServerTest(server="serveramd")
 print "tests with collocated server."
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/cs/test/Ice/retry/run.py b/cs/test/Ice/retry/run.py
index 8b4f9543191..13b35ca9507 100755
--- a/cs/test/Ice/retry/run.py
+++ b/cs/test/Ice/retry/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/cs/test/Ice/seqMapping/run.py b/cs/test/Ice/seqMapping/run.py
index 4e847a9908f..cc348a586c3 100755
--- a/cs/test/Ice/seqMapping/run.py
+++ b/cs/test/Ice/seqMapping/run.py
@@ -27,4 +27,3 @@ TestUtil.clientServerTest(server="serveramd")
 print "tests with collocated server."
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/cs/test/Ice/servantLocator/run.py b/cs/test/Ice/servantLocator/run.py
index 2d7a7ba39ab..095cfb7f9a6 100755
--- a/cs/test/Ice/servantLocator/run.py
+++ b/cs/test/Ice/servantLocator/run.py
@@ -27,4 +27,3 @@ TestUtil.clientServerTest(server="serveramd")
 print "tests with collocated server."
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/cs/test/Ice/slicing/exceptions/run.py b/cs/test/Ice/slicing/exceptions/run.py
index ffbb2fb7eb3..cff4165db54 100755
--- a/cs/test/Ice/slicing/exceptions/run.py
+++ b/cs/test/Ice/slicing/exceptions/run.py
@@ -25,4 +25,3 @@ TestUtil.clientServerTest()
 print "tests with AMD server."
 TestUtil.clientServerTest(server="serveramd")
 
-TestUtil.cleanup()
diff --git a/cs/test/Ice/slicing/objects/run.py b/cs/test/Ice/slicing/objects/run.py
index ffbb2fb7eb3..cff4165db54 100755
--- a/cs/test/Ice/slicing/objects/run.py
+++ b/cs/test/Ice/slicing/objects/run.py
@@ -25,4 +25,3 @@ TestUtil.clientServerTest()
 print "tests with AMD server."
 TestUtil.clientServerTest(server="serveramd")
 
-TestUtil.cleanup()
diff --git a/cs/test/Ice/stream/run.py b/cs/test/Ice/stream/run.py
index 234e4795172..04c88502ef6 100755
--- a/cs/test/Ice/stream/run.py
+++ b/cs/test/Ice/stream/run.py
@@ -28,4 +28,3 @@ print "ok"
 clientProc.startReader()
 clientProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/cs/test/Ice/threadPoolPriority/run.py b/cs/test/Ice/threadPoolPriority/run.py
index 8b4f9543191..13b35ca9507 100644
--- a/cs/test/Ice/threadPoolPriority/run.py
+++ b/cs/test/Ice/threadPoolPriority/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/cs/test/Ice/timeout/run.py b/cs/test/Ice/timeout/run.py
index 8b4f9543191..13b35ca9507 100755
--- a/cs/test/Ice/timeout/run.py
+++ b/cs/test/Ice/timeout/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/cs/test/Ice/udp/run.py b/cs/test/Ice/udp/run.py
index e0165ff92a1..a96c7495ccd 100755
--- a/cs/test/Ice/udp/run.py
+++ b/cs/test/Ice/udp/run.py
@@ -40,4 +40,3 @@ clientProc.waitTestSuccess()
 for p in serverProc:
     p.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/cs/test/IceBox/configuration/run.py b/cs/test/IceBox/configuration/run.py
index 57c3c531b36..ea4c34a04f9 100755
--- a/cs/test/IceBox/configuration/run.py
+++ b/cs/test/IceBox/configuration/run.py
@@ -27,4 +27,3 @@ TestUtil.clientServerTest(additionalServerOptions="--Ice.Config=%s" % os.path.jo
 TestUtil.clientServerTest(additionalServerOptions="--Ice.Config=%s" % os.path.join(os.getcwd(), "config.icebox2"),
 	server=icebox)
 
-TestUtil.cleanup()
diff --git a/cs/test/IceGrid/simple/run.py b/cs/test/IceGrid/simple/run.py
index 4d7287f1a46..e5f8a5f3846 100755
--- a/cs/test/IceGrid/simple/run.py
+++ b/cs/test/IceGrid/simple/run.py
@@ -33,4 +33,3 @@ if TestUtil.mono:
 else:
     IceGridAdmin.iceGridTest("simple_server.xml", "--with-deploy")    
 
-TestUtil.cleanup()
diff --git a/cs/test/IceSSL/configuration/run.py b/cs/test/IceSSL/configuration/run.py
index 9a80bf1b00d..6d1b2f72ab7 100755
--- a/cs/test/IceSSL/configuration/run.py
+++ b/cs/test/IceSSL/configuration/run.py
@@ -26,4 +26,3 @@ from scripts import *
 #
 TestUtil.clientServerTest(additionalClientOptions=os.path.splitdrive(os.getcwd())[1])
 
-TestUtil.cleanup()
diff --git a/cs/test/IceUtil/inputUtil/run.py b/cs/test/IceUtil/inputUtil/run.py
index bd260a003b4..51562209018 100755
--- a/cs/test/IceUtil/inputUtil/run.py
+++ b/cs/test/IceUtil/inputUtil/run.py
@@ -28,4 +28,3 @@ print "ok"
 clientProc.startReader()
 clientProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/cs/test/Slice/keyword/run.py b/cs/test/Slice/keyword/run.py
index e5ebe2b6bd6..ceaca6fa1b0 100755
--- a/cs/test/Slice/keyword/run.py
+++ b/cs/test/Slice/keyword/run.py
@@ -28,4 +28,3 @@ print "ok"
 clientProc.startReader()
 clientProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/java/test/Freeze/complex/run.py b/java/test/Freeze/complex/run.py
index b86f1514114..5e0da40b743 100755
--- a/java/test/Freeze/complex/run.py
+++ b/java/test/Freeze/complex/run.py
@@ -41,4 +41,3 @@ print "ok"
 clientProc.startReader()
 clientProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/java/test/Freeze/dbmap/run.py b/java/test/Freeze/dbmap/run.py
index c7c6e9be96e..26e7650b684 100755
--- a/java/test/Freeze/dbmap/run.py
+++ b/java/test/Freeze/dbmap/run.py
@@ -29,4 +29,3 @@ print "ok"
 clientProc.startReader()
 clientProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/java/test/Freeze/evictor/run.py b/java/test/Freeze/evictor/run.py
index 4a3462a612e..6534defd719 100755
--- a/java/test/Freeze/evictor/run.py
+++ b/java/test/Freeze/evictor/run.py
@@ -27,4 +27,3 @@ testOptions = " --Freeze.Warn.Deadlocks=0 --Freeze.DbEnv.db.DbHome=%s/db --Ice.C
 
 TestUtil.clientServerTest(testOptions, testOptions)
 
-TestUtil.cleanup()
diff --git a/java/test/Glacier2/router/run.py b/java/test/Glacier2/router/run.py
index b294a464212..dcd6f41044b 100755
--- a/java/test/Glacier2/router/run.py
+++ b/java/test/Glacier2/router/run.py
@@ -45,4 +45,3 @@ TestUtil.clientServerTest(additionalClientOptions=" --shutdown")
 
 starterProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/adapterDeactivation/run.py b/java/test/Ice/adapterDeactivation/run.py
index 979b91c2544..2be64dd0b5c 100755
--- a/java/test/Ice/adapterDeactivation/run.py
+++ b/java/test/Ice/adapterDeactivation/run.py
@@ -23,4 +23,3 @@ from scripts import *
 TestUtil.clientServerTest()
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/background/run.py b/java/test/Ice/background/run.py
index 56d48e628de..801c69ddd03 100755
--- a/java/test/Ice/background/run.py
+++ b/java/test/Ice/background/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/binding/run.py b/java/test/Ice/binding/run.py
index 56d48e628de..801c69ddd03 100755
--- a/java/test/Ice/binding/run.py
+++ b/java/test/Ice/binding/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/checksum/run.py b/java/test/Ice/checksum/run.py
index 56d48e628de..801c69ddd03 100755
--- a/java/test/Ice/checksum/run.py
+++ b/java/test/Ice/checksum/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/classLoader/run.py b/java/test/Ice/classLoader/run.py
index 56d48e628de..801c69ddd03 100755
--- a/java/test/Ice/classLoader/run.py
+++ b/java/test/Ice/classLoader/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/custom/run.py b/java/test/Ice/custom/run.py
index 979b91c2544..2be64dd0b5c 100755
--- a/java/test/Ice/custom/run.py
+++ b/java/test/Ice/custom/run.py
@@ -23,4 +23,3 @@ from scripts import *
 TestUtil.clientServerTest()
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/defaultServant/run.py b/java/test/Ice/defaultServant/run.py
index a4cb650386d..a4d85bbc279 100755
--- a/java/test/Ice/defaultServant/run.py
+++ b/java/test/Ice/defaultServant/run.py
@@ -27,4 +27,3 @@ clientProc.startReader()
 
 clientProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/exceptions/run.py b/java/test/Ice/exceptions/run.py
index 749cf593b0e..5023bd07ca4 100755
--- a/java/test/Ice/exceptions/run.py
+++ b/java/test/Ice/exceptions/run.py
@@ -29,4 +29,3 @@ TestUtil.clientServerTest(server="test.Ice.exceptions.AMDServer")
 print "tests with collocated server."
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/facets/run.py b/java/test/Ice/facets/run.py
index 979b91c2544..2be64dd0b5c 100755
--- a/java/test/Ice/facets/run.py
+++ b/java/test/Ice/facets/run.py
@@ -23,4 +23,3 @@ from scripts import *
 TestUtil.clientServerTest()
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/faultTolerance/run.py b/java/test/Ice/faultTolerance/run.py
index c71fd66f916..e842cfc850d 100755
--- a/java/test/Ice/faultTolerance/run.py
+++ b/java/test/Ice/faultTolerance/run.py
@@ -41,4 +41,3 @@ clientProc.waitTestSuccess()
 for p in serverProc:
     p.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/hold/run.py b/java/test/Ice/hold/run.py
index 56d48e628de..801c69ddd03 100755
--- a/java/test/Ice/hold/run.py
+++ b/java/test/Ice/hold/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/info/run.py b/java/test/Ice/info/run.py
index 56d48e628de..801c69ddd03 100755
--- a/java/test/Ice/info/run.py
+++ b/java/test/Ice/info/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/inheritance/run.py b/java/test/Ice/inheritance/run.py
index 979b91c2544..2be64dd0b5c 100755
--- a/java/test/Ice/inheritance/run.py
+++ b/java/test/Ice/inheritance/run.py
@@ -23,4 +23,3 @@ from scripts import *
 TestUtil.clientServerTest()
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/interceptor/run.py b/java/test/Ice/interceptor/run.py
index 5d316e77541..d6f3add5ccb 100755
--- a/java/test/Ice/interceptor/run.py
+++ b/java/test/Ice/interceptor/run.py
@@ -27,4 +27,3 @@ clientProc.startReader()
 
 clientProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/location/run.py b/java/test/Ice/location/run.py
index 56d48e628de..801c69ddd03 100755
--- a/java/test/Ice/location/run.py
+++ b/java/test/Ice/location/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/objects/run.py b/java/test/Ice/objects/run.py
index 979b91c2544..2be64dd0b5c 100755
--- a/java/test/Ice/objects/run.py
+++ b/java/test/Ice/objects/run.py
@@ -23,4 +23,3 @@ from scripts import *
 TestUtil.clientServerTest()
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/operations/run.py b/java/test/Ice/operations/run.py
index 2cafe0a9bc1..b6a09d74d5f 100755
--- a/java/test/Ice/operations/run.py
+++ b/java/test/Ice/operations/run.py
@@ -29,4 +29,3 @@ TestUtil.clientServerTest(server="test.Ice.operations.AMDServer")
 print "tests with collocated server."
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/packagemd/run.py b/java/test/Ice/packagemd/run.py
index 56d48e628de..801c69ddd03 100755
--- a/java/test/Ice/packagemd/run.py
+++ b/java/test/Ice/packagemd/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/proxy/run.py b/java/test/Ice/proxy/run.py
index 884a20ce0d6..83b0e9d8d2d 100755
--- a/java/test/Ice/proxy/run.py
+++ b/java/test/Ice/proxy/run.py
@@ -29,4 +29,3 @@ TestUtil.clientServerTest(server="test.Ice.proxy.AMDServer")
 print "tests with collocated server."
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/retry/run.py b/java/test/Ice/retry/run.py
index 56d48e628de..801c69ddd03 100755
--- a/java/test/Ice/retry/run.py
+++ b/java/test/Ice/retry/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/seqMapping/run.py b/java/test/Ice/seqMapping/run.py
index 8283dc5a7d5..618c45881c6 100755
--- a/java/test/Ice/seqMapping/run.py
+++ b/java/test/Ice/seqMapping/run.py
@@ -29,4 +29,3 @@ TestUtil.clientServerTest(server="test.Ice.seqMapping.AMDServer")
 print "tests with collocated server."
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/serialize/run.py b/java/test/Ice/serialize/run.py
index 56d48e628de..801c69ddd03 100755
--- a/java/test/Ice/serialize/run.py
+++ b/java/test/Ice/serialize/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/servantLocator/run.py b/java/test/Ice/servantLocator/run.py
index e59cdae0d46..49cd7b3460b 100755
--- a/java/test/Ice/servantLocator/run.py
+++ b/java/test/Ice/servantLocator/run.py
@@ -29,4 +29,3 @@ TestUtil.clientServerTest(server="test.Ice.servantLocator.AMDServer")
 print "tests with collocated server."
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/slicing/exceptions/run.py b/java/test/Ice/slicing/exceptions/run.py
index 5874eea18e8..e0259425ec7 100755
--- a/java/test/Ice/slicing/exceptions/run.py
+++ b/java/test/Ice/slicing/exceptions/run.py
@@ -29,4 +29,3 @@ amdenv = copy.deepcopy(os.environ)
 TestUtil.addClasspath(os.path.join(os.getcwd(), "..", "exceptionsAMD", "classes"), amdenv)
 TestUtil.clientServerTest(serverenv = amdenv)
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/slicing/objects/run.py b/java/test/Ice/slicing/objects/run.py
index 0ee80b7f64a..c3c43a39e5e 100755
--- a/java/test/Ice/slicing/objects/run.py
+++ b/java/test/Ice/slicing/objects/run.py
@@ -35,4 +35,3 @@ amdenv = copy.deepcopy(os.environ)
 TestUtil.addClasspath(os.path.join(os.getcwd(), "..", "objectsAMD", "classes"), amdenv)
 TestUtil.clientServerTest(serverenv = amdenv)
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/stream/run.py b/java/test/Ice/stream/run.py
index 32da652d782..3300ea67dee 100755
--- a/java/test/Ice/stream/run.py
+++ b/java/test/Ice/stream/run.py
@@ -27,4 +27,3 @@ clientProc.startReader()
 
 clientProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/threadPoolPriority/run.py b/java/test/Ice/threadPoolPriority/run.py
index adf577c233c..80dd3a4070e 100755
--- a/java/test/Ice/threadPoolPriority/run.py
+++ b/java/test/Ice/threadPoolPriority/run.py
@@ -23,4 +23,3 @@ from scripts import *
 print "tests with regular server."
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/timeout/run.py b/java/test/Ice/timeout/run.py
index 56d48e628de..801c69ddd03 100755
--- a/java/test/Ice/timeout/run.py
+++ b/java/test/Ice/timeout/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/java/test/Ice/udp/run.py b/java/test/Ice/udp/run.py
index 8f7de9ad621..42b45257d3c 100755
--- a/java/test/Ice/udp/run.py
+++ b/java/test/Ice/udp/run.py
@@ -39,4 +39,3 @@ clientProc.waitTestSuccess()
 for p in serverProc:
     p.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/java/test/IceBox/configuration/run.py b/java/test/IceBox/configuration/run.py
index fc00938b0d6..fb0b1fb0d7d 100755
--- a/java/test/IceBox/configuration/run.py
+++ b/java/test/IceBox/configuration/run.py
@@ -25,4 +25,3 @@ TestUtil.clientServerTest(additionalServerOptions="--Ice.Config=%s" % os.path.jo
 TestUtil.clientServerTest(additionalServerOptions="--Ice.Config=%s" % os.path.join(os.getcwd(), "config.icebox2"),
 	server=TestUtil.getIceBox())
 
-TestUtil.cleanup()
diff --git a/java/test/IceGrid/simple/run.py b/java/test/IceGrid/simple/run.py
index ce382bc51f3..5a00b18693d 100755
--- a/java/test/IceGrid/simple/run.py
+++ b/java/test/IceGrid/simple/run.py
@@ -30,4 +30,3 @@ IceGridAdmin.iceGridClientServerTest("", "--TestAdapter.Endpoints=default --Test
 #
 IceGridAdmin.iceGridTest("simple_server.xml", "--with-deploy")
 
-TestUtil.cleanup()
diff --git a/java/test/IceSSL/configuration/run.py b/java/test/IceSSL/configuration/run.py
index 7c9c2a9ec07..138300e7c3c 100755
--- a/java/test/IceSSL/configuration/run.py
+++ b/java/test/IceSSL/configuration/run.py
@@ -24,4 +24,3 @@ testdir = os.getcwd()
 
 TestUtil.clientServerTest(additionalClientOptions=testdir)
 
-TestUtil.cleanup()
diff --git a/java/test/IceUtil/inputUtil/run.py b/java/test/IceUtil/inputUtil/run.py
index 2083ea1fcc4..26524108d42 100755
--- a/java/test/IceUtil/inputUtil/run.py
+++ b/java/test/IceUtil/inputUtil/run.py
@@ -26,4 +26,3 @@ print "ok"
 clientProc.startReader()
 clientProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/java/test/Slice/generation/run.py b/java/test/Slice/generation/run.py
index 52857bf95b1..478486e6129 100755
--- a/java/test/Slice/generation/run.py
+++ b/java/test/Slice/generation/run.py
@@ -45,5 +45,4 @@ while i < len(lines1):
 else:
     print "ok"
 
-TestUtil.cleanup()
 sys.exit(0)
diff --git a/java/test/Slice/keyword/run.py b/java/test/Slice/keyword/run.py
index ac3960ffafc..6411919fc71 100755
--- a/java/test/Slice/keyword/run.py
+++ b/java/test/Slice/keyword/run.py
@@ -26,4 +26,3 @@ print "ok"
 clientProc.startReader()
 clientProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/php/test/Ice/binding/run.py b/php/test/Ice/binding/run.py
index 56d48e628de..801c69ddd03 100755
--- a/php/test/Ice/binding/run.py
+++ b/php/test/Ice/binding/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/php/test/Ice/checksum/run.py b/php/test/Ice/checksum/run.py
index 0e1d22c8b58..872639e08b2 100755
--- a/php/test/Ice/checksum/run.py
+++ b/php/test/Ice/checksum/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest(server='server/server')
 
-TestUtil.cleanup()
diff --git a/php/test/Ice/exceptions/run.py b/php/test/Ice/exceptions/run.py
index 26f9f4f7a9e..250b7d6f396 100755
--- a/php/test/Ice/exceptions/run.py
+++ b/php/test/Ice/exceptions/run.py
@@ -25,4 +25,3 @@ TestUtil.clientServerTest()
 print "tests with AMD server."
 TestUtil.clientServerTest(server="serveramd")
 
-TestUtil.cleanup()
diff --git a/php/test/Ice/facets/run.py b/php/test/Ice/facets/run.py
index 56d48e628de..801c69ddd03 100755
--- a/php/test/Ice/facets/run.py
+++ b/php/test/Ice/facets/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/php/test/Ice/info/run.py b/php/test/Ice/info/run.py
index 56d48e628de..801c69ddd03 100755
--- a/php/test/Ice/info/run.py
+++ b/php/test/Ice/info/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/php/test/Ice/inheritance/run.py b/php/test/Ice/inheritance/run.py
index 56d48e628de..801c69ddd03 100755
--- a/php/test/Ice/inheritance/run.py
+++ b/php/test/Ice/inheritance/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/php/test/Ice/objects/run.py b/php/test/Ice/objects/run.py
index 56d48e628de..801c69ddd03 100755
--- a/php/test/Ice/objects/run.py
+++ b/php/test/Ice/objects/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/php/test/Ice/operations/run.py b/php/test/Ice/operations/run.py
index 26f9f4f7a9e..250b7d6f396 100755
--- a/php/test/Ice/operations/run.py
+++ b/php/test/Ice/operations/run.py
@@ -25,4 +25,3 @@ TestUtil.clientServerTest()
 print "tests with AMD server."
 TestUtil.clientServerTest(server="serveramd")
 
-TestUtil.cleanup()
diff --git a/php/test/Ice/proxy/run.py b/php/test/Ice/proxy/run.py
index 26f9f4f7a9e..250b7d6f396 100755
--- a/php/test/Ice/proxy/run.py
+++ b/php/test/Ice/proxy/run.py
@@ -25,4 +25,3 @@ TestUtil.clientServerTest()
 print "tests with AMD server."
 TestUtil.clientServerTest(server="serveramd")
 
-TestUtil.cleanup()
diff --git a/php/test/Ice/slicing/exceptions/run.py b/php/test/Ice/slicing/exceptions/run.py
index f16ed7e4a05..ca712513b21 100755
--- a/php/test/Ice/slicing/exceptions/run.py
+++ b/php/test/Ice/slicing/exceptions/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/php/test/Ice/slicing/objects/run.py b/php/test/Ice/slicing/objects/run.py
index f16ed7e4a05..ca712513b21 100755
--- a/php/test/Ice/slicing/objects/run.py
+++ b/php/test/Ice/slicing/objects/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/php/test/Slice/keyword/run.py b/php/test/Slice/keyword/run.py
index f559459fe89..df81c6608f9 100755
--- a/php/test/Slice/keyword/run.py
+++ b/php/test/Slice/keyword/run.py
@@ -30,4 +30,3 @@ print "ok"
 clientProc.startReader()
 clientProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/py/test/Ice/adapterDeactivation/run.py b/py/test/Ice/adapterDeactivation/run.py
index 979b91c2544..2be64dd0b5c 100755
--- a/py/test/Ice/adapterDeactivation/run.py
+++ b/py/test/Ice/adapterDeactivation/run.py
@@ -23,4 +23,3 @@ from scripts import *
 TestUtil.clientServerTest()
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/py/test/Ice/binding/run.py b/py/test/Ice/binding/run.py
index 56d48e628de..801c69ddd03 100755
--- a/py/test/Ice/binding/run.py
+++ b/py/test/Ice/binding/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/py/test/Ice/blobject/run.py b/py/test/Ice/blobject/run.py
index 9e71481ed14..2d19868f4d8 100755
--- a/py/test/Ice/blobject/run.py
+++ b/py/test/Ice/blobject/run.py
@@ -27,4 +27,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/py/test/Ice/checksum/run.py b/py/test/Ice/checksum/run.py
index 56d48e628de..801c69ddd03 100755
--- a/py/test/Ice/checksum/run.py
+++ b/py/test/Ice/checksum/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/py/test/Ice/custom/run.py b/py/test/Ice/custom/run.py
index 56d48e628de..801c69ddd03 100755
--- a/py/test/Ice/custom/run.py
+++ b/py/test/Ice/custom/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/py/test/Ice/defaultServant/run.py b/py/test/Ice/defaultServant/run.py
index f4bd81310ba..1cdfcf22879 100755
--- a/py/test/Ice/defaultServant/run.py
+++ b/py/test/Ice/defaultServant/run.py
@@ -27,4 +27,3 @@ clientProc.startReader()
 
 clientProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/py/test/Ice/exceptions/run.py b/py/test/Ice/exceptions/run.py
index 5d889c09168..520ec3f8f83 100755
--- a/py/test/Ice/exceptions/run.py
+++ b/py/test/Ice/exceptions/run.py
@@ -27,4 +27,3 @@ TestUtil.clientServerTest(server="ServerAMD.py")
 print "tests with collocated server."
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/py/test/Ice/facets/run.py b/py/test/Ice/facets/run.py
index 979b91c2544..2be64dd0b5c 100755
--- a/py/test/Ice/facets/run.py
+++ b/py/test/Ice/facets/run.py
@@ -23,4 +23,3 @@ from scripts import *
 TestUtil.clientServerTest()
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/py/test/Ice/faultTolerance/run.py b/py/test/Ice/faultTolerance/run.py
index 45a5cb02f73..39ce972af66 100755
--- a/py/test/Ice/faultTolerance/run.py
+++ b/py/test/Ice/faultTolerance/run.py
@@ -45,4 +45,3 @@ clientProc.waitTestSuccess()
 for p in serverProc:
     p.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/py/test/Ice/info/run.py b/py/test/Ice/info/run.py
index 56d48e628de..801c69ddd03 100755
--- a/py/test/Ice/info/run.py
+++ b/py/test/Ice/info/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/py/test/Ice/inheritance/run.py b/py/test/Ice/inheritance/run.py
index 979b91c2544..2be64dd0b5c 100755
--- a/py/test/Ice/inheritance/run.py
+++ b/py/test/Ice/inheritance/run.py
@@ -23,4 +23,3 @@ from scripts import *
 TestUtil.clientServerTest()
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/py/test/Ice/location/run.py b/py/test/Ice/location/run.py
index 56d48e628de..801c69ddd03 100755
--- a/py/test/Ice/location/run.py
+++ b/py/test/Ice/location/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/py/test/Ice/objects/run.py b/py/test/Ice/objects/run.py
index 979b91c2544..2be64dd0b5c 100755
--- a/py/test/Ice/objects/run.py
+++ b/py/test/Ice/objects/run.py
@@ -23,4 +23,3 @@ from scripts import *
 TestUtil.clientServerTest()
 TestUtil.collocatedTest()
 
-TestUtil.cleanup()
diff --git a/py/test/Ice/operations/run.py b/py/test/Ice/operations/run.py
index 86c5472a10a..426b7babcfc 100755
--- a/py/test/Ice/operations/run.py
+++ b/py/test/Ice/operations/run.py
@@ -27,4 +27,3 @@ TestUtil.clientServerTest(server="ServerAMD.py")
 print "tests with collocated server."
 TestUtil.collocatedTest(" --Ice.ThreadPool.Client.SizeMax=2 --Ice.ThreadPool.Client.SizeWarn=0")
 
-TestUtil.cleanup()
diff --git a/py/test/Ice/proxy/run.py b/py/test/Ice/proxy/run.py
index 86c5472a10a..426b7babcfc 100755
--- a/py/test/Ice/proxy/run.py
+++ b/py/test/Ice/proxy/run.py
@@ -27,4 +27,3 @@ TestUtil.clientServerTest(server="ServerAMD.py")
 print "tests with collocated server."
 TestUtil.collocatedTest(" --Ice.ThreadPool.Client.SizeMax=2 --Ice.ThreadPool.Client.SizeWarn=0")
 
-TestUtil.cleanup()
diff --git a/py/test/Ice/retry/run.py b/py/test/Ice/retry/run.py
index 56d48e628de..801c69ddd03 100755
--- a/py/test/Ice/retry/run.py
+++ b/py/test/Ice/retry/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/py/test/Ice/servantLocator/run.py b/py/test/Ice/servantLocator/run.py
index 86c5472a10a..426b7babcfc 100755
--- a/py/test/Ice/servantLocator/run.py
+++ b/py/test/Ice/servantLocator/run.py
@@ -27,4 +27,3 @@ TestUtil.clientServerTest(server="ServerAMD.py")
 print "tests with collocated server."
 TestUtil.collocatedTest(" --Ice.ThreadPool.Client.SizeMax=2 --Ice.ThreadPool.Client.SizeWarn=0")
 
-TestUtil.cleanup()
diff --git a/py/test/Ice/slicing/exceptions/run.py b/py/test/Ice/slicing/exceptions/run.py
index 03ccd381247..a610b4e71bb 100755
--- a/py/test/Ice/slicing/exceptions/run.py
+++ b/py/test/Ice/slicing/exceptions/run.py
@@ -25,4 +25,3 @@ TestUtil.clientServerTest()
 print "tests with AMD server."
 TestUtil.clientServerTest(server="ServerAMD.py")
 
-TestUtil.cleanup()
diff --git a/py/test/Ice/slicing/objects/run.py b/py/test/Ice/slicing/objects/run.py
index 03ccd381247..a610b4e71bb 100755
--- a/py/test/Ice/slicing/objects/run.py
+++ b/py/test/Ice/slicing/objects/run.py
@@ -25,4 +25,3 @@ TestUtil.clientServerTest()
 print "tests with AMD server."
 TestUtil.clientServerTest(server="ServerAMD.py")
 
-TestUtil.cleanup()
diff --git a/py/test/Ice/timeout/run.py b/py/test/Ice/timeout/run.py
index 56d48e628de..801c69ddd03 100755
--- a/py/test/Ice/timeout/run.py
+++ b/py/test/Ice/timeout/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/py/test/Slice/keyword/run.py b/py/test/Slice/keyword/run.py
index 1e5f898cd6c..ce0b27fab72 100755
--- a/py/test/Slice/keyword/run.py
+++ b/py/test/Slice/keyword/run.py
@@ -26,4 +26,3 @@ print "ok"
 clientProc.startReader()
 clientProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/rb/test/Ice/binding/run.py b/rb/test/Ice/binding/run.py
index 56d48e628de..801c69ddd03 100755
--- a/rb/test/Ice/binding/run.py
+++ b/rb/test/Ice/binding/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/rb/test/Ice/checksum/run.py b/rb/test/Ice/checksum/run.py
index 0e1d22c8b58..872639e08b2 100755
--- a/rb/test/Ice/checksum/run.py
+++ b/rb/test/Ice/checksum/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest(server='server/server')
 
-TestUtil.cleanup()
diff --git a/rb/test/Ice/exceptions/run.py b/rb/test/Ice/exceptions/run.py
index 31d2df0dba4..eb98101d346 100755
--- a/rb/test/Ice/exceptions/run.py
+++ b/rb/test/Ice/exceptions/run.py
@@ -25,5 +25,4 @@ TestUtil.clientServerTest()
 print "tests with AMD server."
 TestUtil.clientServerTest(server="serveramd")
 
-TestUtil.cleanup()
 sys.exit(0)
diff --git a/rb/test/Ice/facets/run.py b/rb/test/Ice/facets/run.py
index 56d48e628de..801c69ddd03 100755
--- a/rb/test/Ice/facets/run.py
+++ b/rb/test/Ice/facets/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/rb/test/Ice/info/run.py b/rb/test/Ice/info/run.py
index 56d48e628de..801c69ddd03 100755
--- a/rb/test/Ice/info/run.py
+++ b/rb/test/Ice/info/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/rb/test/Ice/inheritance/run.py b/rb/test/Ice/inheritance/run.py
index 56d48e628de..801c69ddd03 100755
--- a/rb/test/Ice/inheritance/run.py
+++ b/rb/test/Ice/inheritance/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/rb/test/Ice/location/run.py b/rb/test/Ice/location/run.py
index 56d48e628de..801c69ddd03 100755
--- a/rb/test/Ice/location/run.py
+++ b/rb/test/Ice/location/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/rb/test/Ice/objects/run.py b/rb/test/Ice/objects/run.py
index 56d48e628de..801c69ddd03 100755
--- a/rb/test/Ice/objects/run.py
+++ b/rb/test/Ice/objects/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/rb/test/Ice/operations/run.py b/rb/test/Ice/operations/run.py
index 26f9f4f7a9e..250b7d6f396 100755
--- a/rb/test/Ice/operations/run.py
+++ b/rb/test/Ice/operations/run.py
@@ -25,4 +25,3 @@ TestUtil.clientServerTest()
 print "tests with AMD server."
 TestUtil.clientServerTest(server="serveramd")
 
-TestUtil.cleanup()
diff --git a/rb/test/Ice/proxy/run.py b/rb/test/Ice/proxy/run.py
index 31d2df0dba4..eb98101d346 100755
--- a/rb/test/Ice/proxy/run.py
+++ b/rb/test/Ice/proxy/run.py
@@ -25,5 +25,4 @@ TestUtil.clientServerTest()
 print "tests with AMD server."
 TestUtil.clientServerTest(server="serveramd")
 
-TestUtil.cleanup()
 sys.exit(0)
diff --git a/rb/test/Ice/retry/run.py b/rb/test/Ice/retry/run.py
index 56d48e628de..801c69ddd03 100755
--- a/rb/test/Ice/retry/run.py
+++ b/rb/test/Ice/retry/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/rb/test/Ice/slicing/exceptions/run.py b/rb/test/Ice/slicing/exceptions/run.py
index f16ed7e4a05..ca712513b21 100755
--- a/rb/test/Ice/slicing/exceptions/run.py
+++ b/rb/test/Ice/slicing/exceptions/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/rb/test/Ice/slicing/objects/run.py b/rb/test/Ice/slicing/objects/run.py
index f16ed7e4a05..ca712513b21 100755
--- a/rb/test/Ice/slicing/objects/run.py
+++ b/rb/test/Ice/slicing/objects/run.py
@@ -22,4 +22,3 @@ from scripts import *
 
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/rb/test/Ice/timeout/run.py b/rb/test/Ice/timeout/run.py
index adf577c233c..80dd3a4070e 100755
--- a/rb/test/Ice/timeout/run.py
+++ b/rb/test/Ice/timeout/run.py
@@ -23,4 +23,3 @@ from scripts import *
 print "tests with regular server."
 TestUtil.clientServerTest()
 
-TestUtil.cleanup()
diff --git a/rb/test/Slice/keyword/run.py b/rb/test/Slice/keyword/run.py
index 01452365190..77efad48797 100755
--- a/rb/test/Slice/keyword/run.py
+++ b/rb/test/Slice/keyword/run.py
@@ -26,4 +26,3 @@ print "ok"
 clientProc.startReader()
 clientProc.waitTestSuccess()
 
-TestUtil.cleanup()
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index e5c80aa5116..92e8cb65d65 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -7,7 +7,7 @@
 #
 # **********************************************************************
 
-import sys, os, re, errno, getopt, time, StringIO, string, copy, threading, signal
+import sys, os, re, getopt, time, StringIO, string, threading
 
 # Global flags and their default values.
 protocol = ""                   # If unset, default to TCP. Valid values are "tcp" or "ssl".
@@ -501,10 +501,6 @@ def phpSetup():
         tmpini.write("include_path=%s\n" % incDir)
     tmpini.close()
 
-def phpCleanup():
-    if os.path.exists("tmp.ini"):
-        os.remove("tmp.ini")
-
 def getIceVersion():
     config = open(os.path.join(toplevel, "config", "Make.common.rules"), "r")
     return re.search("VERSION[\t\s]*= ([0-9]+\.[0-9]+(\.[0-9]+|b[0-9]*))", config.read()).group(1)
@@ -1122,30 +1118,26 @@ def getTestName():
 
 class WatchDog(threading.Thread):
     def __init__(self):
-        self._done = False
         self._reset = False
         self._cv = threading.Condition()
         threading.Thread.__init__(self)
 
-        #
-        # Setup and install signal handlers
-        #
-        if signal.__dict__.has_key('SIGHUP'):
-            signal.signal(signal.SIGHUP, signal.SIG_DFL)
-        if signal.__dict__.has_key('SIGBREAK'):
-            signal.signal(signal.SIGBREAK, signal.SIG_DFL)
-        signal.signal(signal.SIGINT, signal.SIG_DFL)
-        signal.signal(signal.SIGTERM, signal.SIG_DFL)
+	# The thread is marked as a daemon thread. This is done so that if
+	# an expect script runs off the end of main without kill/wait on each
+	# spawned process the script will not hang tring to join with the
+	# reader thread. Instead __del__ (below) will be called which
+	# terminates and joins with the thread.
+	self.setDaemon(True)
 
         self.start()
 
     def run(self):
         self._cv.acquire()
-        while self._done == False:
+        while True:
             self._cv.wait(180)
             if self._reset:
                 self._reset = False
-            elif not self._done:
+            else:
                 print "\a*** %s Warning: Test has been inactive for 3 minutes and may be hung", time.strftime("%x %X")
         self._cv.release()
 
@@ -1155,28 +1147,17 @@ class WatchDog(threading.Thread):
         self._cv.notify()
         self._cv.release()
 
-    def destroy(self):
-        self._cv.acquire()
-        self._done = True
-        self._cv.notify()
-        self._cv.release()
-
-    def signalHandler(self, sig, frame):
-        self.destroy()
-        self.join()
-    signalHandler = classmethod(signalHandler)
-
-def cleanup():
-    # Stop watch dog thread
-    global watchDog
-    if watchDog != None:
-        watchDog.destroy()
-        watchDog.join()
-        watchDog = None
-
-    lang = getDefaultMapping()
-    if lang == "php":
-        phpCleanup()
+class PhpCleanup:
+    def __del__(self):
+        if os.path.exists("tmp.ini"):
+            os.remove("tmp.ini")
+    
+# TODO: Perhaps this should be done when the tmp.ini file is created.
+lang = getDefaultMapping()
+if getDefaultMapping() == "php":
+    # Instantiate a PhpCleanup object. The __del__ method will
+    # cleanup when the scritp is done.
+    p = PhpCleanup()
 
 def processCmdLine():
     def usage():