Bug 3816 - make tests less timing sensitive

130 files changed, 252 insertions, 128 deletions

diff --git a/cpp/test/Freeze/complex/run.py b/cpp/test/Freeze/complex/run.py
index 04f9d5edd85..5f17077333d 100755
--- a/cpp/test/Freeze/complex/run.py
+++ b/cpp/test/Freeze/complex/run.py
@@ -41,3 +41,5 @@ clientProc = TestUtil.startClient(client, " --dbdir %s validate" % os.getcwd(),
 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 777e6a55b0a..9a8947fa80b 100755
--- a/cpp/test/Freeze/dbmap/run.py
+++ b/cpp/test/Freeze/dbmap/run.py
@@ -27,3 +27,5 @@ 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/Client.cpp b/cpp/test/Freeze/evictor/Client.cpp
index f69b837e1c8..3ba601b0b5e 100644
--- a/cpp/test/Freeze/evictor/Client.cpp
+++ b/cpp/test/Freeze/evictor/Client.cpp
@@ -464,7 +464,7 @@ private:
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, bool transactional, bool shutdown)
 {
-    string ref = "factory:default -p 12010 -t 30000";
+    string ref = "factory:default -p 12010";
     Ice::ObjectPrx base = communicator->stringToProxy(ref);
     test(base);
     Test::RemoteEvictorFactoryPrx factory = Test::RemoteEvictorFactoryPrx::checkedCast(base);
diff --git a/cpp/test/Freeze/evictor/Server.cpp b/cpp/test/Freeze/evictor/Server.cpp
index 94c2e91a09e..0817429da82 100644
--- a/cpp/test/Freeze/evictor/Server.cpp
+++ b/cpp/test/Freeze/evictor/Server.cpp
@@ -68,7 +68,7 @@ public:
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, const string& envName)
 {
-    communicator->getProperties()->setProperty("Factory.Endpoints", "default -p 12010 -t 30000");
+    communicator->getProperties()->setProperty("Factory.Endpoints", "default -p 12010");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("Factory");
 
     communicator->addObjectFactory(new ServantFactory, "::Test::Servant");
diff --git a/cpp/test/Freeze/evictor/run.py b/cpp/test/Freeze/evictor/run.py
index 00a127220d0..373caccacaf 100755
--- a/cpp/test/Freeze/evictor/run.py
+++ b/cpp/test/Freeze/evictor/run.py
@@ -26,3 +26,5 @@ TestUtil.cleanDbDir(dbdir)
 testOptions = " --Freeze.DbEnv.db.DbHome=%s --Ice.Config=%s" % (dbdir, os.path.join(os.getcwd(), "config"))
 
 TestUtil.clientServerTest(additionalServerOptions= testOptions, additionalClientOptions= testOptions)
+
+TestUtil.cleanup()
diff --git a/cpp/test/Freeze/oldevictor/Client.cpp b/cpp/test/Freeze/oldevictor/Client.cpp
index 0bd8f6668d6..96a1ba3446e 100644
--- a/cpp/test/Freeze/oldevictor/Client.cpp
+++ b/cpp/test/Freeze/oldevictor/Client.cpp
@@ -366,7 +366,7 @@ private:
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    string ref = "factory:default -p 12010 -t 30000";
+    string ref = "factory:default -p 12010";
     Ice::ObjectPrx base = communicator->stringToProxy(ref);
     test(base);
     Test::RemoteEvictorFactoryPrx factory = Test::RemoteEvictorFactoryPrx::checkedCast(base);
diff --git a/cpp/test/Freeze/oldevictor/Server.cpp b/cpp/test/Freeze/oldevictor/Server.cpp
index e5b874853ae..222e1fc1d9f 100644
--- a/cpp/test/Freeze/oldevictor/Server.cpp
+++ b/cpp/test/Freeze/oldevictor/Server.cpp
@@ -50,7 +50,7 @@ public:
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, const string& envName)
 {
-    communicator->getProperties()->setProperty("Factory.Endpoints", "default -p 12010 -t 30000");
+    communicator->getProperties()->setProperty("Factory.Endpoints", "default -p 12010");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("Factory");
 
     Test::RemoteEvictorFactoryPtr factory = new Test::RemoteEvictorFactoryI(adapter, envName);
diff --git a/cpp/test/Freeze/oldevictor/run.py b/cpp/test/Freeze/oldevictor/run.py
index b7895100038..e5e01aca4e4 100755
--- a/cpp/test/Freeze/oldevictor/run.py
+++ b/cpp/test/Freeze/oldevictor/run.py
@@ -26,3 +26,5 @@ TestUtil.cleanDbDir(dbdir)
 testOptions = " --Freeze.DbEnv.db.DbHome=%s --Ice.Config=%s" % (dbdir, os.path.join(os.getcwd(), "config"))
 
 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 2f74967395e..e1e69086096 100755
--- a/cpp/test/FreezeScript/dbmap/run.py
+++ b/cpp/test/FreezeScript/dbmap/run.py
@@ -137,3 +137,5 @@ if os.system(command) != 0:
     sys.exit(1)
 
 print "ok"
+
+TestUtil.cleanup()
diff --git a/cpp/test/FreezeScript/evictor/run.py b/cpp/test/FreezeScript/evictor/run.py
index dc1f16fd944..d37f8c62a69 100755
--- a/cpp/test/FreezeScript/evictor/run.py
+++ b/cpp/test/FreezeScript/evictor/run.py
@@ -65,3 +65,5 @@ command = transformdb + " -e --old " + testnew + " --new " + testnew + " -f " +
 proc = TestUtil.spawn(command)
 proc.waitTestSuccess()
 print "ok"
+
+TestUtil.cleanup()
diff --git a/cpp/test/Glacier2/attack/Client.cpp b/cpp/test/Glacier2/attack/Client.cpp
index e007bc697be..274718f88ea 100644
--- a/cpp/test/Glacier2/attack/Client.cpp
+++ b/cpp/test/Glacier2/attack/Client.cpp
@@ -45,7 +45,7 @@ int
 AttackClient::run(int argc, char* argv[])
 {
     cout << "getting router... " << flush;
-    ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:default -p 12347 -t 10000");
+    ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:default -p 12347");
     Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(routerBase);
     test(router);
     communicator()->setDefaultRouter(router);
@@ -56,7 +56,7 @@ AttackClient::run(int argc, char* argv[])
     cout << "ok" << endl;
 
     cout << "making thousands of invocations on proxies... " << flush;
-    ObjectPrx backendBase = communicator()->stringToProxy("dummy:tcp -p 12010 -t 10000");
+    ObjectPrx backendBase = communicator()->stringToProxy("dummy:tcp -p 12010");
     BackendPrx backend = BackendPrx::uncheckedCast(backendBase);
     backend->ice_ping();
 
@@ -114,7 +114,7 @@ AttackClient::run(int argc, char* argv[])
     cout << "testing server and router shutdown... " << flush;
     backend->shutdown();
     communicator()->setDefaultRouter(0);
-    ObjectPrx adminBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348 -t 10000");
+    ObjectPrx adminBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348");
     Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(adminBase);
     test(process);
     process->shutdown();
diff --git a/cpp/test/Glacier2/attack/Server.cpp b/cpp/test/Glacier2/attack/Server.cpp
index 851aeab57f2..fad21d5f6c7 100644
--- a/cpp/test/Glacier2/attack/Server.cpp
+++ b/cpp/test/Glacier2/attack/Server.cpp
@@ -58,7 +58,7 @@ main(int argc, char* argv[])
 int
 BackendServer::run(int argc, char* argv[])
 {
-    communicator()->getProperties()->setProperty("BackendAdapter.Endpoints", "tcp -p 12010 -t 10000");
+    communicator()->getProperties()->setProperty("BackendAdapter.Endpoints", "tcp -p 12010");
     ObjectAdapterPtr adapter = communicator()->createObjectAdapter("BackendAdapter");
     adapter->addServantLocator(new ServantLocatorI, "");
     adapter->activate();
diff --git a/cpp/test/Glacier2/attack/run.py b/cpp/test/Glacier2/attack/run.py
index 8ad632913ec..7a162745e01 100755
--- a/cpp/test/Glacier2/attack/run.py
+++ b/cpp/test/Glacier2/attack/run.py
@@ -24,8 +24,8 @@ testdir = os.getcwd()
 router = os.path.join(TestUtil.getCppBinDir(), "glacier2router")
 
 args = ' --Glacier2.RoutingTable.MaxSize=10' + \
-       ' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \
-       ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \
+       ' --Glacier2.Client.Endpoints="default -p 12347"' + \
+       ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348"' + \
        ' --Ice.Admin.InstanceName=Glacier2' + \
        ' --Glacier2.CryptPasswords="' + os.path.join(testdir, "passwords")  + '"'
 
@@ -36,3 +36,5 @@ print "ok"
 TestUtil.clientServerTest()
 
 starterProc.waitTestSuccess()
+
+TestUtil.cleanup()
diff --git a/cpp/test/Glacier2/dynamicFiltering/Client.cpp b/cpp/test/Glacier2/dynamicFiltering/Client.cpp
index 9c6047bac79..d80edc19313 100644
--- a/cpp/test/Glacier2/dynamicFiltering/Client.cpp
+++ b/cpp/test/Glacier2/dynamicFiltering/Client.cpp
@@ -169,7 +169,7 @@ SessionControlClient::run(int argc, char* argv[])
     // Shut down the router.
     //
     communicator()->setDefaultRouter(0);
-    ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -p 12348 -t 10000");
+    ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -p 12348");
     Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(processBase);
     test(process);
     process->shutdown();
diff --git a/cpp/test/Glacier2/dynamicFiltering/run.py b/cpp/test/Glacier2/dynamicFiltering/run.py
index 618a4ede438..26b152716da 100755
--- a/cpp/test/Glacier2/dynamicFiltering/run.py
+++ b/cpp/test/Glacier2/dynamicFiltering/run.py
@@ -28,13 +28,13 @@ print "ok"
 
 router = os.path.join(TestUtil.getCppBinDir(), "glacier2router")
 
-args = r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \
-        r' --Ice.Admin.Endpoints="tcp -p 12348 -t 10000"' + \
+args = r' --Glacier2.Client.Endpoints="default -p 12347"' + \
+        r' --Ice.Admin.Endpoints="tcp -p 12348"' + \
         r' --Ice.Admin.InstanceName=Glacier2' + \
-        r' --Glacier2.Server.Endpoints="default -p 12349 -t 10000"' + \
-        r' --Glacier2.SessionManager="SessionManager:tcp -p 12010 -t 10000"' + \
+        r' --Glacier2.Server.Endpoints="default -p 12349"' + \
+        r' --Glacier2.SessionManager="SessionManager:tcp -p 12010"' + \
         r' --Glacier2.PermissionsVerifier="Glacier2/NullPermissionsVerifier"' + \
-        r' --Ice.Default.Locator="locator:default -p 12012 -t 10000"'
+        r' --Ice.Default.Locator="locator:default -p 12012"'
 
 print "starting router...",
 starterProc = TestUtil.startServer(router, args, count=2) 
@@ -50,3 +50,5 @@ proc.waitTestSuccess()
 
 serverProc.waitTestSuccess()
 starterProc.waitTestSuccess()
+
+TestUtil.cleanup()
diff --git a/cpp/test/Glacier2/router/Client.cpp b/cpp/test/Glacier2/router/Client.cpp
index ee02193888d..8e04ca58ee3 100644
--- a/cpp/test/Glacier2/router/Client.cpp
+++ b/cpp/test/Glacier2/router/Client.cpp
@@ -86,7 +86,7 @@ public:
     void run()
     {
         CommunicatorPtr communicator = initialize(initData);
-        ObjectPrx routerBase = communicator->stringToProxy("Glacier2/router:default -p 12347 -t 10000");
+        ObjectPrx routerBase = communicator->stringToProxy("Glacier2/router:default -p 12347");
         Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(routerBase);
         communicator->setDefaultRouter(router);
 
@@ -109,7 +109,7 @@ public:
         ident.category = category;
         CallbackReceiverPrx receiver = CallbackReceiverPrx::uncheckedCast(adapter->add(_callbackReceiver, ident));
         
-        ObjectPrx base = communicator->stringToProxy("c1/callback:tcp -p 12010 -t 10000");
+        ObjectPrx base = communicator->stringToProxy("c1/callback:tcp -p 12010");
         base = base->ice_oneway();
         CallbackPrx callback = CallbackPrx::uncheckedCast(base);
 
@@ -193,7 +193,7 @@ public:
     void run()
     {
         CommunicatorPtr communicator = initialize(initData);
-        ObjectPrx routerBase = communicator->stringToProxy("Glacier2/router:default -p 12347 -t 30000");
+        ObjectPrx routerBase = communicator->stringToProxy("Glacier2/router:default -p 12347");
         _router = Glacier2::RouterPrx::checkedCast(routerBase);
         communicator->setDefaultRouter(_router);
 
@@ -211,7 +211,7 @@ public:
         ident.category = category;
         CallbackReceiverPrx receiver = CallbackReceiverPrx::uncheckedCast(adapter->add(_callbackReceiver, ident));
         
-        ObjectPrx base = communicator->stringToProxy("c1/callback:tcp -p 12010 -t 10000");
+        ObjectPrx base = communicator->stringToProxy("c1/callback:tcp -p 12010");
         base = base->ice_oneway();
         CallbackPrx callback = CallbackPrx::uncheckedCast(base);
 
@@ -438,7 +438,7 @@ CallbackClient::run(int argc, char* argv[])
 
     {
         cout << "testing stringToProxy for router... " << flush;
-        routerBase = communicator()->stringToProxy("Glacier2/router:default -p 12347 -t 10000");
+        routerBase = communicator()->stringToProxy("Glacier2/router:default -p 12347");
         cout << "ok" << endl;
     }
     
@@ -468,7 +468,7 @@ CallbackClient::run(int argc, char* argv[])
 
     {
         cout << "testing stringToProxy for server object... " << flush;
-        base = communicator()->stringToProxy("c1/callback:tcp -p 12010 -t 10000");
+        base = communicator()->stringToProxy("c1/callback:tcp -p 12010");
         cout << "ok" << endl;
     }
         
@@ -874,7 +874,7 @@ CallbackClient::run(int argc, char* argv[])
 
         {
             cout << "testing stringToProxy for admin process facet... " << flush;
-            processBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348 -t 10000");
+            processBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348");
             cout << "ok" << endl;
         }
         
diff --git a/cpp/test/Glacier2/router/Server.cpp b/cpp/test/Glacier2/router/Server.cpp
index 549283cad68..91caef56f0f 100644
--- a/cpp/test/Glacier2/router/Server.cpp
+++ b/cpp/test/Glacier2/router/Server.cpp
@@ -37,7 +37,7 @@ main(int argc, char* argv[])
 int
 CallbackServer::run(int argc, char* argv[])
 {
-    communicator()->getProperties()->setProperty("CallbackAdapter.Endpoints", "tcp -p 12010 -t 10000");
+    communicator()->getProperties()->setProperty("CallbackAdapter.Endpoints", "tcp -p 12010");
     ObjectAdapterPtr adapter = communicator()->createObjectAdapter("CallbackAdapter");
     adapter->add(new CallbackI(), communicator()->stringToIdentity("c1/callback")); // The test allows "c1" as category.
     adapter->add(new CallbackI(), communicator()->stringToIdentity("c2/callback")); // The test allows "c2" as category.
diff --git a/cpp/test/Glacier2/router/run.py b/cpp/test/Glacier2/router/run.py
index 9fb9a8e2240..8ac83d7b822 100755
--- a/cpp/test/Glacier2/router/run.py
+++ b/cpp/test/Glacier2/router/run.py
@@ -29,9 +29,9 @@ def startRouter(buffered):
            ' --Glacier2.Filter.Category.Accept="c1 c2"' + \
            ' --Glacier2.Filter.Category.AcceptUser="2"' + \
            ' --Glacier2.SessionTimeout="30"' + \
-           ' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \
-           ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1 -t 10000"' \
-           ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \
+           ' --Glacier2.Client.Endpoints="default -p 12347"' + \
+           ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1"' \
+           ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348"' + \
            ' --Ice.Admin.InstanceName="Glacier2"' + \
            ' --Glacier2.CryptPasswords="%s"' % os.path.join(os.getcwd(), "passwords")
 
@@ -70,3 +70,5 @@ TestUtil.clientServerTest()
 TestUtil.clientServerTest(name, additionalClientOptions = " --shutdown")
 
 starterProc.waitTestSuccess()
+
+TestUtil.cleanup()
diff --git a/cpp/test/Glacier2/sessionControl/Client.cpp b/cpp/test/Glacier2/sessionControl/Client.cpp
index 7d78af40274..23210091976 100644
--- a/cpp/test/Glacier2/sessionControl/Client.cpp
+++ b/cpp/test/Glacier2/sessionControl/Client.cpp
@@ -45,7 +45,7 @@ int
 SessionControlClient::run(int argc, char* argv[])
 {
     cout << "getting router... " << flush;
-    ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:default -p 12347 -t 10000");
+    ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:default -p 12347");
     Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(routerBase);
     test(router);
     communicator()->setDefaultRouter(router);
@@ -105,7 +105,7 @@ SessionControlClient::run(int argc, char* argv[])
     session = Test::SessionPrx::uncheckedCast(router->createSession("userid", "abc123"));
     session->shutdown();
     communicator()->setDefaultRouter(0);
-    ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -p 12348 -t 10000");
+    ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -p 12348");
     Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(processBase);
     test(process);
     process->shutdown();
diff --git a/cpp/test/Glacier2/sessionControl/Server.cpp b/cpp/test/Glacier2/sessionControl/Server.cpp
index 477fe5b8f83..150a2569dc1 100644
--- a/cpp/test/Glacier2/sessionControl/Server.cpp
+++ b/cpp/test/Glacier2/sessionControl/Server.cpp
@@ -32,7 +32,7 @@ main(int argc, char* argv[])
 int
 SessionControlServer::run(int argc, char* argv[])
 {
-    communicator()->getProperties()->setProperty("SessionControlAdapter.Endpoints", "tcp -p 12010 -t 10000");
+    communicator()->getProperties()->setProperty("SessionControlAdapter.Endpoints", "tcp -p 12010");
     ObjectAdapterPtr adapter = communicator()->createObjectAdapter("SessionControlAdapter");
     adapter->add(new SessionManagerI, communicator()->stringToIdentity("SessionManager"));
     adapter->activate();
diff --git a/cpp/test/Glacier2/sessionControl/run.py b/cpp/test/Glacier2/sessionControl/run.py
index 71797a19354..d6e1ae94615 100755
--- a/cpp/test/Glacier2/sessionControl/run.py
+++ b/cpp/test/Glacier2/sessionControl/run.py
@@ -28,11 +28,11 @@ print "ok"
 
 router = os.path.join(TestUtil.getCppBinDir(), "glacier2router")
 
-args =    ' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \
-          ' --Ice.Admin.Endpoints="tcp -p 12348 -t 10000"' + \
+args =    ' --Glacier2.Client.Endpoints="default -p 12347"' + \
+          ' --Ice.Admin.Endpoints="tcp -p 12348"' + \
           ' --Ice.Admin.InstanceName=Glacier2' + \
-          ' --Glacier2.Server.Endpoints="default -p 12349 -t 10000"' + \
-          ' --Glacier2.SessionManager="SessionManager:tcp -p 12010 -t 10000"' \
+          ' --Glacier2.Server.Endpoints="default -p 12349"' + \
+          ' --Glacier2.SessionManager="SessionManager:tcp -p 12010"' \
           ' --Glacier2.PermissionsVerifier="Glacier2/NullPermissionsVerifier"'
 
 print "starting router...",
@@ -54,3 +54,5 @@ clientProc.startReader()
 clientProc.waitTestSuccess()
 serverProc.waitTestSuccess()
 starterProc.waitTestSuccess()
+
+TestUtil.cleanup()
diff --git a/cpp/test/Glacier2/ssl/Client.cpp b/cpp/test/Glacier2/ssl/Client.cpp
index b19af8b7c46..d258ff8eb55 100644
--- a/cpp/test/Glacier2/ssl/Client.cpp
+++ b/cpp/test/Glacier2/ssl/Client.cpp
@@ -42,7 +42,7 @@ int
 CallbackClient::run(int argc, char* argv[])
 {
     Glacier2::RouterPrx router = Glacier2::RouterPrx::uncheckedCast(
-        communicator()->stringToProxy("Glacier2/router:tcp -h 127.0.0.1 -p 12347 -t 10000"));
+        communicator()->stringToProxy("Glacier2/router:tcp -h 127.0.0.1 -p 12347"));
     communicator()->setDefaultRouter(router);
 
     //
@@ -81,7 +81,7 @@ CallbackClient::run(int argc, char* argv[])
     //
     communicator()->setDefaultRouter(Glacier2::RouterPrx());
     router = Glacier2::RouterPrx::uncheckedCast(
-        communicator()->stringToProxy("Glacier2/router:ssl -h 127.0.0.1 -p 12348 -t 10000"));
+        communicator()->stringToProxy("Glacier2/router:ssl -h 127.0.0.1 -p 12348"));
     communicator()->setDefaultRouter(router);
 
     //
@@ -121,7 +121,7 @@ CallbackClient::run(int argc, char* argv[])
 
     communicator()->setDefaultRouter(0);
     Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(
-        communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12349 -t 10000"));
+        communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12349"));
     process->shutdown();
     
     return EXIT_SUCCESS;
diff --git a/cpp/test/Glacier2/ssl/Server.cpp b/cpp/test/Glacier2/ssl/Server.cpp
index f053535ffec..431eff941ca 100644
--- a/cpp/test/Glacier2/ssl/Server.cpp
+++ b/cpp/test/Glacier2/ssl/Server.cpp
@@ -125,7 +125,7 @@ int
 SessionServer::run(int argc, char* argv[])
 {
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapterWithEndpoints(
-        "SessionServer", "tcp -h 127.0.0.1 -p 12350 -t 10000");
+        "SessionServer", "tcp -h 127.0.0.1 -p 12350");
     adapter->add(new SSLPermissionsVerifierI, communicator()->stringToIdentity("sslverifier"));
     adapter->add(new SessionManagerI, communicator()->stringToIdentity("sessionmanager"));
     adapter->add(new SSLSessionManagerI, communicator()->stringToIdentity("sslsessionmanager"));
diff --git a/cpp/test/Glacier2/ssl/run.py b/cpp/test/Glacier2/ssl/run.py
index 14f10c06f14..e4654ac785d 100755
--- a/cpp/test/Glacier2/ssl/run.py
+++ b/cpp/test/Glacier2/ssl/run.py
@@ -30,14 +30,14 @@ router = os.path.join(TestUtil.getCppBinDir(), "glacier2router")
 
 args = ' --Ice.Warn.Dispatch=0' + \
        ' --Glacier2.AddSSLContext=1' + \
-       ' --Glacier2.Client.Endpoints="tcp -h 127.0.0.1 -p 12347 -t 10000:ssl -h 127.0.0.1 -p 12348 -t 10000"' + \
-       ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1 -t 10000"' \
-       ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12349 -t 10000"' + \
+       ' --Glacier2.Client.Endpoints="tcp -h 127.0.0.1 -p 12347:ssl -h 127.0.0.1 -p 12348"' + \
+       ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1"' \
+       ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12349"' + \
        ' --Ice.Admin.InstanceName=Glacier2' + \
-       ' --Glacier2.SessionManager="sessionmanager:tcp -h 127.0.0.1 -p 12350 -t 10000"' + \
+       ' --Glacier2.SessionManager="sessionmanager:tcp -h 127.0.0.1 -p 12350"' + \
        ' --Glacier2.PermissionsVerifier="Glacier2/NullPermissionsVerifier"' + \
-       ' --Glacier2.SSLSessionManager="sslsessionmanager:tcp -h 127.0.0.1 -p 12350 -t 10000"' + \
-       ' --Glacier2.SSLPermissionsVerifier="sslverifier:tcp -h 127.0.0.1 -p 12350 -t 10000"'
+       ' --Glacier2.SSLSessionManager="sslsessionmanager:tcp -h 127.0.0.1 -p 12350"' + \
+       ' --Glacier2.SSLPermissionsVerifier="sslverifier:tcp -h 127.0.0.1 -p 12350"'
 
 routerCfg = TestUtil.DriverConfig("server")
 routerCfg.protocol = "ssl"
@@ -56,3 +56,5 @@ clientProc.startReader()
 clientProc.waitTestSuccess()
 serverProc.waitTestSuccess()
 starterProc.waitTestSuccess()
+
+TestUtil.cleanup()
diff --git a/cpp/test/Glacier2/staticFiltering/Client.cpp b/cpp/test/Glacier2/staticFiltering/Client.cpp
index 0c87fe89c7a..6dc3d7c3770 100644
--- a/cpp/test/Glacier2/staticFiltering/Client.cpp
+++ b/cpp/test/Glacier2/staticFiltering/Client.cpp
@@ -46,7 +46,7 @@ main(int argc, char* argv[])
 int
 AttackClient::run(int argc, char* argv[])
 {
-    ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:default -p 12347 -t 60000");
+    ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:default -p 12347");
     Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(routerBase);
     test(router);
     communicator()->setDefaultRouter(router);
@@ -144,7 +144,7 @@ AttackClient::run(int argc, char* argv[])
     communicator()->setDefaultRouter(0);
     try
     {
-        BackendPrx backend = BackendPrx::checkedCast(communicator()->stringToProxy("dummy:tcp -p 12010 -t 60000"));
+        BackendPrx backend = BackendPrx::checkedCast(communicator()->stringToProxy("dummy:tcp -p 12010"));
         backend->shutdown();
     }
     catch(const Ice::LocalException&)
@@ -152,7 +152,7 @@ AttackClient::run(int argc, char* argv[])
         test(false);
     }
 
-    ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348 -t 60000");
+    ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348");
     Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(processBase);
     test(process);
     process->shutdown();
diff --git a/cpp/test/Glacier2/staticFiltering/Server.cpp b/cpp/test/Glacier2/staticFiltering/Server.cpp
index 0bd96ffcc83..67621374cd7 100644
--- a/cpp/test/Glacier2/staticFiltering/Server.cpp
+++ b/cpp/test/Glacier2/staticFiltering/Server.cpp
@@ -126,9 +126,8 @@ main(int argc, char* argv[])
 int
 BackendServer::run(int argc, char* argv[])
 {
-    string endpoints = 
-        communicator()->getProperties()->getPropertyWithDefault("BackendAdapter.Endpoints", 
-                                                                "tcp -p 12010 -t 20000:ssl -p 12011 -t 20000");
+    string endpoints = communicator()->getProperties()->getPropertyWithDefault("BackendAdapter.Endpoints", 
+                                                                               "tcp -p 12010:ssl -p 12011");
 
     communicator()->getProperties()->setProperty("BackendAdapter.Endpoints", endpoints);
     ObjectAdapterPtr adapter = communicator()->createObjectAdapter("BackendAdapter");
diff --git a/cpp/test/Glacier2/staticFiltering/run.py b/cpp/test/Glacier2/staticFiltering/run.py
index 24a35181cf5..f08014112a5 100755
--- a/cpp/test/Glacier2/staticFiltering/run.py
+++ b/cpp/test/Glacier2/staticFiltering/run.py
@@ -273,8 +273,8 @@ for testcase in testcases:
     #
 
     routerArgs = " --Ice.Config=" + os.path.join(os.getcwd(), "router.cfg") + \
-          ' --Glacier2.Client.Endpoints="default -p 12347 -t 60000"' + \
-          ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 60000"' + \
+          ' --Glacier2.Client.Endpoints="default -p 12347"' + \
+          ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348"' + \
           ' --Ice.Admin.InstanceName=Glacier2' + \
           ' --Glacier2.CryptPasswords="'  + os.path.join(os.getcwd(), "passwords") + '"'
 
@@ -322,7 +322,7 @@ for testcase in testcases:
     if TestUtil.protocol != "ssl":
         serverConfig = file(os.path.join(os.getcwd(), "server.cfg"), "w")
         serverOptions = ' --Ice.Config=' + os.path.join(os.getcwd(), "server.cfg") + " " 
-        serverConfig.write("BackendAdapter.Endpoints=tcp -p 12010 -t 20000\n")
+        serverConfig.write("BackendAdapter.Endpoints=tcp -p 12010\n")
         serverConfig.close()
     else:
         serverOptions = ""
@@ -352,3 +352,5 @@ for testcase in testcases:
     clientProc.waitTestSuccess()
     serverProc.waitTestSuccess()
     starterProc.waitTestSuccess()
+
+TestUtil.cleanup()
diff --git a/cpp/test/Ice/adapterDeactivation/AllTests.cpp b/cpp/test/Ice/adapterDeactivation/AllTests.cpp
index 8ce4164ef42..17d19743457 100644
--- a/cpp/test/Ice/adapterDeactivation/AllTests.cpp
+++ b/cpp/test/Ice/adapterDeactivation/AllTests.cpp
@@ -19,7 +19,7 @@ TestIntfPrx
 allTests(const CommunicatorPtr& communicator)
 {
     cout << "testing stringToProxy... " << flush;
-    ObjectPrx base = communicator->stringToProxy("test:default -p 12010 -t 10000");
+    ObjectPrx base = communicator->stringToProxy("test:default -p 12010");
     test(base);
     cout << "ok" << endl;
 
diff --git a/cpp/test/Ice/adapterDeactivation/Collocated.cpp b/cpp/test/Ice/adapterDeactivation/Collocated.cpp
index 15d5e0c29b9..da872819318 100644
--- a/cpp/test/Ice/adapterDeactivation/Collocated.cpp
+++ b/cpp/test/Ice/adapterDeactivation/Collocated.cpp
@@ -33,7 +33,7 @@ main(int argc, char* argv[])
 int
 TestServer::run(int argc, char* argv[])
 {
-    communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+    communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010");
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
     ServantLocatorPtr locator = new ServantLocatorI;
     adapter->addServantLocator(locator, "");
diff --git a/cpp/test/Ice/adapterDeactivation/Server.cpp b/cpp/test/Ice/adapterDeactivation/Server.cpp
index 8a20e8144b8..6c173d3ec83 100644
--- a/cpp/test/Ice/adapterDeactivation/Server.cpp
+++ b/cpp/test/Ice/adapterDeactivation/Server.cpp
@@ -31,7 +31,7 @@ main(int argc, char* argv[])
 int
 TestServer::run(int argc, char* argv[])
 {
-    communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
+    communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
     ServantLocatorPtr locator = new ServantLocatorI;
     
diff --git a/cpp/test/Ice/adapterDeactivation/run.py b/cpp/test/Ice/adapterDeactivation/run.py
index 545214a74c7..979b91c2544 100755
--- a/cpp/test/Ice/adapterDeactivation/run.py
+++ b/cpp/test/Ice/adapterDeactivation/run.py
@@ -22,3 +22,5 @@ from scripts import *
 
 TestUtil.clientServerTest()
 TestUtil.collocatedTest()
+
+TestUtil.cleanup()
diff --git a/cpp/test/Ice/background/AllTests.cpp b/cpp/test/Ice/background/AllTests.cpp
index 1f2c9e6b6b1..dedf41ffbf0 100644
--- a/cpp/test/Ice/background/AllTests.cpp
+++ b/cpp/test/Ice/background/AllTests.cpp
@@ -245,13 +245,13 @@ void readWriteTests(const ConfigurationPtr&, const Test::BackgroundPrx&, const T
 BackgroundPrx
 allTests(const Ice::CommunicatorPtr& communicator)
 {
-    string sref = "background:default -p 12010 -t 20000";
+    string sref = "background:default -p 12010";
     Ice::ObjectPrx obj = communicator->stringToProxy(sref);
     test(obj);
 
     BackgroundPrx background = BackgroundPrx::uncheckedCast(obj);
 
-    sref = "backgroundController:tcp -p 12011 -t 20000";
+    sref = "backgroundController:tcp -p 12011";
     obj = communicator->stringToProxy(sref);
     test(obj);
 
@@ -303,7 +303,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         backgroundController->resumeCall("findAdapterById");
 
-        obj = communicator->stringToProxy("locator:default -p 12010 -t 10000");
+        obj = communicator->stringToProxy("locator:default -p 12010");
         locator = Ice::LocatorPrx::uncheckedCast(obj);
         obj = obj->ice_locator(locator);
         obj->ice_ping();
@@ -343,7 +343,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         backgroundController->resumeCall("getClientProxy");
 
-        obj = communicator->stringToProxy("router:default -p 12010 -t 10000");
+        obj = communicator->stringToProxy("router:default -p 12010");
         router = Ice::RouterPrx::uncheckedCast(obj);
         obj = communicator->stringToProxy("background@Test")->ice_router(router);
         BackgroundPrx bg = BackgroundPrx::uncheckedCast(obj);
diff --git a/cpp/test/Ice/background/Server.cpp b/cpp/test/Ice/background/Server.cpp
index 76a316d2f44..756c15f6b64 100644
--- a/cpp/test/Ice/background/Server.cpp
+++ b/cpp/test/Ice/background/Server.cpp
@@ -98,7 +98,7 @@ private:
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010");
     communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", "tcp -p 12011");
     communicator->getProperties()->setProperty("ControllerAdapter.ThreadPool.Size", "1");
 
diff --git a/cpp/test/Ice/background/run.py b/cpp/test/Ice/background/run.py
index bb34e7d35b7..56d48e628de 100755
--- a/cpp/test/Ice/background/run.py
+++ b/cpp/test/Ice/background/run.py
@@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0]))
 from scripts import *
 
 TestUtil.clientServerTest()
+
+TestUtil.cleanup()
diff --git a/cpp/test/Ice/binding/AllTests.cpp b/cpp/test/Ice/binding/AllTests.cpp
index b277d8f0b52..dc9c8f0c3f0 100644
--- a/cpp/test/Ice/binding/AllTests.cpp
+++ b/cpp/test/Ice/binding/AllTests.cpp
@@ -111,7 +111,7 @@ deactivate(const RemoteCommunicatorPrx& com, vector<RemoteObjectAdapterPrx>& ada
 void
 allTests(const Ice::CommunicatorPtr& communicator)
 {
-    string ref = "communicator:default -p 12010 -t 10000";
+    string ref = "communicator:default -p 12010";
     RemoteCommunicatorPrx com = RemoteCommunicatorPrx::uncheckedCast(communicator->stringToProxy(ref));
 
     RandomNumberGenerator rng;
diff --git a/cpp/test/Ice/binding/Server.cpp b/cpp/test/Ice/binding/Server.cpp
index a1cfe19e968..41a3cd196a8 100644
--- a/cpp/test/Ice/binding/Server.cpp
+++ b/cpp/test/Ice/binding/Server.cpp
@@ -15,7 +15,7 @@ using namespace std;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::Identity id = communicator->stringToIdentity("communicator");
     adapter->add(new RemoteCommunicatorI(), id);
diff --git a/cpp/test/Ice/binding/run.py b/cpp/test/Ice/binding/run.py
index bb34e7d35b7..56d48e628de 100755
--- a/cpp/test/Ice/binding/run.py
+++ b/cpp/test/Ice/binding/run.py
@@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0]))
 from scripts import *
 
 TestUtil.clientServerTest()
+
+TestUtil.cleanup()
diff --git a/cpp/test/Ice/checksum/AllTests.cpp b/cpp/test/Ice/checksum/AllTests.cpp
index ddac9b3242d..3dd6b287cd6 100644
--- a/cpp/test/Ice/checksum/AllTests.cpp
+++ b/cpp/test/Ice/checksum/AllTests.cpp
@@ -17,7 +17,7 @@ using namespace std;
 Test::ChecksumPrx
 allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
 {
-    string ref = "test:default -p 12010 -t 10000";
+    string ref = "test:default -p 12010";
     Ice::ObjectPrx base = communicator->stringToProxy(ref);
     test(base);
 
diff --git a/cpp/test/Ice/checksum/run.py b/cpp/test/Ice/checksum/run.py
index ba52f388067..d0a42ae3d24 100755
--- a/cpp/test/Ice/checksum/run.py
+++ b/cpp/test/Ice/checksum/run.py
@@ -22,3 +22,5 @@ from scripts import *
 
 server = os.path.join(os.getcwd(), "server", "server")
 TestUtil.clientServerTest(server = server)
+
+TestUtil.cleanup()
diff --git a/cpp/test/Ice/custom/AllTests.cpp b/cpp/test/Ice/custom/AllTests.cpp
index 5846917f591..88bdb6689c7 100644
--- a/cpp/test/Ice/custom/AllTests.cpp
+++ b/cpp/test/Ice/custom/AllTests.cpp
@@ -1038,7 +1038,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
 {
     cout << "testing stringToProxy... " << flush;
     string ref = communicator->getProperties()->getPropertyWithDefault(
-        "Custom.Proxy", "test:default -p 12010 -t 10000");
+        "Custom.Proxy", "test:default -p 12010");
     Ice::ObjectPrx base = communicator->stringToProxy(ref);
     test(base);
     cout << "ok" << endl;
@@ -2008,14 +2008,14 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     wdict2 = wdict1;
 
     ref = communicator->getProperties()->getPropertyWithDefault(
-        "Custom.WstringProxy1", "wstring1:default -p 12010 -t 10000");
+        "Custom.WstringProxy1", "wstring1:default -p 12010");
     base = communicator->stringToProxy(ref);
     test(base);
     Test1::WstringClassPrx wsc1 = Test1::WstringClassPrx::checkedCast(base);
     test(t);
 
     ref = communicator->getProperties()->getPropertyWithDefault(
-        "Custom.WstringProxy2", "wstring2:default -p 12010 -t 10000");
+        "Custom.WstringProxy2", "wstring2:default -p 12010");
     base = communicator->stringToProxy(ref);
     test(base);
     Test2::WstringClassPrx wsc2 = Test2::WstringClassPrx::checkedCast(base);
diff --git a/cpp/test/Ice/custom/Collocated.cpp b/cpp/test/Ice/custom/Collocated.cpp
index f3e7aa1aea9..9dcaa9537d2 100644
--- a/cpp/test/Ice/custom/Collocated.cpp
+++ b/cpp/test/Ice/custom/Collocated.cpp
@@ -40,7 +40,7 @@ main(int argc, char** argv)
     {
         Ice::InitializationData initData;
         initData.properties = Ice::createProperties(argc, argv);
-        initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010");
         initData.stringConverter = new Test::StringConverterI();
         initData.wstringConverter = new Test::WstringConverterI();
         communicator = Ice::initialize(argc, argv, initData);
diff --git a/cpp/test/Ice/custom/Server.cpp b/cpp/test/Ice/custom/Server.cpp
index 13e9f6ee8a3..cdbb6e3befb 100644
--- a/cpp/test/Ice/custom/Server.cpp
+++ b/cpp/test/Ice/custom/Server.cpp
@@ -39,7 +39,7 @@ main(int argc, char** argv)
     {
         Ice::InitializationData initData;
         initData.properties = Ice::createProperties(argc, argv);
-        initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010");
         initData.stringConverter = new Test::StringConverterI();
         initData.wstringConverter = new Test::WstringConverterI();
         communicator = Ice::initialize(argc, argv, initData);
diff --git a/cpp/test/Ice/custom/ServerAMD.cpp b/cpp/test/Ice/custom/ServerAMD.cpp
index 27b6caedb47..046c82a72aa 100644
--- a/cpp/test/Ice/custom/ServerAMD.cpp
+++ b/cpp/test/Ice/custom/ServerAMD.cpp
@@ -40,7 +40,7 @@ main(int argc, char** argv)
         Ice::InitializationData initData;
         initData.properties = Ice::createProperties(argc, argv);
         
-        initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010");
         initData.stringConverter = new Test::StringConverterI();
         initData.wstringConverter = new Test::WstringConverterI();
         communicator = Ice::initialize(argc, argv, initData);
diff --git a/cpp/test/Ice/custom/run.py b/cpp/test/Ice/custom/run.py
index 8b6d12458d7..e0779dbf6d2 100755
--- a/cpp/test/Ice/custom/run.py
+++ b/cpp/test/Ice/custom/run.py
@@ -26,3 +26,5 @@ print "tests with AMD server."
 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 e2a84c8cd83..e46056e57f0 100755
--- a/cpp/test/Ice/defaultServant/run.py
+++ b/cpp/test/Ice/defaultServant/run.py
@@ -23,3 +23,5 @@ from scripts import *
 client = os.path.join(os.getcwd(), "client")
 
 TestUtil.simpleTest(client)
+
+TestUtil.cleanup()
diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp
index bb89a0611d9..9c5f64c2eb4 100644
--- a/cpp/test/Ice/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/exceptions/AllTests.cpp
@@ -648,7 +648,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
         try
         {
             Ice::ObjectAdapterPtr second = 
-                communicator->createObjectAdapterWithEndpoints("TestAdapter0", "ssl -h foo -p 12011 -t 10000");
+                communicator->createObjectAdapterWithEndpoints("TestAdapter0", "ssl -h foo -p 12011");
             test(false);
         }
         catch(const Ice::AlreadyRegisteredException&)
@@ -733,7 +733,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     cout << "ok" << endl;
 
     cout << "testing stringToProxy... " << flush;
-    string ref = "thrower:default -p 12010 -t 10000";
+    string ref = "thrower:default -p 12010";
     Ice::ObjectPrx base = communicator->stringToProxy(ref);
     test(base);
     cout << "ok" << endl;
diff --git a/cpp/test/Ice/exceptions/Collocated.cpp b/cpp/test/Ice/exceptions/Collocated.cpp
index 4a636ba458f..1c6e1a8e241 100644
--- a/cpp/test/Ice/exceptions/Collocated.cpp
+++ b/cpp/test/Ice/exceptions/Collocated.cpp
@@ -16,7 +16,7 @@ using namespace Test;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr object = new ThrowerI(adapter);
     adapter->add(object, communicator->stringToIdentity("thrower"));
diff --git a/cpp/test/Ice/exceptions/Server.cpp b/cpp/test/Ice/exceptions/Server.cpp
index 48c08627983..683e1cd610d 100644
--- a/cpp/test/Ice/exceptions/Server.cpp
+++ b/cpp/test/Ice/exceptions/Server.cpp
@@ -17,7 +17,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
     Ice::PropertiesPtr properties = communicator->getProperties();
     properties->setProperty("Ice.Warn.Dispatch", "0");
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr object = new ThrowerI(adapter);
     adapter->add(object, communicator->stringToIdentity("thrower"));
diff --git a/cpp/test/Ice/exceptions/ServerAMD.cpp b/cpp/test/Ice/exceptions/ServerAMD.cpp
index 9ee5097a071..3351451e205 100644
--- a/cpp/test/Ice/exceptions/ServerAMD.cpp
+++ b/cpp/test/Ice/exceptions/ServerAMD.cpp
@@ -17,7 +17,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
     Ice::PropertiesPtr properties = communicator->getProperties();
     properties->setProperty("Ice.Warn.Dispatch", "0");
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr object = new ThrowerI(adapter);
     adapter->add(object, communicator->stringToIdentity("thrower"));
diff --git a/cpp/test/Ice/exceptions/run.py b/cpp/test/Ice/exceptions/run.py
index 8b6d12458d7..e0779dbf6d2 100755
--- a/cpp/test/Ice/exceptions/run.py
+++ b/cpp/test/Ice/exceptions/run.py
@@ -26,3 +26,5 @@ print "tests with AMD server."
 TestUtil.clientServerTest(server = "serveramd")
 print "tests with collocated server."
 TestUtil.collocatedTest()
+
+TestUtil.cleanup()
diff --git a/cpp/test/Ice/facets/AllTests.cpp b/cpp/test/Ice/facets/AllTests.cpp
index 455adaa6055..79ea855329d 100644
--- a/cpp/test/Ice/facets/AllTests.cpp
+++ b/cpp/test/Ice/facets/AllTests.cpp
@@ -107,7 +107,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     adapter->deactivate();
 
     cout << "testing stringToProxy... " << flush;
-    string ref = "d:default -p 12010 -t 10000";
+    string ref = "d:default -p 12010";
     Ice::ObjectPrx db = communicator->stringToProxy(ref);
     test(db);
     cout << "ok" << endl;
diff --git a/cpp/test/Ice/facets/Collocated.cpp b/cpp/test/Ice/facets/Collocated.cpp
index 847f63b0f69..5a67b0c82a2 100644
--- a/cpp/test/Ice/facets/Collocated.cpp
+++ b/cpp/test/Ice/facets/Collocated.cpp
@@ -16,7 +16,7 @@ using namespace Test;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr d = new DI;
     adapter->add(d, communicator->stringToIdentity("d"));
diff --git a/cpp/test/Ice/facets/Server.cpp b/cpp/test/Ice/facets/Server.cpp
index 11b02cc050e..58e760b270f 100644
--- a/cpp/test/Ice/facets/Server.cpp
+++ b/cpp/test/Ice/facets/Server.cpp
@@ -15,7 +15,7 @@ using namespace std;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr d = new DI;
     adapter->add(d, communicator->stringToIdentity("d"));
diff --git a/cpp/test/Ice/facets/run.py b/cpp/test/Ice/facets/run.py
index 545214a74c7..979b91c2544 100755
--- a/cpp/test/Ice/facets/run.py
+++ b/cpp/test/Ice/facets/run.py
@@ -22,3 +22,5 @@ from scripts import *
 
 TestUtil.clientServerTest()
 TestUtil.collocatedTest()
+
+TestUtil.cleanup()
diff --git a/cpp/test/Ice/faultTolerance/AllTests.cpp b/cpp/test/Ice/faultTolerance/AllTests.cpp
index d103f3f72b6..596cd250a56 100644
--- a/cpp/test/Ice/faultTolerance/AllTests.cpp
+++ b/cpp/test/Ice/faultTolerance/AllTests.cpp
@@ -170,7 +170,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const vector<int>& ports)
     ref << "test";
     for(vector<int>::const_iterator p = ports.begin(); p != ports.end(); ++p)
     {
-        ref << ":default -t 60000 -p " << *p;
+        ref << ":default -p " << *p;
     }
     Ice::ObjectPrx base = communicator->stringToProxy(ref.str());
     test(base);
diff --git a/cpp/test/Ice/faultTolerance/run.py b/cpp/test/Ice/faultTolerance/run.py
index bf53108dc06..57e86835cf5 100755
--- a/cpp/test/Ice/faultTolerance/run.py
+++ b/cpp/test/Ice/faultTolerance/run.py
@@ -44,3 +44,5 @@ clientProc.startReader()
 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 2fbebfbbb8a..c19f72b7a52 100755
--- a/cpp/test/Ice/gc/run.py
+++ b/cpp/test/Ice/gc/run.py
@@ -27,3 +27,5 @@ seedfile = os.path.join(os.getcwd(), "seed")
 TestUtil.simpleTest(client, seedfile)
 
 os.remove(seedfile)
+
+TestUtil.cleanup()
diff --git a/cpp/test/Ice/hold/AllTests.cpp b/cpp/test/Ice/hold/AllTests.cpp
index e0eadceefc8..e6f7a1b55a4 100644
--- a/cpp/test/Ice/hold/AllTests.cpp
+++ b/cpp/test/Ice/hold/AllTests.cpp
@@ -112,10 +112,10 @@ void
 allTests(const Ice::CommunicatorPtr& communicator)
 {
     cout << "testing stringToProxy... " << flush;
-    string ref = "hold:default -p 12010 -t 30000";
+    string ref = "hold:default -p 12010";
     Ice::ObjectPrx base = communicator->stringToProxy(ref);
     test(base);
-    string refSerialized = "hold:default -p 12011 -t 60000";
+    string refSerialized = "hold:default -p 12011";
     Ice::ObjectPrx baseSerialized = communicator->stringToProxy(refSerialized);
     test(base);
     cout << "ok" << endl;
diff --git a/cpp/test/Ice/hold/Server.cpp b/cpp/test/Ice/hold/Server.cpp
index 6f90c9b5012..d45200b1b3b 100644
--- a/cpp/test/Ice/hold/Server.cpp
+++ b/cpp/test/Ice/hold/Server.cpp
@@ -17,7 +17,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
     IceUtil::TimerPtr timer = new IceUtil::Timer();
 
-    communicator->getProperties()->setProperty("TestAdapter1.Endpoints", "default -p 12010 -t 10000:udp");
+    communicator->getProperties()->setProperty("TestAdapter1.Endpoints", "default -p 12010:udp");
     communicator->getProperties()->setProperty("TestAdapter1.ThreadPool.Size", "5"); 
     communicator->getProperties()->setProperty("TestAdapter1.ThreadPool.SizeMax", "5"); 
     communicator->getProperties()->setProperty("TestAdapter1.ThreadPool.SizeWarn", "0"); 
@@ -25,7 +25,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     Ice::ObjectAdapterPtr adapter1 = communicator->createObjectAdapter("TestAdapter1");
     adapter1->add(new HoldI(timer, adapter1), communicator->stringToIdentity("hold"));
 
-    communicator->getProperties()->setProperty("TestAdapter2.Endpoints", "default -p 12011 -t 10000:udp");
+    communicator->getProperties()->setProperty("TestAdapter2.Endpoints", "default -p 12011:udp");
     communicator->getProperties()->setProperty("TestAdapter2.ThreadPool.Size", "5"); 
     communicator->getProperties()->setProperty("TestAdapter2.ThreadPool.SizeMax", "5"); 
     communicator->getProperties()->setProperty("TestAdapter2.ThreadPool.SizeWarn", "0"); 
diff --git a/cpp/test/Ice/hold/run.py b/cpp/test/Ice/hold/run.py
index bb34e7d35b7..56d48e628de 100755
--- a/cpp/test/Ice/hold/run.py
+++ b/cpp/test/Ice/hold/run.py
@@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0]))
 from scripts import *
 
 TestUtil.clientServerTest()
+
+TestUtil.cleanup()
diff --git a/cpp/test/Ice/inheritance/AllTests.cpp b/cpp/test/Ice/inheritance/AllTests.cpp
index 5e879721c1d..7c92369eeab 100644
--- a/cpp/test/Ice/inheritance/AllTests.cpp
+++ b/cpp/test/Ice/inheritance/AllTests.cpp
@@ -18,7 +18,7 @@ InitialPrx
 allTests(const Ice::CommunicatorPtr& communicator)
 {
     cout << "testing stringToProxy... " << flush;
-    string ref = "initial:default -p 12010 -t 10000";
+    string ref = "initial:default -p 12010";
     Ice::ObjectPrx base = communicator->stringToProxy(ref);
     test(base);
     cout << "ok" << endl;
diff --git a/cpp/test/Ice/inheritance/Collocated.cpp b/cpp/test/Ice/inheritance/Collocated.cpp
index 3d22c775e7f..3e4f4f7e678 100644
--- a/cpp/test/Ice/inheritance/Collocated.cpp
+++ b/cpp/test/Ice/inheritance/Collocated.cpp
@@ -16,7 +16,7 @@ using namespace Test;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr object = new InitialI(adapter);
     adapter->add(object, communicator->stringToIdentity("initial"));
diff --git a/cpp/test/Ice/inheritance/Server.cpp b/cpp/test/Ice/inheritance/Server.cpp
index 6d8ed92c695..df28b3d8d28 100644
--- a/cpp/test/Ice/inheritance/Server.cpp
+++ b/cpp/test/Ice/inheritance/Server.cpp
@@ -15,7 +15,7 @@ using namespace std;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr object = new InitialI(adapter);
     adapter->add(object, communicator->stringToIdentity("initial"));
diff --git a/cpp/test/Ice/inheritance/run.py b/cpp/test/Ice/inheritance/run.py
index 545214a74c7..979b91c2544 100755
--- a/cpp/test/Ice/inheritance/run.py
+++ b/cpp/test/Ice/inheritance/run.py
@@ -22,3 +22,5 @@ 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 cc291cb1472..8dc7158f9da 100755
--- a/cpp/test/Ice/interceptor/run.py
+++ b/cpp/test/Ice/interceptor/run.py
@@ -23,3 +23,5 @@ from scripts import *
 client = os.path.join(os.getcwd(), "client")
 
 TestUtil.simpleTest(client, " --Ice.Warn.Dispatch=0")
+
+TestUtil.cleanup()
diff --git a/cpp/test/Ice/location/Client.cpp b/cpp/test/Ice/location/Client.cpp
index f539313d775..a8f8977b2bf 100644
--- a/cpp/test/Ice/location/Client.cpp
+++ b/cpp/test/Ice/location/Client.cpp
@@ -17,7 +17,7 @@ int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
     void allTests(const Ice::CommunicatorPtr&, const string&);
-    allTests(communicator, "ServerManager:default -p 12010 -t 10000");
+    allTests(communicator, "ServerManager:default -p 12010");
     return EXIT_SUCCESS;
 }
 
diff --git a/cpp/test/Ice/location/run.py b/cpp/test/Ice/location/run.py
index bb34e7d35b7..56d48e628de 100755
--- a/cpp/test/Ice/location/run.py
+++ b/cpp/test/Ice/location/run.py
@@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0]))
 from scripts import *
 
 TestUtil.clientServerTest()
+
+TestUtil.cleanup()
diff --git a/cpp/test/Ice/objects/AllTests.cpp b/cpp/test/Ice/objects/AllTests.cpp
index 94461b365ab..4e87bedf810 100644
--- a/cpp/test/Ice/objects/AllTests.cpp
+++ b/cpp/test/Ice/objects/AllTests.cpp
@@ -18,7 +18,7 @@ InitialPrx
 allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
 {
     cout << "testing stringToProxy... " << flush;
-    string ref = "initial:default -p 12010 -t 10000";
+    string ref = "initial:default -p 12010";
     Ice::ObjectPrx base = communicator->stringToProxy(ref);
     test(base);
     cout << "ok" << endl;
@@ -164,7 +164,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     if(!collocated)
     {
         cout << "testing UnexpectedObjectException... " << flush;
-        ref = "uoet:default -p 12010 -t 10000";
+        ref = "uoet:default -p 12010";
         base = communicator->stringToProxy(ref);
         test(base);
         UnexpectedObjectExceptionTestPrx uoet = UnexpectedObjectExceptionTestPrx::uncheckedCast(base);
diff --git a/cpp/test/Ice/objects/Collocated.cpp b/cpp/test/Ice/objects/Collocated.cpp
index 4768eda710f..693b43c850c 100644
--- a/cpp/test/Ice/objects/Collocated.cpp
+++ b/cpp/test/Ice/objects/Collocated.cpp
@@ -16,7 +16,7 @@ using namespace Test;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     InitialPtr initial = new InitialI(adapter);
     adapter->add(initial, communicator->stringToIdentity("initial"));
diff --git a/cpp/test/Ice/objects/Server.cpp b/cpp/test/Ice/objects/Server.cpp
index 5bb0dcfc9bb..7ecdbaa4bf4 100644
--- a/cpp/test/Ice/objects/Server.cpp
+++ b/cpp/test/Ice/objects/Server.cpp
@@ -50,7 +50,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     communicator->addObjectFactory(factory, "::Test::J");
     communicator->addObjectFactory(factory, "::Test::H");
 
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     InitialPtr initial = new InitialI(adapter);
     adapter->add(initial, communicator->stringToIdentity("initial"));
diff --git a/cpp/test/Ice/objects/run.py b/cpp/test/Ice/objects/run.py
index 545214a74c7..979b91c2544 100755
--- a/cpp/test/Ice/objects/run.py
+++ b/cpp/test/Ice/objects/run.py
@@ -22,3 +22,5 @@ from scripts import *
 
 TestUtil.clientServerTest()
 TestUtil.collocatedTest()
+
+TestUtil.cleanup()
diff --git a/cpp/test/Ice/operations/AllTests.cpp b/cpp/test/Ice/operations/AllTests.cpp
index 568de3a52bc..7c38085439f 100644
--- a/cpp/test/Ice/operations/AllTests.cpp
+++ b/cpp/test/Ice/operations/AllTests.cpp
@@ -17,7 +17,7 @@ using namespace std;
 Test::MyClassPrx
 allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
 {
-    string ref = "test:default -p 12010 -t 10000";
+    string ref = "test:default -p 12010";
     Ice::ObjectPrx base = communicator->stringToProxy(ref);
     Test::MyClassPrx cl = Test::MyClassPrx::checkedCast(base);
     Test::MyDerivedClassPrx derived = Test::MyDerivedClassPrx::checkedCast(cl);
diff --git a/cpp/test/Ice/operations/Collocated.cpp b/cpp/test/Ice/operations/Collocated.cpp
index 187e0dd2fa3..f8c37d3c08b 100644
--- a/cpp/test/Ice/operations/Collocated.cpp
+++ b/cpp/test/Ice/operations/Collocated.cpp
@@ -16,7 +16,7 @@ int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator,
     const Ice::InitializationData& initData)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test"));
     adapter->activate();
diff --git a/cpp/test/Ice/operations/Server.cpp b/cpp/test/Ice/operations/Server.cpp
index 58119af02b0..af451ce4bbf 100644
--- a/cpp/test/Ice/operations/Server.cpp
+++ b/cpp/test/Ice/operations/Server.cpp
@@ -15,7 +15,7 @@ using namespace std;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test"));
     adapter->activate();
diff --git a/cpp/test/Ice/operations/ServerAMD.cpp b/cpp/test/Ice/operations/ServerAMD.cpp
index a86331941ac..253f0c2a801 100644
--- a/cpp/test/Ice/operations/ServerAMD.cpp
+++ b/cpp/test/Ice/operations/ServerAMD.cpp
@@ -15,7 +15,7 @@ using namespace std;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test"));
     adapter->activate();
diff --git a/cpp/test/Ice/operations/Twoways.cpp b/cpp/test/Ice/operations/Twoways.cpp
index ed6945dc735..b629b82c7a9 100644
--- a/cpp/test/Ice/operations/Twoways.cpp
+++ b/cpp/test/Ice/operations/Twoways.cpp
@@ -715,7 +715,7 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
 
             communicator->setDefaultContext(dflt);
             Test::MyClassPrx c = Test::MyClassPrx::checkedCast(
-                                        communicator->stringToProxy("test:default -p 12010 -t 10000"));
+                                        communicator->stringToProxy("test:default -p 12010"));
             test(c->opContext() == dflt);
 
             dflt["a"] = "c";
diff --git a/cpp/test/Ice/operations/TwowaysAMI.cpp b/cpp/test/Ice/operations/TwowaysAMI.cpp
index f2809dda31e..6db2a5abee0 100644
--- a/cpp/test/Ice/operations/TwowaysAMI.cpp
+++ b/cpp/test/Ice/operations/TwowaysAMI.cpp
@@ -1347,7 +1347,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
 
             communicator->setDefaultContext(dflt);
             Test::MyClassPrx c = Test::MyClassPrx::checkedCast(
-                                    communicator->stringToProxy("test:default -p 12010 -t 10000"));
+                                    communicator->stringToProxy("test:default -p 12010"));
             {
                 Ice::Context tmp;
                 tmp["a"] = "b";
diff --git a/cpp/test/Ice/operations/run.py b/cpp/test/Ice/operations/run.py
index 8b6d12458d7..e0779dbf6d2 100755
--- a/cpp/test/Ice/operations/run.py
+++ b/cpp/test/Ice/operations/run.py
@@ -26,3 +26,5 @@ print "tests with AMD server."
 TestUtil.clientServerTest(server = "serveramd")
 print "tests with collocated server."
 TestUtil.collocatedTest()
+
+TestUtil.cleanup()
diff --git a/cpp/test/Ice/proxy/AllTests.cpp b/cpp/test/Ice/proxy/AllTests.cpp
index 599479af8c5..1dcec2205ac 100644
--- a/cpp/test/Ice/proxy/AllTests.cpp
+++ b/cpp/test/Ice/proxy/AllTests.cpp
@@ -19,7 +19,7 @@ Test::MyClassPrx
 allTests(const Ice::CommunicatorPtr& communicator)
 {
     cout << "testing stringToProxy... " << flush;
-    string ref = "test:default -p 12010 -t 10000";
+    string ref = "test:default -p 12010";
     Ice::ObjectPrx base = communicator->stringToProxy(ref);
     test(base);
 
@@ -249,7 +249,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     cout << "testing propertyToProxy... " << flush;
     Ice::PropertiesPtr prop = communicator->getProperties();
     string propertyPrefix = "Foo.Proxy";
-    prop->setProperty(propertyPrefix, "test:default -p 12010 -t 10000");
+    prop->setProperty(propertyPrefix, "test:default -p 12010");
     b1 = communicator->propertyToProxy(propertyPrefix);
     test(b1->ice_getIdentity().name == "test" && b1->ice_getIdentity().category.empty() &&
          b1->ice_getAdapterId().empty() && b1->ice_getFacet().empty());
@@ -293,7 +293,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     //test(b1->ice_getLocatorCacheTimeout() == 60);
     //prop->setProperty("Ice.Default.LocatorCacheTimeout", "");
 
-    prop->setProperty(propertyPrefix, "test:default -p 12010 -t 10000");
+    prop->setProperty(propertyPrefix, "test:default -p 12010");
 
     property = propertyPrefix + ".Router";
     test(!b1->ice_getRouter());
diff --git a/cpp/test/Ice/proxy/Collocated.cpp b/cpp/test/Ice/proxy/Collocated.cpp
index 6791e6d01e5..a54574ab1b6 100644
--- a/cpp/test/Ice/proxy/Collocated.cpp
+++ b/cpp/test/Ice/proxy/Collocated.cpp
@@ -16,7 +16,7 @@ int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator,
     const Ice::InitializationData& initData)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test"));
     adapter->activate();
diff --git a/cpp/test/Ice/proxy/Server.cpp b/cpp/test/Ice/proxy/Server.cpp
index b049adb543b..13a28b6e838 100644
--- a/cpp/test/Ice/proxy/Server.cpp
+++ b/cpp/test/Ice/proxy/Server.cpp
@@ -15,7 +15,7 @@ using namespace std;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test"));
     adapter->activate();
diff --git a/cpp/test/Ice/proxy/ServerAMD.cpp b/cpp/test/Ice/proxy/ServerAMD.cpp
index 24144c3155c..27c64c5b971 100644
--- a/cpp/test/Ice/proxy/ServerAMD.cpp
+++ b/cpp/test/Ice/proxy/ServerAMD.cpp
@@ -15,7 +15,7 @@ using namespace std;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test"));
     adapter->activate();
diff --git a/cpp/test/Ice/proxy/run.py b/cpp/test/Ice/proxy/run.py
index 8b6d12458d7..e0779dbf6d2 100755
--- a/cpp/test/Ice/proxy/run.py
+++ b/cpp/test/Ice/proxy/run.py
@@ -26,3 +26,5 @@ print "tests with AMD server."
 TestUtil.clientServerTest(server = "serveramd")
 print "tests with collocated server."
 TestUtil.collocatedTest()
+
+TestUtil.cleanup()
diff --git a/cpp/test/Ice/retry/AllTests.cpp b/cpp/test/Ice/retry/AllTests.cpp
index 75534d4c271..d0b9b818d4f 100644
--- a/cpp/test/Ice/retry/AllTests.cpp
+++ b/cpp/test/Ice/retry/AllTests.cpp
@@ -95,7 +95,7 @@ RetryPrx
 allTests(const Ice::CommunicatorPtr& communicator)
 {
     cout << "testing stringToProxy... " << flush;
-    string ref = "retry:default -p 12010 -t 10000";
+    string ref = "retry:default -p 12010";
     Ice::ObjectPrx base1 = communicator->stringToProxy(ref);
     test(base1);
     Ice::ObjectPrx base2 = communicator->stringToProxy(ref);
diff --git a/cpp/test/Ice/retry/Server.cpp b/cpp/test/Ice/retry/Server.cpp
index 5defa4c5321..c09c401e00c 100644
--- a/cpp/test/Ice/retry/Server.cpp
+++ b/cpp/test/Ice/retry/Server.cpp
@@ -15,7 +15,7 @@ using namespace std;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr object = new RetryI;
     adapter->add(object, communicator->stringToIdentity("retry"));
diff --git a/cpp/test/Ice/retry/run.py b/cpp/test/Ice/retry/run.py
index bb34e7d35b7..56d48e628de 100755
--- a/cpp/test/Ice/retry/run.py
+++ b/cpp/test/Ice/retry/run.py
@@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0]))
 from scripts import *
 
 TestUtil.clientServerTest()
+
+TestUtil.cleanup()
diff --git a/cpp/test/Ice/servantLocator/AllTests.cpp b/cpp/test/Ice/servantLocator/AllTests.cpp
index d9d1e6904e0..b98bc9844da 100644
--- a/cpp/test/Ice/servantLocator/AllTests.cpp
+++ b/cpp/test/Ice/servantLocator/AllTests.cpp
@@ -211,7 +211,7 @@ TestIntfPrx
 allTests(const CommunicatorPtr& communicator, bool collocated)
 {
     cout << "testing stringToProxy... " << flush;
-    ObjectPrx base = communicator->stringToProxy("asm:default -p 12010 -t 10000");
+    ObjectPrx base = communicator->stringToProxy("asm:default -p 12010");
     test(base);
     cout << "ok" << endl;
 
@@ -224,7 +224,7 @@ allTests(const CommunicatorPtr& communicator, bool collocated)
     cout << "testing ice_ids... " << flush;
     try
     {
-        ObjectPrx o = communicator->stringToProxy("category/locate:default -p 12010 -t 10000");
+        ObjectPrx o = communicator->stringToProxy("category/locate:default -p 12010");
         o->ice_ids();
         test(false);
     }
@@ -239,7 +239,7 @@ allTests(const CommunicatorPtr& communicator, bool collocated)
 
     try
     {
-        ObjectPrx o = communicator->stringToProxy("category/finished:default -p 12010 -t 10000");
+        ObjectPrx o = communicator->stringToProxy("category/finished:default -p 12010");
         o->ice_ids();
         test(false);
     }
@@ -254,14 +254,14 @@ allTests(const CommunicatorPtr& communicator, bool collocated)
     cout << "ok" << endl;
 
     cout << "testing servant locator..." << flush;
-    base = communicator->stringToProxy("category/locate:default -p 12010 -t 10000");
+    base = communicator->stringToProxy("category/locate:default -p 12010");
     obj = TestIntfPrx::checkedCast(base);
     try
     {
 #if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
         IceUtil::DummyBCC dummy;
 #endif
-        TestIntfPrx::checkedCast(communicator->stringToProxy("category/unknown:default -p 12010 -t 10000"));
+        TestIntfPrx::checkedCast(communicator->stringToProxy("category/unknown:default -p 12010"));
     }
     catch(const ObjectNotExistException&)
     {
@@ -269,16 +269,16 @@ allTests(const CommunicatorPtr& communicator, bool collocated)
     cout << "ok" << endl;
 
     cout << "testing default servant locator..." << flush;
-    base = communicator->stringToProxy("anothercategory/locate:default -p 12010 -t 10000");
+    base = communicator->stringToProxy("anothercategory/locate:default -p 12010");
     obj = TestIntfPrx::checkedCast(base);
-    base = communicator->stringToProxy("locate:default -p 12010 -t 10000");
+    base = communicator->stringToProxy("locate:default -p 12010");
     obj = TestIntfPrx::checkedCast(base);
     try
     {
 #if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
         IceUtil::DummyBCC dummy;
 #endif
-        TestIntfPrx::checkedCast(communicator->stringToProxy("anothercategory/unknown:default -p 12010 -t 10000"));
+        TestIntfPrx::checkedCast(communicator->stringToProxy("anothercategory/unknown:default -p 12010"));
     }
     catch(const ObjectNotExistException&)
     {
@@ -288,7 +288,7 @@ allTests(const CommunicatorPtr& communicator, bool collocated)
 #if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
         IceUtil::DummyBCC dummy;
 #endif
-        TestIntfPrx::checkedCast(communicator->stringToProxy("unknown:default -p 12010 -t 10000"));
+        TestIntfPrx::checkedCast(communicator->stringToProxy("unknown:default -p 12010"));
     }
     catch(const Ice::ObjectNotExistException&)
     {
@@ -296,13 +296,13 @@ allTests(const CommunicatorPtr& communicator, bool collocated)
     cout << "ok" << endl;
 
     cout << "testing locate exceptions... " << flush;
-    base = communicator->stringToProxy("category/locate:default -p 12010 -t 10000");
+    base = communicator->stringToProxy("category/locate:default -p 12010");
     obj = TestIntfPrx::checkedCast(base);
     testExceptions(obj, collocated);
     cout << "ok" << endl;
 
     cout << "testing finished exceptions... " << flush;
-    base = communicator->stringToProxy("category/finished:default -p 12010 -t 10000");
+    base = communicator->stringToProxy("category/finished:default -p 12010");
     obj = TestIntfPrx::checkedCast(base);
     testExceptions(obj, collocated);
     cout << "ok" << endl;
diff --git a/cpp/test/Ice/servantLocator/Collocated.cpp b/cpp/test/Ice/servantLocator/Collocated.cpp
index c9b69f04534..af3315d8bfd 100644
--- a/cpp/test/Ice/servantLocator/Collocated.cpp
+++ b/cpp/test/Ice/servantLocator/Collocated.cpp
@@ -65,7 +65,7 @@ main(int argc, char* argv[])
 int
 TestServer::run(int argc, char* argv[])
 {
-    communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+    communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010");
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
     adapter->addServantLocator(new ServantLocatorI(""), "");
     adapter->addServantLocator(new ServantLocatorI("category"), "category");
diff --git a/cpp/test/Ice/servantLocator/Server.cpp b/cpp/test/Ice/servantLocator/Server.cpp
index c86051fb746..8f89c8becaf 100644
--- a/cpp/test/Ice/servantLocator/Server.cpp
+++ b/cpp/test/Ice/servantLocator/Server.cpp
@@ -64,7 +64,7 @@ main(int argc, char* argv[])
 int
 TestServer::run(int argc, char* argv[])
 {
-    communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
+    communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
     communicator()->getProperties()->setProperty("Ice.Warn.Dispatch", "0");
 
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
diff --git a/cpp/test/Ice/servantLocator/ServerAMD.cpp b/cpp/test/Ice/servantLocator/ServerAMD.cpp
index 10d0d3ee3bf..3806b3644bb 100644
--- a/cpp/test/Ice/servantLocator/ServerAMD.cpp
+++ b/cpp/test/Ice/servantLocator/ServerAMD.cpp
@@ -64,7 +64,7 @@ main(int argc, char* argv[])
 int
 TestServer::run(int argc, char* argv[])
 {
-    communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
+    communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
     communicator()->getProperties()->setProperty("Ice.Warn.Dispatch", "0");
 
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
diff --git a/cpp/test/Ice/servantLocator/run.py b/cpp/test/Ice/servantLocator/run.py
index 8b6d12458d7..e0779dbf6d2 100755
--- a/cpp/test/Ice/servantLocator/run.py
+++ b/cpp/test/Ice/servantLocator/run.py
@@ -26,3 +26,5 @@ print "tests with AMD server."
 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 fe714d9d4d1..eecf185132f 100755
--- a/cpp/test/Ice/slicing/exceptions/run.py
+++ b/cpp/test/Ice/slicing/exceptions/run.py
@@ -24,3 +24,5 @@ print "tests with regular server."
 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 c50a9b03948..474ffa359c9 100755
--- a/cpp/test/Ice/slicing/objects/run.py
+++ b/cpp/test/Ice/slicing/objects/run.py
@@ -24,3 +24,5 @@ print "tests with regular server."
 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 fb3ed194b36..93807972504 100755
--- a/cpp/test/Ice/stream/run.py
+++ b/cpp/test/Ice/stream/run.py
@@ -22,3 +22,5 @@ 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 c21c5254d3b..066de70501d 100755
--- a/cpp/test/Ice/stringConverter/run.py
+++ b/cpp/test/Ice/stringConverter/run.py
@@ -23,3 +23,5 @@ from scripts import *
 client = os.path.join(os.getcwd(), "client")
 
 TestUtil.simpleTest(client)
+
+TestUtil.cleanup()
diff --git a/cpp/test/Ice/timeout/AllTests.cpp b/cpp/test/Ice/timeout/AllTests.cpp
index 5bfcbd78879..64bae365b0e 100644
--- a/cpp/test/Ice/timeout/AllTests.cpp
+++ b/cpp/test/Ice/timeout/AllTests.cpp
@@ -125,7 +125,7 @@ typedef IceUtil::Handle<AMISleepEx> AMISleepExPtr;
 TimeoutPrx
 allTests(const Ice::CommunicatorPtr& communicator)
 {
-    string sref = "timeout:default -p 12010 -t 10000";
+    string sref = "timeout:default -p 12010";
     Ice::ObjectPrx obj = communicator->stringToProxy(sref);
     test(obj);
 
diff --git a/cpp/test/Ice/timeout/Server.cpp b/cpp/test/Ice/timeout/Server.cpp
index 2595f77a2db..1b6e2ac8e45 100644
--- a/cpp/test/Ice/timeout/Server.cpp
+++ b/cpp/test/Ice/timeout/Server.cpp
@@ -15,7 +15,7 @@ using namespace std;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr object = new TimeoutI;
     adapter->add(object, communicator->stringToIdentity("timeout"));
diff --git a/cpp/test/Ice/timeout/run.py b/cpp/test/Ice/timeout/run.py
index bb34e7d35b7..56d48e628de 100755
--- a/cpp/test/Ice/timeout/run.py
+++ b/cpp/test/Ice/timeout/run.py
@@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0]))
 from scripts import *
 
 TestUtil.clientServerTest()
+
+TestUtil.cleanup()
diff --git a/cpp/test/Ice/udp/run.py b/cpp/test/Ice/udp/run.py
index c09dbb4359b..e0165ff92a1 100755
--- a/cpp/test/Ice/udp/run.py
+++ b/cpp/test/Ice/udp/run.py
@@ -39,3 +39,5 @@ clientProc.startReader()
 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 e6ef1e35114..9064dc1b134 100755
--- a/cpp/test/IceBox/configuration/run.py
+++ b/cpp/test/IceBox/configuration/run.py
@@ -27,3 +27,5 @@ 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 6ebb0279e94..00134fb51e1 100755
--- a/cpp/test/IceGrid/activation/run.py
+++ b/cpp/test/IceGrid/activation/run.py
@@ -22,3 +22,5 @@ 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 6be1ba15870..d7ffabb8e3b 100755
--- a/cpp/test/IceGrid/admin/run.py
+++ b/cpp/test/IceGrid/admin/run.py
@@ -29,8 +29,8 @@ print "starting glacier2...",
 sys.stdout.flush()
 router = os.path.join(TestUtil.getCppBinDir(), "glacier2router")
 args = ' --Glacier2.SessionTimeout=5' + \
-       ' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \
-       ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1 -t 10000"' \
+       ' --Glacier2.Client.Endpoints="default -p 12347"' + \
+       ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1"' \
        ' --Glacier2.SessionManager=IceGrid/AdminSessionManager' + \
        ' --Glacier2.PermissionsVerifier=Glacier2/NullPermissionsVerifier' + \
        ' --Glacier2.SSLSessionManager=IceGrid/AdminSSLSessionManager' + \
@@ -240,3 +240,5 @@ print "ok"
 IceGridAdmin.iceGridAdmin("node shutdown localnode")
 IceGridAdmin.shutdownIceGridRegistry(registryProcs)
 nodeProc.waitTestSuccess()
+
+TestUtil.cleanup()
diff --git a/cpp/test/IceGrid/allocation/application.xml b/cpp/test/IceGrid/allocation/application.xml
index 6564bdb14ae..eeb9a1ae2f9 100644
--- a/cpp/test/IceGrid/allocation/application.xml
+++ b/cpp/test/IceGrid/allocation/application.xml
@@ -21,7 +21,7 @@
     <node name="localnode">
 
       <server-instance template="Glacier2" id="Glacier2" 
-                       endpoints="default -p 12347 -t 10000" 
+                       endpoints="default -p 12347" 
                        verifier="PermissionsVerifier"
                        manager="IceGrid/SessionManager"/>
 
diff --git a/cpp/test/IceGrid/allocation/run.py b/cpp/test/IceGrid/allocation/run.py
index 2a010c5a387..9f464fdcd5f 100755
--- a/cpp/test/IceGrid/allocation/run.py
+++ b/cpp/test/IceGrid/allocation/run.py
@@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0]))
 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 e7e7b33f920..b62a9841b3b 100755
--- a/cpp/test/IceGrid/deployer/run.py
+++ b/cpp/test/IceGrid/deployer/run.py
@@ -25,3 +25,5 @@ IceGridAdmin.iceGridTest("application.xml", '--TestDir="%s"' % os.getcwd(), '"ic
 # Tests with targets
 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 f5ff701f241..c4a27750436 100755
--- a/cpp/test/IceGrid/distribution/run.py
+++ b/cpp/test/IceGrid/distribution/run.py
@@ -62,3 +62,5 @@ 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 b98075c4392..f642d596cc2 100755
--- a/cpp/test/IceGrid/replicaGroup/run.py
+++ b/cpp/test/IceGrid/replicaGroup/run.py
@@ -22,3 +22,5 @@ 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 6819f25aabf..7742c5c9f21 100755
--- a/cpp/test/IceGrid/replication/run.py
+++ b/cpp/test/IceGrid/replication/run.py
@@ -24,3 +24,5 @@ TestUtil.addLdPath(os.getcwd())
 
 IceGridAdmin.iceGridTest("application.xml", '--IceDir="%s" --TestDir="%s"' % (TestUtil.toplevel, os.getcwd()),
     "'properties-override=%s'" % TestUtil.getCommandLine("", TestUtil.DriverConfig("server")).replace("--", ""))
+
+TestUtil.cleanup()
diff --git a/cpp/test/IceGrid/session/application.xml b/cpp/test/IceGrid/session/application.xml
index f8238129e36..8189513628c 100644
--- a/cpp/test/IceGrid/session/application.xml
+++ b/cpp/test/IceGrid/session/application.xml
@@ -24,12 +24,12 @@
     <node name="localnode">
 
       <server-instance id="Glacier2" template="Glacier2"
-                       endpoints="default -p 12347 -h 127.0.0.1 -t 10000"
+                       endpoints="default -p 12347 -h 127.0.0.1"
                        verifier="ClientPermissionsVerifier"
                        manager="IceGrid/SessionManager"
                        ssl-manager="IceGrid/SSLSessionManager"/>
       <server-instance id="Glacier2Admin" template="Glacier2"
-                       endpoints="default -p 12348 -h 127.0.0.1 -t 10000"
+                       endpoints="default -p 12348 -h 127.0.0.1"
                        verifier="AdminPermissionsVerifier:tcp -p 12002"
                        manager="IceGrid/AdminSessionManager"
                        ssl-manager="IceGrid/AdminSSLSessionManager"/>
diff --git a/cpp/test/IceGrid/session/run.py b/cpp/test/IceGrid/session/run.py
index 4d02eec4fe0..5f9d45d0c40 100755
--- a/cpp/test/IceGrid/session/run.py
+++ b/cpp/test/IceGrid/session/run.py
@@ -51,3 +51,5 @@ IceGridAdmin.iceGridTest("application.xml",
     '\\"properties-override=%s\\"' % TestUtil.getCommandLine("", TestUtil.DriverConfig("server")).replace("--", ""))
 
 verifierProc.waitTestSuccess()
+
+TestUtil.cleanup()
diff --git a/cpp/test/IceGrid/simple/run.py b/cpp/test/IceGrid/simple/run.py
index 4455f5e40e0..ce382bc51f3 100755
--- a/cpp/test/IceGrid/simple/run.py
+++ b/cpp/test/IceGrid/simple/run.py
@@ -29,3 +29,5 @@ IceGridAdmin.iceGridClientServerTest("", "--TestAdapter.Endpoints=default --Test
 # Test client/server with on demand activation.
 #
 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 74191c1e44e..589e5379762 100755
--- a/cpp/test/IceGrid/update/run.py
+++ b/cpp/test/IceGrid/update/run.py
@@ -40,3 +40,5 @@ nodeOverrideOptions = '--IceBinDir="%s" --TestDir="%s" --NodePropertiesOverride=
     TestUtil.getCommandLine("", TestUtil.DriverConfig("server")).replace("--", ""))
 
 IceGridAdmin.iceGridTest("", nodeOverrideOptions)
+
+TestUtil.cleanup()
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp
index fb5b81345e7..683377c23b6 100644
--- a/cpp/test/IceSSL/configuration/AllTests.cpp
+++ b/cpp/test/IceSSL/configuration/AllTests.cpp
@@ -147,7 +147,7 @@ createServerProps(const Ice::PropertiesPtr& defaultProperties, const string& def
 void
 allTests(const CommunicatorPtr& communicator, const string& testDir)
 {
-    string factoryRef = "factory:tcp -p 12010 -t 10000";
+    string factoryRef = "factory:tcp -p 12010";
     ObjectPrx base = communicator->stringToProxy(factoryRef);
     test(base);
     Test::ServerFactoryPrx factory = Test::ServerFactoryPrx::checkedCast(base);
diff --git a/cpp/test/IceSSL/configuration/run.py b/cpp/test/IceSSL/configuration/run.py
index b88cadf4e51..a2276ef921c 100755
--- a/cpp/test/IceSSL/configuration/run.py
+++ b/cpp/test/IceSSL/configuration/run.py
@@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0]))
 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 ea0603c2010..8183283c508 100755
--- a/cpp/test/IceStorm/federation/run.py
+++ b/cpp/test/IceStorm/federation/run.py
@@ -85,3 +85,5 @@ runtest("persistent")
 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 504bab33c62..340483eb065 100755
--- a/cpp/test/IceStorm/federation2/run.py
+++ b/cpp/test/IceStorm/federation2/run.py
@@ -263,4 +263,5 @@ 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 dd374f172d4..ebf81e27454 100755
--- a/cpp/test/IceStorm/rep1/run.py
+++ b/cpp/test/IceStorm/rep1/run.py
@@ -281,3 +281,5 @@ print "stopping replicas...",
 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 fa60fbe8021..b811ad6bd29 100755
--- a/cpp/test/IceStorm/repgrid/run.py
+++ b/cpp/test/IceStorm/repgrid/run.py
@@ -24,3 +24,5 @@ from scripts import *
 # Test client/server without on demand activation.
 #
 IceGridAdmin.iceGridTest("application.xml", "", '"icebox.exe=%s"' % TestUtil.getIceBox())
+
+TestUtil.cleanup()
diff --git a/cpp/test/IceStorm/repstress/run.py b/cpp/test/IceStorm/repstress/run.py
index 46bb3d7ce51..fec7f4c2f40 100755
--- a/cpp/test/IceStorm/repstress/run.py
+++ b/cpp/test/IceStorm/repstress/run.py
@@ -114,3 +114,5 @@ subscriberProc.waitTestSuccess()
 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 c3bfc29607b..786dc8ada1a 100755
--- a/cpp/test/IceStorm/single/run.py
+++ b/cpp/test/IceStorm/single/run.py
@@ -69,4 +69,5 @@ 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 723b121944a..161e0c05047 100755
--- a/cpp/test/IceStorm/stress/run.py
+++ b/cpp/test/IceStorm/stress/run.py
@@ -169,3 +169,5 @@ 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 9252afedd4c..4ffd03456ac 100755
--- a/cpp/test/IceUtil/condvar/run.py
+++ b/cpp/test/IceUtil/condvar/run.py
@@ -32,3 +32,5 @@ client.waitTestSuccess()
 
 client = TestUtil.spawnClient(match + " -b", startReader = True)
 client.waitTestSuccess()
+
+TestUtil.cleanup()
diff --git a/cpp/test/IceUtil/inputUtil/run.py b/cpp/test/IceUtil/inputUtil/run.py
index f1c6206d61a..0800b486b30 100755
--- a/cpp/test/IceUtil/inputUtil/run.py
+++ b/cpp/test/IceUtil/inputUtil/run.py
@@ -22,3 +22,5 @@ from scripts import *
 
 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 478bb2b83bc..aa7bdeaf8ee 100755
--- a/cpp/test/IceUtil/thread/run.py
+++ b/cpp/test/IceUtil/thread/run.py
@@ -23,3 +23,5 @@ from scripts import *
 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 fb3ed194b36..93807972504 100755
--- a/cpp/test/IceUtil/timer/run.py
+++ b/cpp/test/IceUtil/timer/run.py
@@ -22,3 +22,5 @@ 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 478bb2b83bc..aa7bdeaf8ee 100755
--- a/cpp/test/IceUtil/unicode/run.py
+++ b/cpp/test/IceUtil/unicode/run.py
@@ -23,3 +23,5 @@ from scripts import *
 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 fb3ed194b36..93807972504 100755
--- a/cpp/test/IceUtil/uuid/run.py
+++ b/cpp/test/IceUtil/uuid/run.py
@@ -22,3 +22,5 @@ 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 b10af237310..ed1000b8dc6 100755
--- a/cpp/test/Slice/errorDetection/run.py
+++ b/cpp/test/Slice/errorDetection/run.py
@@ -57,4 +57,5 @@ for file in files:
     else:
         print "ok"
 
+TestUtil.cleanup()
 sys.exit(0)
diff --git a/cpp/test/Slice/keyword/Client.cpp b/cpp/test/Slice/keyword/Client.cpp
index 5eaf65563a8..ca49f094467 100644
--- a/cpp/test/Slice/keyword/Client.cpp
+++ b/cpp/test/Slice/keyword/Client.cpp
@@ -126,7 +126,7 @@ testtypes()
 int
 run(const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(new charI, communicator->stringToIdentity("test"));
     adapter->activate();
diff --git a/cpp/test/Slice/keyword/run.py b/cpp/test/Slice/keyword/run.py
index fb3ed194b36..93807972504 100755
--- a/cpp/test/Slice/keyword/run.py
+++ b/cpp/test/Slice/keyword/run.py
@@ -22,3 +22,5 @@ from scripts import *
 
 client = os.path.join(os.getcwd(), "client")
 TestUtil.simpleTest(client)
+
+TestUtil.cleanup()