Bug 3816 - make tests less timing sensitive

98 files changed, 164 insertions, 90 deletions

diff --git a/java/test/Freeze/complex/run.py b/java/test/Freeze/complex/run.py
index 233b4b4221a..b86f1514114 100755
--- a/java/test/Freeze/complex/run.py
+++ b/java/test/Freeze/complex/run.py
@@ -40,3 +40,5 @@ clientProc = TestUtil.startClient("test.Freeze.complex.Client", " --dbdir %s val
 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 1ffda5b95b4..c7c6e9be96e 100755
--- a/java/test/Freeze/dbmap/run.py
+++ b/java/test/Freeze/dbmap/run.py
@@ -28,3 +28,5 @@ clientProc = TestUtil.startClient("test.Freeze.dbmap.Client", os.getcwd(), start
 print "ok"
 clientProc.startReader()
 clientProc.waitTestSuccess()
+
+TestUtil.cleanup()
diff --git a/java/test/Freeze/evictor/Client.java b/java/test/Freeze/evictor/Client.java
index ab8a7989bad..84af28ce6c4 100644
--- a/java/test/Freeze/evictor/Client.java
+++ b/java/test/Freeze/evictor/Client.java
@@ -426,7 +426,7 @@ public class Client extends test.Util.Application
         throws AlreadyRegisteredException, NotRegisteredException, EvictorDeactivatedException
     {
         Ice.Communicator communicator = communicator();
-        String ref = "factory:default -p 12010 -t 30000";
+        String ref = "factory:default -p 12010";
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         RemoteEvictorFactoryPrx factory = RemoteEvictorFactoryPrxHelper.checkedCast(base);
diff --git a/java/test/Freeze/evictor/RemoteEvictorI.java b/java/test/Freeze/evictor/RemoteEvictorI.java
index ed20ea03a99..d1c5b28f60d 100644
--- a/java/test/Freeze/evictor/RemoteEvictorI.java
+++ b/java/test/Freeze/evictor/RemoteEvictorI.java
@@ -62,11 +62,13 @@ public final class RemoteEvictorI extends _RemoteEvictorDisp
 
         if(transactional)
         {
-            _evictor = Freeze.Util.createTransactionalEvictor(_evictorAdapter, envName, category, null, initializer, null, true);
+            _evictor = Freeze.Util.createTransactionalEvictor(_evictorAdapter, envName, category, null, initializer,
+                                                              null, true);
         }
         else
         {
-            _evictor = Freeze.Util.createBackgroundSaveEvictor(_evictorAdapter, envName, category, initializer, null, true);
+            _evictor = Freeze.Util.createBackgroundSaveEvictor(_evictorAdapter, envName, category, initializer, null,
+                                                               true);
         }
 
         initializer.init(this, _evictor);
diff --git a/java/test/Freeze/evictor/run.py b/java/test/Freeze/evictor/run.py
index eb2ec82742a..4a3462a612e 100755
--- a/java/test/Freeze/evictor/run.py
+++ b/java/test/Freeze/evictor/run.py
@@ -26,3 +26,5 @@ TestUtil.cleanDbDir(dbdir)
 testOptions = " --Freeze.Warn.Deadlocks=0 --Freeze.DbEnv.db.DbHome=%s/db --Ice.Config=%s/config " % (os.getcwd(), os.getcwd())
 
 TestUtil.clientServerTest(testOptions, testOptions)
+
+TestUtil.cleanup()
diff --git a/java/test/Freeze/oldevictor/Client.java b/java/test/Freeze/oldevictor/Client.java
index ee5f42de0c4..f30b38e2e29 100644
--- a/java/test/Freeze/oldevictor/Client.java
+++ b/java/test/Freeze/oldevictor/Client.java
@@ -340,7 +340,7 @@ public class Client extends test.Util.Application
     run(String[] args, PrintWriter out)
         throws AlreadyRegisteredException, NotRegisteredException, EvictorDeactivatedException
     {
-        String ref = "factory:default -p 12010 -t 30000";
+        String ref = "factory:default -p 12010";
         Ice.ObjectPrx base = communicator().stringToProxy(ref);
         test(base != null);
         RemoteEvictorFactoryPrx factory = RemoteEvictorFactoryPrxHelper.checkedCast(base);
diff --git a/java/test/Freeze/oldevictor/run.py b/java/test/Freeze/oldevictor/run.py
index b17366f6069..e5a3fbac28f 100755
--- a/java/test/Freeze/oldevictor/run.py
+++ b/java/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(testOptions, testOptions)
+
+TestUtil.cleanup()
diff --git a/java/test/Glacier2/router/Client.java b/java/test/Glacier2/router/Client.java
index 19d0322968f..72ac5f6cf11 100644
--- a/java/test/Glacier2/router/Client.java
+++ b/java/test/Glacier2/router/Client.java
@@ -38,7 +38,7 @@ public class Client extends test.Util.Application
         {
             out.print("testing stringToProxy for router... ");
             out.flush();
-            routerBase = communicator().stringToProxy("Glacier2/router:default -p 12347 -t 30000");
+            routerBase = communicator().stringToProxy("Glacier2/router:default -p 12347");
             out.println("ok");
         }
         
@@ -72,7 +72,7 @@ public class Client extends test.Util.Application
         {
             out.print("testing stringToProxy for server object... ");
             out.flush();
-            base = communicator().stringToProxy("c1/callback:tcp -p 12010 -t 10000");
+            base = communicator().stringToProxy("c1/callback:tcp -p 12010");
             out.println("ok");
         }
             
@@ -421,7 +421,7 @@ public class Client extends test.Util.Application
             
             {
                 out.print("testing stringToProxy for process object... ");
-                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");
                 out.println("ok");
             }
             
diff --git a/java/test/Glacier2/router/Server.java b/java/test/Glacier2/router/Server.java
index 21b2dd8b50e..cd266883ab9 100644
--- a/java/test/Glacier2/router/Server.java
+++ b/java/test/Glacier2/router/Server.java
@@ -14,7 +14,7 @@ public class Server extends test.Util.Application
     public int
     run(String[] args)
     {
-        communicator().getProperties().setProperty("CallbackAdapter.Endpoints", "tcp -p 12010 -t 10000");
+        communicator().getProperties().setProperty("CallbackAdapter.Endpoints", "tcp -p 12010");
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackAdapter");
         adapter.add(new CallbackI(),
                     communicator().stringToIdentity("c1/callback")); // The test allows "c1" as category.
diff --git a/java/test/Glacier2/router/run.py b/java/test/Glacier2/router/run.py
index 976a222bee1..9ac4099c255 100755
--- a/java/test/Glacier2/router/run.py
+++ b/java/test/Glacier2/router/run.py
@@ -27,9 +27,9 @@ args =  ' --Ice.Warn.Dispatch=0' + \
         ' --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.10"' \
+        ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348"' + \
         ' --Ice.Admin.InstanceName=Glacier2' + \
         ' --Glacier2.CryptPasswords="' + os.path.join(os.getcwd(), "passwords") + '"'
 
@@ -44,3 +44,5 @@ TestUtil.clientServerTest()
 TestUtil.clientServerTest(additionalClientOptions=" --shutdown")
 
 starterProc.waitTestSuccess()
+
+TestUtil.cleanup()
diff --git a/java/test/Ice/adapterDeactivation/AllTests.java b/java/test/Ice/adapterDeactivation/AllTests.java
index ca5bc9160d4..a8af4287e52 100644
--- a/java/test/Ice/adapterDeactivation/AllTests.java
+++ b/java/test/Ice/adapterDeactivation/AllTests.java
@@ -30,7 +30,7 @@ public class AllTests
     {
 	out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "test:default -p 12010 -t 10000";
+        String ref = "test:default -p 12010";
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
diff --git a/java/test/Ice/adapterDeactivation/Collocated.java b/java/test/Ice/adapterDeactivation/Collocated.java
index 60e7399f0ef..c054e57c122 100644
--- a/java/test/Ice/adapterDeactivation/Collocated.java
+++ b/java/test/Ice/adapterDeactivation/Collocated.java
@@ -29,7 +29,7 @@ public class Collocated extends test.Util.Application
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.adapterDeactivation");
-        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010");
         return initData;
     }
 
diff --git a/java/test/Ice/adapterDeactivation/Server.java b/java/test/Ice/adapterDeactivation/Server.java
index 36ed2b732bf..826aa0de912 100644
--- a/java/test/Ice/adapterDeactivation/Server.java
+++ b/java/test/Ice/adapterDeactivation/Server.java
@@ -29,7 +29,7 @@ public class Server extends test.Util.Application
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.adapterDeactivation");
-        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
+        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
         return initData;
     }
     
diff --git a/java/test/Ice/adapterDeactivation/run.py b/java/test/Ice/adapterDeactivation/run.py
index 545214a74c7..979b91c2544 100755
--- a/java/test/Ice/adapterDeactivation/run.py
+++ b/java/test/Ice/adapterDeactivation/run.py
@@ -22,3 +22,5 @@ from scripts import *
 
 TestUtil.clientServerTest()
 TestUtil.collocatedTest()
+
+TestUtil.cleanup()
diff --git a/java/test/Ice/background/AllTests.java b/java/test/Ice/background/AllTests.java
index 3bead0cfa51..1f5b38e9d01 100644
--- a/java/test/Ice/background/AllTests.java
+++ b/java/test/Ice/background/AllTests.java
@@ -238,13 +238,13 @@ public class AllTests
     public static BackgroundPrx
     allTests(Configuration configuration, Ice.Communicator communicator, PrintWriter out)
     {
-        String sref = "background:default -p 12010 -t 20000";
+        String sref = "background:default -p 12010";
         Ice.ObjectPrx obj = communicator.stringToProxy(sref);
         test(obj != null);
 
         BackgroundPrx background = BackgroundPrxHelper.uncheckedCast(obj);
 
-        sref = "backgroundController:tcp -p 12011 -t 20000";
+        sref = "backgroundController:tcp -p 12011";
         obj = communicator.stringToProxy(sref);
         test(obj != null);
 
@@ -296,7 +296,7 @@ public class AllTests
             }
             backgroundController.resumeCall("findAdapterById");
 
-            obj = communicator.stringToProxy("locator:default -p 12010 -t 20000");
+            obj = communicator.stringToProxy("locator:default -p 12010");
             locator = Ice.LocatorPrxHelper.uncheckedCast(obj);
             obj = obj.ice_locator(locator);
             obj.ice_ping();
@@ -336,7 +336,7 @@ public class AllTests
             }
             backgroundController.resumeCall("getClientProxy");
 
-            obj = communicator.stringToProxy("router:default -p 12010 -t 20000");
+            obj = communicator.stringToProxy("router:default -p 12010");
             router = Ice.RouterPrxHelper.uncheckedCast(obj);
             obj = communicator.stringToProxy("background@Test").ice_router(router);
             BackgroundPrx bg = BackgroundPrxHelper.uncheckedCast(obj);
diff --git a/java/test/Ice/background/Server.java b/java/test/Ice/background/Server.java
index 7d3e941a3f1..1ecf7c3c025 100644
--- a/java/test/Ice/background/Server.java
+++ b/java/test/Ice/background/Server.java
@@ -126,7 +126,7 @@ public class Server extends test.Util.Application
         
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.background");
 
-        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 20000");
+        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010");
         initData.properties.setProperty("ControllerAdapter.Endpoints", "tcp -p 12011");
         initData.properties.setProperty("ControllerAdapter.ThreadPool.Size", "1");
         
diff --git a/java/test/Ice/background/run.py b/java/test/Ice/background/run.py
index bb34e7d35b7..56d48e628de 100755
--- a/java/test/Ice/background/run.py
+++ b/java/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/java/test/Ice/binding/AllTests.java b/java/test/Ice/binding/AllTests.java
index 9e3c824c030..f15ce6a186b 100644
--- a/java/test/Ice/binding/AllTests.java
+++ b/java/test/Ice/binding/AllTests.java
@@ -124,7 +124,7 @@ public class AllTests
     public static void
     allTests(Ice.Communicator communicator, PrintWriter out)
     {
-        String ref = "communicator:default -p 12010 -t 10000";
+        String ref = "communicator:default -p 12010";
         RemoteCommunicatorPrx com = RemoteCommunicatorPrxHelper.uncheckedCast(communicator.stringToProxy(ref));
 
 		out.print("testing binding with single endpoint... ");
diff --git a/java/test/Ice/binding/run.py b/java/test/Ice/binding/run.py
index bb34e7d35b7..56d48e628de 100755
--- a/java/test/Ice/binding/run.py
+++ b/java/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/java/test/Ice/checksum/AllTests.java b/java/test/Ice/checksum/AllTests.java
index b8910e8e445..f3cbed56857 100644
--- a/java/test/Ice/checksum/AllTests.java
+++ b/java/test/Ice/checksum/AllTests.java
@@ -26,7 +26,7 @@ public class AllTests
     public static ChecksumPrx
     allTests(Ice.Communicator communicator, boolean collocated, PrintWriter out)
     {
-        String ref = "test:default -p 12010 -t 10000";
+        String ref = "test:default -p 12010";
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
 
diff --git a/java/test/Ice/checksum/Server.java b/java/test/Ice/checksum/Server.java
index a28b5b0a2dd..426165083cb 100644
--- a/java/test/Ice/checksum/Server.java
+++ b/java/test/Ice/checksum/Server.java
@@ -15,7 +15,7 @@ public class Server extends test.Util.Application
     run(String[] args)
     {
 	Ice.Communicator communicator = communicator();
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object object = new ChecksumI(adapter);
         adapter.add(object, communicator.stringToIdentity("test"));
diff --git a/java/test/Ice/checksum/run.py b/java/test/Ice/checksum/run.py
index bb34e7d35b7..56d48e628de 100755
--- a/java/test/Ice/checksum/run.py
+++ b/java/test/Ice/checksum/run.py
@@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0]))
 from scripts import *
 
 TestUtil.clientServerTest()
+
+TestUtil.cleanup()
diff --git a/java/test/Ice/custom14/AllTests.java b/java/test/Ice/custom14/AllTests.java
index ae85324ca00..4cef78a0e01 100644
--- a/java/test/Ice/custom14/AllTests.java
+++ b/java/test/Ice/custom14/AllTests.java
@@ -53,7 +53,7 @@ public class AllTests
     {
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "test:default -p 12010 -t 10000";
+        String ref = "test:default -p 12010";
         Ice.ObjectPrx obj = communicator.stringToProxy(ref);
         test(obj != null);
         out.println("ok");
diff --git a/java/test/Ice/custom14/Collocated.java b/java/test/Ice/custom14/Collocated.java
index 18e72e1b84d..0e9b997f96a 100644
--- a/java/test/Ice/custom14/Collocated.java
+++ b/java/test/Ice/custom14/Collocated.java
@@ -28,7 +28,7 @@ public class Collocated extends test.Util.Application
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.custom14");
-        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010");
         return initData;
     }
 
diff --git a/java/test/Ice/custom14/Server.java b/java/test/Ice/custom14/Server.java
index 180e9fd2f68..f78e8cbfb87 100644
--- a/java/test/Ice/custom14/Server.java
+++ b/java/test/Ice/custom14/Server.java
@@ -28,7 +28,7 @@ public class Server extends test.Util.Application
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.custom14");
-        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010");
         return initData;
     }
 
diff --git a/java/test/Ice/custom14/run.py b/java/test/Ice/custom14/run.py
index 545214a74c7..979b91c2544 100755
--- a/java/test/Ice/custom14/run.py
+++ b/java/test/Ice/custom14/run.py
@@ -22,3 +22,5 @@ from scripts import *
 
 TestUtil.clientServerTest()
 TestUtil.collocatedTest()
+
+TestUtil.cleanup()
diff --git a/java/test/Ice/custom15/AllTests.java b/java/test/Ice/custom15/AllTests.java
index 94aee414bcb..8a8a4d44170 100644
--- a/java/test/Ice/custom15/AllTests.java
+++ b/java/test/Ice/custom15/AllTests.java
@@ -54,7 +54,7 @@ public class AllTests
     {
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "test:default -p 12010 -t 10000";
+        String ref = "test:default -p 12010";
         Ice.ObjectPrx obj = communicator.stringToProxy(ref);
         test(obj != null);
         out.println("ok");
diff --git a/java/test/Ice/custom15/Collocated.java b/java/test/Ice/custom15/Collocated.java
index 94c9480d328..68c3a88a346 100644
--- a/java/test/Ice/custom15/Collocated.java
+++ b/java/test/Ice/custom15/Collocated.java
@@ -28,7 +28,7 @@ public class Collocated extends test.Util.Application
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.custom15");
-        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010");
         return initData;
     }
 
diff --git a/java/test/Ice/custom15/Server.java b/java/test/Ice/custom15/Server.java
index bc972cd07a1..f76edac1261 100644
--- a/java/test/Ice/custom15/Server.java
+++ b/java/test/Ice/custom15/Server.java
@@ -28,7 +28,7 @@ public class Server extends test.Util.Application
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.custom15");
-        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010");
         return initData;
     }
 
diff --git a/java/test/Ice/custom15/run.py b/java/test/Ice/custom15/run.py
index 545214a74c7..979b91c2544 100755
--- a/java/test/Ice/custom15/run.py
+++ b/java/test/Ice/custom15/run.py
@@ -22,3 +22,5 @@ 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 5053bafec30..a4cb650386d 100755
--- a/java/test/Ice/defaultServant/run.py
+++ b/java/test/Ice/defaultServant/run.py
@@ -26,3 +26,5 @@ print "ok"
 clientProc.startReader()
 
 clientProc.waitTestSuccess()
+
+TestUtil.cleanup()
diff --git a/java/test/Ice/exceptions/AMDServer.java b/java/test/Ice/exceptions/AMDServer.java
index a6f3f30e7a1..b5338f26dd2 100644
--- a/java/test/Ice/exceptions/AMDServer.java
+++ b/java/test/Ice/exceptions/AMDServer.java
@@ -32,7 +32,7 @@ public class AMDServer extends test.Util.Application
 
         initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.exceptions.AMD");
-        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
+        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
 
         // We don't need to disable warnings, because we have a dummy logger.
         // properties.setProperty("Ice.Warn.Dispatch", "0");
diff --git a/java/test/Ice/exceptions/AllTests.java b/java/test/Ice/exceptions/AllTests.java
index cc8d7e1a104..e5370a42f85 100644
--- a/java/test/Ice/exceptions/AllTests.java
+++ b/java/test/Ice/exceptions/AllTests.java
@@ -769,7 +769,7 @@ public class AllTests
             try
             {
                 Ice.ObjectAdapter second = 
-                    communicator.createObjectAdapterWithEndpoints("TestAdapter0", "ssl -h foo -p 12011 -t 10000");
+                    communicator.createObjectAdapterWithEndpoints("TestAdapter0", "ssl -h foo -p 12011");
                 test(false);
             }
             catch(Ice.AlreadyRegisteredException ex)
@@ -845,7 +845,7 @@ public class AllTests
 
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "thrower:default -p 12010 -t 10000";
+        String ref = "thrower:default -p 12010";
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
diff --git a/java/test/Ice/exceptions/Collocated.java b/java/test/Ice/exceptions/Collocated.java
index 52222997412..cbcf32ded12 100644
--- a/java/test/Ice/exceptions/Collocated.java
+++ b/java/test/Ice/exceptions/Collocated.java
@@ -29,7 +29,7 @@ public class Collocated extends test.Util.Application
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.exceptions");
-        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010");
         return initData;
     }
 
diff --git a/java/test/Ice/exceptions/Server.java b/java/test/Ice/exceptions/Server.java
index ffbb1d690db..e56792ec055 100644
--- a/java/test/Ice/exceptions/Server.java
+++ b/java/test/Ice/exceptions/Server.java
@@ -28,7 +28,7 @@ public class Server extends test.Util.Application
         initData.logger = new DummyLogger();
 
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.exceptions");
-        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
+        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
         // We don't need to disable warnings, because we have a dummy logger.
         // properties.setProperty("Ice.Warn.Dispatch", "0");
 
diff --git a/java/test/Ice/exceptions/run.py b/java/test/Ice/exceptions/run.py
index 8266b166ff9..749cf593b0e 100755
--- a/java/test/Ice/exceptions/run.py
+++ b/java/test/Ice/exceptions/run.py
@@ -28,3 +28,5 @@ TestUtil.clientServerTest(server="test.Ice.exceptions.AMDServer")
 
 print "tests with collocated server."
 TestUtil.collocatedTest()
+
+TestUtil.cleanup()
diff --git a/java/test/Ice/facets/AllTests.java b/java/test/Ice/facets/AllTests.java
index 21fa77be371..252a60f16dd 100644
--- a/java/test/Ice/facets/AllTests.java
+++ b/java/test/Ice/facets/AllTests.java
@@ -113,7 +113,7 @@ public class AllTests
 
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "d:default -p 12010 -t 10000";
+        String ref = "d:default -p 12010";
         Ice.ObjectPrx db = communicator.stringToProxy(ref);
         test(db != null);
         out.println("ok");
diff --git a/java/test/Ice/facets/Collocated.java b/java/test/Ice/facets/Collocated.java
index 302ef2b32a6..7564adc2324 100644
--- a/java/test/Ice/facets/Collocated.java
+++ b/java/test/Ice/facets/Collocated.java
@@ -14,7 +14,7 @@ public class Collocated extends test.Util.Application
     public int run(String[] args)
     {
         Ice.Communicator communicator = communicator();
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object d = new DI();
         adapter.add(d, communicator.stringToIdentity("d"));
diff --git a/java/test/Ice/facets/Server.java b/java/test/Ice/facets/Server.java
index cf16c8fad62..be24d4961f6 100644
--- a/java/test/Ice/facets/Server.java
+++ b/java/test/Ice/facets/Server.java
@@ -33,7 +33,7 @@ public class Server extends test.Util.Application
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.facets");
-        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010");
         return initData;
     }
 
diff --git a/java/test/Ice/facets/run.py b/java/test/Ice/facets/run.py
index 545214a74c7..979b91c2544 100755
--- a/java/test/Ice/facets/run.py
+++ b/java/test/Ice/facets/run.py
@@ -22,3 +22,5 @@ from scripts import *
 
 TestUtil.clientServerTest()
 TestUtil.collocatedTest()
+
+TestUtil.cleanup()
diff --git a/java/test/Ice/faultTolerance/AllTests.java b/java/test/Ice/faultTolerance/AllTests.java
index 65df0a594f8..e9b3837bae4 100644
--- a/java/test/Ice/faultTolerance/AllTests.java
+++ b/java/test/Ice/faultTolerance/AllTests.java
@@ -222,7 +222,7 @@ public class AllTests
         String ref = "test";
         for(int i = 0; i < ports.length; i++)
         {
-            ref += ":default -t 60000 -p " + ports[i];
+            ref += ":default -p " + ports[i];
         }
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
diff --git a/java/test/Ice/faultTolerance/run.py b/java/test/Ice/faultTolerance/run.py
index 6e6003bbeae..c71fd66f916 100755
--- a/java/test/Ice/faultTolerance/run.py
+++ b/java/test/Ice/faultTolerance/run.py
@@ -40,3 +40,5 @@ clientProc.startReader()
 clientProc.waitTestSuccess()
 for p in serverProc:
     p.waitTestSuccess()
+
+TestUtil.cleanup()
diff --git a/java/test/Ice/hold/AllTests.java b/java/test/Ice/hold/AllTests.java
index e2603cca3d7..4999c70cd63 100644
--- a/java/test/Ice/hold/AllTests.java
+++ b/java/test/Ice/hold/AllTests.java
@@ -104,10 +104,10 @@ public class AllTests
     {
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "hold:default -p 12010 -t 60000";
+        String ref = "hold:default -p 12010";
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
-        String refSerialized = "hold:default -p 12011 -t 60000";
+        String refSerialized = "hold:default -p 12011";
         Ice.ObjectPrx baseSerialized = communicator.stringToProxy(refSerialized);
         test(baseSerialized != null);
         out.println("ok");
diff --git a/java/test/Ice/hold/Server.java b/java/test/Ice/hold/Server.java
index ae0a3a5939c..a932be78d16 100644
--- a/java/test/Ice/hold/Server.java
+++ b/java/test/Ice/hold/Server.java
@@ -38,13 +38,13 @@ public class Server extends test.Util.Application
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.hold");
-        initData.properties.setProperty("TestAdapter1.Endpoints", "default -p 12010 -t 10000:udp");
+        initData.properties.setProperty("TestAdapter1.Endpoints", "default -p 12010:udp");
         initData.properties.setProperty("TestAdapter1.ThreadPool.Size", "5");
         initData.properties.setProperty("TestAdapter1.ThreadPool.SizeMax", "5");
         initData.properties.setProperty("TestAdapter1.ThreadPool.SizeWarn", "0");
         initData.properties.setProperty("TestAdapter1.ThreadPool.Serialize", "0");
 
-        initData.properties.setProperty("TestAdapter2.Endpoints", "default -p 12011 -t 10000:udp");
+        initData.properties.setProperty("TestAdapter2.Endpoints", "default -p 12011:udp");
         initData.properties.setProperty("TestAdapter2.ThreadPool.Size", "5");
         initData.properties.setProperty("TestAdapter2.ThreadPool.SizeMax", "5");
         initData.properties.setProperty("TestAdapter2.ThreadPool.SizeWarn", "0");
diff --git a/java/test/Ice/hold/run.py b/java/test/Ice/hold/run.py
index bb34e7d35b7..56d48e628de 100755
--- a/java/test/Ice/hold/run.py
+++ b/java/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/java/test/Ice/inheritance/AllTests.java b/java/test/Ice/inheritance/AllTests.java
index 4e200a31d3f..f0c7af47896 100644
--- a/java/test/Ice/inheritance/AllTests.java
+++ b/java/test/Ice/inheritance/AllTests.java
@@ -39,7 +39,7 @@ public class AllTests
     {
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "initial:default -p 12010 -t 10000";
+        String ref = "initial:default -p 12010";
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
diff --git a/java/test/Ice/inheritance/Collocated.java b/java/test/Ice/inheritance/Collocated.java
index 2081c9bfc7a..1b0a10dae07 100644
--- a/java/test/Ice/inheritance/Collocated.java
+++ b/java/test/Ice/inheritance/Collocated.java
@@ -28,7 +28,7 @@ public class Collocated extends test.Util.Application
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.inheritance");
-        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010");
         return initData;
     }
 
diff --git a/java/test/Ice/inheritance/Server.java b/java/test/Ice/inheritance/Server.java
index 252e9ef26fe..1e7f2de6d68 100644
--- a/java/test/Ice/inheritance/Server.java
+++ b/java/test/Ice/inheritance/Server.java
@@ -26,7 +26,7 @@ public class Server extends test.Util.Application
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.inheritance");
-        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010");
         return initData;
     }
 
diff --git a/java/test/Ice/inheritance/run.py b/java/test/Ice/inheritance/run.py
index 545214a74c7..979b91c2544 100755
--- a/java/test/Ice/inheritance/run.py
+++ b/java/test/Ice/inheritance/run.py
@@ -22,3 +22,5 @@ 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 d91769dbe44..5d316e77541 100755
--- a/java/test/Ice/interceptor/run.py
+++ b/java/test/Ice/interceptor/run.py
@@ -26,3 +26,5 @@ print "ok"
 clientProc.startReader()
 
 clientProc.waitTestSuccess()
+
+TestUtil.cleanup()
diff --git a/java/test/Ice/location/AllTests.java b/java/test/Ice/location/AllTests.java
index 17c32a8a598..a54103299e1 100644
--- a/java/test/Ice/location/AllTests.java
+++ b/java/test/Ice/location/AllTests.java
@@ -38,7 +38,7 @@ public class AllTests
     allTests(Ice.Communicator communicator, PrintWriter out)
     {
         ServerManagerPrx manager = ServerManagerPrxHelper.checkedCast(
-            communicator.stringToProxy("ServerManager :default -t 10000 -p 12010"));
+            communicator.stringToProxy("ServerManager :default -p 12010"));
         test(manager != null);
 
         TestLocatorPrx locator = TestLocatorPrxHelper.uncheckedCast(communicator.getDefaultLocator());
diff --git a/java/test/Ice/location/Server.java b/java/test/Ice/location/Server.java
index ee857be383b..97ab0d0c385 100644
--- a/java/test/Ice/location/Server.java
+++ b/java/test/Ice/location/Server.java
@@ -52,7 +52,7 @@ public class Server extends test.Util.Application
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.location");
         initData.properties.setProperty("Ice.ThreadPool.Server.Size", "2");
         initData.properties.setProperty("Ice.ThreadPool.Server.SizeWarn", "0");
-        initData.properties.setProperty("ServerManagerAdapter.Endpoints", "default -p 12010 -t 30000:udp");
+        initData.properties.setProperty("ServerManagerAdapter.Endpoints", "default -p 12010:udp");
 
         _initData = initData;
         return initData;
diff --git a/java/test/Ice/location/ServerManagerI.java b/java/test/Ice/location/ServerManagerI.java
index df5075fcf4a..a445bc8fcd1 100644
--- a/java/test/Ice/location/ServerManagerI.java
+++ b/java/test/Ice/location/ServerManagerI.java
@@ -62,7 +62,7 @@ public class ServerManagerI extends _ServerManagerDisp
         Ice.ObjectAdapter adapter = serverCommunicator.createObjectAdapter("TestAdapter");
         Ice.ObjectAdapter adapter2 = serverCommunicator.createObjectAdapter("TestAdapter2");
 
-        Ice.ObjectPrx locator = serverCommunicator.stringToProxy("locator:default -p 12010 -t 30000");
+        Ice.ObjectPrx locator = serverCommunicator.stringToProxy("locator:default -p 12010");
         adapter.setLocator(Ice.LocatorPrxHelper.uncheckedCast(locator));
         adapter2.setLocator(Ice.LocatorPrxHelper.uncheckedCast(locator));
 
diff --git a/java/test/Ice/location/run.py b/java/test/Ice/location/run.py
index bb34e7d35b7..56d48e628de 100755
--- a/java/test/Ice/location/run.py
+++ b/java/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/java/test/Ice/objects/AllTests.java b/java/test/Ice/objects/AllTests.java
index c67efa5f7a0..ffebb642f5b 100644
--- a/java/test/Ice/objects/AllTests.java
+++ b/java/test/Ice/objects/AllTests.java
@@ -43,7 +43,7 @@ public class AllTests
     {
 		out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "initial:default -p 12010 -t 10000";
+        String ref = "initial:default -p 12010";
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
@@ -205,7 +205,7 @@ public class AllTests
         {
             out.print("testing UnexpectedObjectException...");
             out.flush();
-            ref = "uoet:default -p 12010 -t 10000";
+            ref = "uoet:default -p 12010";
             base = communicator.stringToProxy(ref);
             test(base != null);
             UnexpectedObjectExceptionTestPrx uoet = UnexpectedObjectExceptionTestPrxHelper.uncheckedCast(base);
diff --git a/java/test/Ice/objects/Collocated.java b/java/test/Ice/objects/Collocated.java
index 15725ec1cb5..d5fc4c00b0c 100644
--- a/java/test/Ice/objects/Collocated.java
+++ b/java/test/Ice/objects/Collocated.java
@@ -16,7 +16,7 @@ public class Collocated extends test.Util.Application
     public int run(String[] args)
     {
         Ice.Communicator communicator = communicator();
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Initial initial = new InitialI(adapter);
         adapter.add(initial, communicator.stringToIdentity("initial"));
diff --git a/java/test/Ice/objects/Server.java b/java/test/Ice/objects/Server.java
index 1d16d6330af..7326efc81a7 100644
--- a/java/test/Ice/objects/Server.java
+++ b/java/test/Ice/objects/Server.java
@@ -61,7 +61,7 @@ public class Server extends test.Util.Application
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.objects");
-        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010");
         return initData;
     }
 
diff --git a/java/test/Ice/objects/run.py b/java/test/Ice/objects/run.py
index 545214a74c7..979b91c2544 100755
--- a/java/test/Ice/objects/run.py
+++ b/java/test/Ice/objects/run.py
@@ -22,3 +22,5 @@ from scripts import *
 
 TestUtil.clientServerTest()
 TestUtil.collocatedTest()
+
+TestUtil.cleanup()
diff --git a/java/test/Ice/operations/AMDServer.java b/java/test/Ice/operations/AMDServer.java
index 880f3cb23bc..cef8f2f3dba 100644
--- a/java/test/Ice/operations/AMDServer.java
+++ b/java/test/Ice/operations/AMDServer.java
@@ -31,7 +31,7 @@ public class AMDServer extends test.Util.Application
         //
         initData.properties.setProperty("Ice.Warn.Dispatch", "0");
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.operations.AMD");
-        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 20000:udp");
+        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
 
         return initData;
     }
diff --git a/java/test/Ice/operations/AllTests.java b/java/test/Ice/operations/AllTests.java
index e2a24b65ec4..593490d2548 100644
--- a/java/test/Ice/operations/AllTests.java
+++ b/java/test/Ice/operations/AllTests.java
@@ -21,7 +21,7 @@ public class AllTests
     allTests(test.Util.Application app, boolean collocated, PrintWriter out)
     {
         Ice.Communicator communicator = app.communicator();
-        String ref = "test:default -p 12010 -t 20000";
+        String ref = "test:default -p 12010";
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         MyClassPrx cl = MyClassPrxHelper.checkedCast(base);
         MyDerivedClassPrx derived = MyDerivedClassPrxHelper.checkedCast(cl);
diff --git a/java/test/Ice/operations/Collocated.java b/java/test/Ice/operations/Collocated.java
index 84fbfeb1910..b2137d4c875 100644
--- a/java/test/Ice/operations/Collocated.java
+++ b/java/test/Ice/operations/Collocated.java
@@ -28,7 +28,7 @@ public class Collocated extends test.Util.Application
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.operations");
-        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 20000");
+        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010");
         return initData;
     }
 
diff --git a/java/test/Ice/operations/Twoways.java b/java/test/Ice/operations/Twoways.java
index 588b9355ff4..791e42e5df9 100644
--- a/java/test/Ice/operations/Twoways.java
+++ b/java/test/Ice/operations/Twoways.java
@@ -718,7 +718,7 @@ class Twoways
 
                 communicator.setDefaultContext(dflt);
                 MyClassPrx c = MyClassPrxHelper.checkedCast(
-                                        communicator.stringToProxy("test:default -p 12010 -t 20000"));
+                                        communicator.stringToProxy("test:default -p 12010"));
                 test(c.opContext().equals(dflt));
 
                 dflt.put("a", "c");
@@ -761,8 +761,7 @@ class Twoways
                 ctx.put("two", "TWO");
                 ctx.put("three", "THREE");
 
-                MyClassPrx p3 = MyClassPrxHelper.uncheckedCast(
-                    ic.stringToProxy("test:default -p 12010 -t 20000"));
+                MyClassPrx p3 = MyClassPrxHelper.uncheckedCast(ic.stringToProxy("test:default -p 12010"));
 
                 ic.getImplicitContext().setContext(ctx);
                 test(ic.getImplicitContext().getContext().equals(ctx));
diff --git a/java/test/Ice/operations/TwowaysAMI.java b/java/test/Ice/operations/TwowaysAMI.java
index cf942a3a473..cba0a49d11c 100644
--- a/java/test/Ice/operations/TwowaysAMI.java
+++ b/java/test/Ice/operations/TwowaysAMI.java
@@ -1624,7 +1624,7 @@ class TwowaysAMI
 
                 communicator.setDefaultContext(dflt);
                 MyClassPrx c = MyClassPrxHelper.checkedCast(
-                                                communicator.stringToProxy("test:default -p 12010 -t 10000"));
+                                                communicator.stringToProxy("test:default -p 12010"));
                 {
                     java.util.HashMap<String, String> tmp = new java.util.HashMap<String, String>();
                     tmp.put("a", "b");
@@ -1697,8 +1697,7 @@ class TwowaysAMI
                 ctx.put("two", "TWO");
                 ctx.put("three", "THREE");
 
-                MyClassPrx p3 = MyClassPrxHelper.uncheckedCast(
-                    ic.stringToProxy("test:default -p 12010 -t 20000"));
+                MyClassPrx p3 = MyClassPrxHelper.uncheckedCast(ic.stringToProxy("test:default -p 12010"));
 
                 ic.getImplicitContext().setContext(ctx);
                 test(ic.getImplicitContext().getContext().equals(ctx));
diff --git a/java/test/Ice/operations/run.py b/java/test/Ice/operations/run.py
index 07f6b811416..2cafe0a9bc1 100755
--- a/java/test/Ice/operations/run.py
+++ b/java/test/Ice/operations/run.py
@@ -28,3 +28,5 @@ TestUtil.clientServerTest(server="test.Ice.operations.AMDServer")
 
 print "tests with collocated server."
 TestUtil.collocatedTest()
+
+TestUtil.cleanup()
diff --git a/java/test/Ice/packagemd/AllTests.java b/java/test/Ice/packagemd/AllTests.java
index d9d89374de5..97522019bea 100644
--- a/java/test/Ice/packagemd/AllTests.java
+++ b/java/test/Ice/packagemd/AllTests.java
@@ -35,7 +35,7 @@ public class AllTests
     {
 		out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "initial:default -p 12010 -t 10000";
+        String ref = "initial:default -p 12010";
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
diff --git a/java/test/Ice/packagemd/Server.java b/java/test/Ice/packagemd/Server.java
index 541aa3c512a..929c019c40d 100644
--- a/java/test/Ice/packagemd/Server.java
+++ b/java/test/Ice/packagemd/Server.java
@@ -27,7 +27,7 @@ public class Server extends test.Util.Application
         initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.packagemd");
         initData.properties.setProperty("Ice.Package.Test1", "test.Ice.packagemd");
-        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010");
         return initData;
     }
 
diff --git a/java/test/Ice/packagemd/run.py b/java/test/Ice/packagemd/run.py
index bb34e7d35b7..56d48e628de 100755
--- a/java/test/Ice/packagemd/run.py
+++ b/java/test/Ice/packagemd/run.py
@@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0]))
 from scripts import *
 
 TestUtil.clientServerTest()
+
+TestUtil.cleanup()
diff --git a/java/test/Ice/proxy/AMDServer.java b/java/test/Ice/proxy/AMDServer.java
index ccca44fc02a..fa3d210b7dc 100644
--- a/java/test/Ice/proxy/AMDServer.java
+++ b/java/test/Ice/proxy/AMDServer.java
@@ -26,7 +26,7 @@ public class AMDServer extends test.Util.Application
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.proxy.AMD");
-        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
+        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
         return initData;
     }
 
diff --git a/java/test/Ice/proxy/AllTests.java b/java/test/Ice/proxy/AllTests.java
index a2b54a1c01e..be483795c1d 100644
--- a/java/test/Ice/proxy/AllTests.java
+++ b/java/test/Ice/proxy/AllTests.java
@@ -31,7 +31,7 @@ public class AllTests
     {
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "test:default -p 12010 -t 10000";
+        String ref = "test:default -p 12010";
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
 
@@ -235,7 +235,7 @@ public class AllTests
         out.flush();
         Ice.Properties 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.equals("test") && b1.ice_getIdentity().category.length() == 0 &&
              b1.ice_getAdapterId().length() == 0 && b1.ice_getFacet().length() == 0);
@@ -279,7 +279,7 @@ public class AllTests
         //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() == null);
diff --git a/java/test/Ice/proxy/Collocated.java b/java/test/Ice/proxy/Collocated.java
index 14b2f385879..3f84336a3ef 100644
--- a/java/test/Ice/proxy/Collocated.java
+++ b/java/test/Ice/proxy/Collocated.java
@@ -14,7 +14,7 @@ public class Collocated extends test.Util.Application
     public int run(String[] args)
     {
         Ice.Communicator communicator = communicator();
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         adapter.add(new MyDerivedClassI(), communicator.stringToIdentity("test"));
         adapter.activate();
diff --git a/java/test/Ice/proxy/run.py b/java/test/Ice/proxy/run.py
index 4b6874e1f37..884a20ce0d6 100755
--- a/java/test/Ice/proxy/run.py
+++ b/java/test/Ice/proxy/run.py
@@ -28,3 +28,5 @@ TestUtil.clientServerTest(server="test.Ice.proxy.AMDServer")
 
 print "tests with collocated server."
 TestUtil.collocatedTest()
+
+TestUtil.cleanup()
diff --git a/java/test/Ice/retry/AllTests.java b/java/test/Ice/retry/AllTests.java
index a151a88e768..bdde4ea936e 100644
--- a/java/test/Ice/retry/AllTests.java
+++ b/java/test/Ice/retry/AllTests.java
@@ -120,7 +120,7 @@ public class AllTests
     {
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "retry:default -p 12010 -t 10000";
+        String ref = "retry:default -p 12010";
         Ice.ObjectPrx base1 = communicator.stringToProxy(ref);
         test(base1 != null);
         Ice.ObjectPrx base2 = communicator.stringToProxy(ref);
diff --git a/java/test/Ice/retry/Server.java b/java/test/Ice/retry/Server.java
index 95243590107..4da8ae9c6a7 100644
--- a/java/test/Ice/retry/Server.java
+++ b/java/test/Ice/retry/Server.java
@@ -25,7 +25,7 @@ public class Server extends test.Util.Application
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.retry");
-        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010");
         return initData;
     }
 
diff --git a/java/test/Ice/retry/run.py b/java/test/Ice/retry/run.py
index bb34e7d35b7..56d48e628de 100755
--- a/java/test/Ice/retry/run.py
+++ b/java/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/java/test/Ice/seqMapping/AllTests.java b/java/test/Ice/seqMapping/AllTests.java
index 37b1df2d96d..a799a93e225 100644
--- a/java/test/Ice/seqMapping/AllTests.java
+++ b/java/test/Ice/seqMapping/AllTests.java
@@ -18,7 +18,7 @@ public class AllTests
     public static MyClassPrx
     allTests(Ice.Communicator communicator, boolean collocated, PrintWriter out)
     {
-        String ref = "test:default -p 12010 -t 10000";
+        String ref = "test:default -p 12010";
         Ice.ObjectPrx baseProxy = communicator.stringToProxy(ref);
         MyClassPrx cl = MyClassPrxHelper.checkedCast(baseProxy);
 
diff --git a/java/test/Ice/seqMapping/Collocated.java b/java/test/Ice/seqMapping/Collocated.java
index c394d4b28d3..defa0c1a421 100644
--- a/java/test/Ice/seqMapping/Collocated.java
+++ b/java/test/Ice/seqMapping/Collocated.java
@@ -31,7 +31,7 @@ public class Collocated extends test.Util.Application
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.seqMapping");
-        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010");
         return initData;
     }
 
diff --git a/java/test/Ice/seqMapping/run.py b/java/test/Ice/seqMapping/run.py
index b361826c48f..8283dc5a7d5 100755
--- a/java/test/Ice/seqMapping/run.py
+++ b/java/test/Ice/seqMapping/run.py
@@ -28,3 +28,5 @@ TestUtil.clientServerTest(server="test.Ice.seqMapping.AMDServer")
 
 print "tests with collocated server."
 TestUtil.collocatedTest()
+
+TestUtil.cleanup()
diff --git a/java/test/Ice/serialize/AllTests.java b/java/test/Ice/serialize/AllTests.java
index ea69059e355..7ecbd8ec52c 100644
--- a/java/test/Ice/serialize/AllTests.java
+++ b/java/test/Ice/serialize/AllTests.java
@@ -25,7 +25,7 @@ public class AllTests
     public static InitialPrx
     allTests(Ice.Communicator communicator, boolean collocated, PrintWriter out)
     {
-        String ref = "initial:default -p 12010 -t 10000";
+        String ref = "initial:default -p 12010";
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         InitialPrx initial = InitialPrxHelper.checkedCast(base);
 
diff --git a/java/test/Ice/serialize/Server.java b/java/test/Ice/serialize/Server.java
index 93355a90da5..6f734a780eb 100644
--- a/java/test/Ice/serialize/Server.java
+++ b/java/test/Ice/serialize/Server.java
@@ -29,7 +29,7 @@ public class Server extends test.Util.Application
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.serialize");
-        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010");
         return initData;
     }
 
diff --git a/java/test/Ice/serialize/run.py b/java/test/Ice/serialize/run.py
index bb34e7d35b7..56d48e628de 100755
--- a/java/test/Ice/serialize/run.py
+++ b/java/test/Ice/serialize/run.py
@@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0]))
 from scripts import *
 
 TestUtil.clientServerTest()
+
+TestUtil.cleanup()
diff --git a/java/test/Ice/servantLocator/AMDServer.java b/java/test/Ice/servantLocator/AMDServer.java
index 38764531a6a..2234ff7c4e7 100644
--- a/java/test/Ice/servantLocator/AMDServer.java
+++ b/java/test/Ice/servantLocator/AMDServer.java
@@ -27,7 +27,7 @@ public class AMDServer extends test.Util.Application
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator.AMD");
-        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010");
         initData.properties.setProperty("Ice.Warn.Dispatch", "0");
 
         return initData;
diff --git a/java/test/Ice/servantLocator/AllTests.java b/java/test/Ice/servantLocator/AllTests.java
index 58d4c8b8e3e..16c0450f5d5 100644
--- a/java/test/Ice/servantLocator/AllTests.java
+++ b/java/test/Ice/servantLocator/AllTests.java
@@ -192,7 +192,7 @@ public class AllTests
     {
 		out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "asm:default -p 12010 -t 10000";
+        String ref = "asm:default -p 12010";
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
@@ -208,7 +208,7 @@ public class AllTests
         out.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);
         }
@@ -223,7 +223,7 @@ public class AllTests
 
         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);
         }
@@ -239,11 +239,11 @@ public class AllTests
 
         out.print("testing servant locator... ");
         out.flush();
-        base = communicator.stringToProxy("category/locate:default -p 12010 -t 10000");
+        base = communicator.stringToProxy("category/locate:default -p 12010");
         obj = TestIntfPrxHelper.checkedCast(base);
         try
         {
-            TestIntfPrxHelper.checkedCast(communicator.stringToProxy("category/unknown:default -p 12010 -t 10000"));
+            TestIntfPrxHelper.checkedCast(communicator.stringToProxy("category/unknown:default -p 12010"));
         }
         catch(ObjectNotExistException ex)
         {
@@ -252,20 +252,20 @@ public class AllTests
 
         out.print("testing default servant locator... ");
         out.flush();
-        base = communicator.stringToProxy("anothercat/locate:default -p 12010 -t 10000");
+        base = communicator.stringToProxy("anothercat/locate:default -p 12010");
         obj = TestIntfPrxHelper.checkedCast(base);
-        base = communicator.stringToProxy("locate:default -p 12010 -t 10000");
+        base = communicator.stringToProxy("locate:default -p 12010");
         obj = TestIntfPrxHelper.checkedCast(base);
         try
         {
-            TestIntfPrxHelper.checkedCast(communicator.stringToProxy("anothercat/unknown:default -p 12010 -t 10000"));
+            TestIntfPrxHelper.checkedCast(communicator.stringToProxy("anothercat/unknown:default -p 12010"));
         }
         catch(ObjectNotExistException ex)
         {
         }
         try
         {
-            TestIntfPrxHelper.checkedCast(communicator.stringToProxy("unknown:default -p 12010 -t 10000"));
+            TestIntfPrxHelper.checkedCast(communicator.stringToProxy("unknown:default -p 12010"));
         }
         catch(ObjectNotExistException ex)
         {
@@ -274,14 +274,14 @@ public class AllTests
 
         out.print("testing locate exceptions... ");
         out.flush();
-        base = communicator.stringToProxy("category/locate:default -p 12010 -t 10000");
+        base = communicator.stringToProxy("category/locate:default -p 12010");
         obj = TestIntfPrxHelper.checkedCast(base);
         testExceptions(obj, collocated);
         out.println("ok");
 
         out.print("testing finished exceptions... ");
         out.flush();
-        base = communicator.stringToProxy("category/finished:default -p 12010 -t 10000");
+        base = communicator.stringToProxy("category/finished:default -p 12010");
         obj = TestIntfPrxHelper.checkedCast(base);
         testExceptions(obj, collocated);
         out.println("ok");
diff --git a/java/test/Ice/servantLocator/Collocated.java b/java/test/Ice/servantLocator/Collocated.java
index d8f8e383ba0..d47f4459683 100644
--- a/java/test/Ice/servantLocator/Collocated.java
+++ b/java/test/Ice/servantLocator/Collocated.java
@@ -28,7 +28,7 @@ public class Collocated extends test.Util.Application
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator");
-        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010");
         initData.properties.setProperty("Ice.Warn.Dispatch", "0");
 
         return initData;
diff --git a/java/test/Ice/servantLocator/Server.java b/java/test/Ice/servantLocator/Server.java
index 26ee4fa9769..b349abdca3f 100644
--- a/java/test/Ice/servantLocator/Server.java
+++ b/java/test/Ice/servantLocator/Server.java
@@ -26,7 +26,7 @@ public class Server extends test.Util.Application
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator");
-        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010");
         initData.properties.setProperty("Ice.Warn.Dispatch", "0");
 
         return initData;
diff --git a/java/test/Ice/servantLocator/run.py b/java/test/Ice/servantLocator/run.py
index 829444ed8a2..e59cdae0d46 100755
--- a/java/test/Ice/servantLocator/run.py
+++ b/java/test/Ice/servantLocator/run.py
@@ -28,3 +28,5 @@ 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 ed56aea4e71..5874eea18e8 100755
--- a/java/test/Ice/slicing/exceptions/run.py
+++ b/java/test/Ice/slicing/exceptions/run.py
@@ -28,3 +28,5 @@ import copy
 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 5d357e042ef..0ee80b7f64a 100755
--- a/java/test/Ice/slicing/objects/run.py
+++ b/java/test/Ice/slicing/objects/run.py
@@ -34,3 +34,5 @@ import copy
 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 4e8769e647c..32da652d782 100755
--- a/java/test/Ice/stream/run.py
+++ b/java/test/Ice/stream/run.py
@@ -26,3 +26,5 @@ print "ok"
 clientProc.startReader()
 
 clientProc.waitTestSuccess()
+
+TestUtil.cleanup()
diff --git a/java/test/Ice/timeout/AllTests.java b/java/test/Ice/timeout/AllTests.java
index aa431bb4947..a68978445c4 100644
--- a/java/test/Ice/timeout/AllTests.java
+++ b/java/test/Ice/timeout/AllTests.java
@@ -168,7 +168,7 @@ public class AllTests
     {
         Ice.Communicator communicator = app.communicator();
 
-        String sref = "timeout:default -p 12010 -t 10000";
+        String sref = "timeout:default -p 12010";
         Ice.ObjectPrx obj = communicator.stringToProxy(sref);
         test(obj != null);
 
diff --git a/java/test/Ice/timeout/Server.java b/java/test/Ice/timeout/Server.java
index d111ebf008a..806a658edc5 100644
--- a/java/test/Ice/timeout/Server.java
+++ b/java/test/Ice/timeout/Server.java
@@ -25,7 +25,7 @@ public class Server extends test.Util.Application
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.timeout");
-        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010");
 
         //
         // This test kills connections, so we don't want warnings.
diff --git a/java/test/Ice/timeout/run.py b/java/test/Ice/timeout/run.py
index bb34e7d35b7..56d48e628de 100755
--- a/java/test/Ice/timeout/run.py
+++ b/java/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/java/test/Ice/udp/run.py b/java/test/Ice/udp/run.py
index ed8fbcc4ccf..8f7de9ad621 100755
--- a/java/test/Ice/udp/run.py
+++ b/java/test/Ice/udp/run.py
@@ -38,3 +38,5 @@ clientProc.startReader()
 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 67461502cce..fc00938b0d6 100755
--- a/java/test/IceBox/configuration/run.py
+++ b/java/test/IceBox/configuration/run.py
@@ -24,3 +24,5 @@ TestUtil.clientServerTest(additionalServerOptions="--Ice.Config=%s" % os.path.jo
 	server=TestUtil.getIceBox())
 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 4455f5e40e0..ce382bc51f3 100755
--- a/java/test/IceGrid/simple/run.py
+++ b/java/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/java/test/IceSSL/configuration/AllTests.java b/java/test/IceSSL/configuration/AllTests.java
index 962e287c929..ad163e7e284 100644
--- a/java/test/IceSSL/configuration/AllTests.java
+++ b/java/test/IceSSL/configuration/AllTests.java
@@ -71,7 +71,7 @@ public class AllTests
     allTests(test.Util.Application app, String testDir, PrintWriter out)
     {
         Ice.Communicator communicator = app.communicator();
-        final String factoryRef = "factory:tcp -p 12010 -t 10000";
+        final String factoryRef = "factory:tcp -p 12010";
         Ice.ObjectPrx b = communicator.stringToProxy(factoryRef);
         test(b != null);
         ServerFactoryPrx factory = ServerFactoryPrxHelper.checkedCast(b);
diff --git a/java/test/IceSSL/configuration/run.py b/java/test/IceSSL/configuration/run.py
index 154cffc869d..7c9c2a9ec07 100755
--- a/java/test/IceSSL/configuration/run.py
+++ b/java/test/IceSSL/configuration/run.py
@@ -23,3 +23,5 @@ from scripts import *
 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 cc4d1e94df2..2083ea1fcc4 100755
--- a/java/test/IceUtil/inputUtil/run.py
+++ b/java/test/IceUtil/inputUtil/run.py
@@ -25,3 +25,5 @@ clientProc = TestUtil.startClient("test.IceUtil.inputUtil.Client",startReader=Fa
 print "ok"
 clientProc.startReader()
 clientProc.waitTestSuccess()
+
+TestUtil.cleanup()
diff --git a/java/test/Slice/keyword/run.py b/java/test/Slice/keyword/run.py
index 4feb349fa01..ac3960ffafc 100755
--- a/java/test/Slice/keyword/run.py
+++ b/java/test/Slice/keyword/run.py
@@ -25,3 +25,5 @@ clientProc = TestUtil.startClient("test.Slice.keyword.Client",startReader=False)
 print "ok"
 clientProc.startReader()
 clientProc.waitTestSuccess()
+
+TestUtil.cleanup()