More gradle changes.

Moved android stuff to its own package.
Moved java tests to src/main/java/test subdirectory.

585 files changed, 576 insertions, 2001 deletions

diff --git a/java/test/Freeze/dbmap/db/.gitignore b/java/test/Freeze/dbmap/db/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/java/test/Freeze/dbmap/db/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/java/test/Freeze/evictor/db/DB_CONFIG b/java/test/Freeze/evictor/db/DB_CONFIG
deleted file mode 100644
index b6d05535741..00000000000
--- a/java/test/Freeze/evictor/db/DB_CONFIG
+++ /dev/null
@@ -1,2 +0,0 @@
-set_flags DB_TXN_NOSYNC
-
diff --git a/java/test/Freeze/fileLock/db/.gitignore b/java/test/Freeze/fileLock/db/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/java/test/Freeze/fileLock/db/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/java/test/Ice/binding/run.py b/java/test/Ice/binding/run.py
deleted file mode 100755
index 33fc2e8f3ac..00000000000
--- a/java/test/Ice/binding/run.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
-    path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
-    raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-TestUtil.clientServerTest()
diff --git a/java/test/Ice/checksum/run.py b/java/test/Ice/checksum/run.py
deleted file mode 100755
index 33fc2e8f3ac..00000000000
--- a/java/test/Ice/checksum/run.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
-    path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
-    raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-TestUtil.clientServerTest()
diff --git a/java/test/Ice/classLoader/run.py b/java/test/Ice/classLoader/run.py
deleted file mode 100755
index 33fc2e8f3ac..00000000000
--- a/java/test/Ice/classLoader/run.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
-    path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
-    raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-TestUtil.clientServerTest()
diff --git a/java/test/Ice/facets/run.py b/java/test/Ice/facets/run.py
deleted file mode 100755
index 44aa7d73d00..00000000000
--- a/java/test/Ice/facets/run.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
-    path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
-    raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-TestUtil.clientServerTest()
-TestUtil.collocatedTest()
diff --git a/java/test/Ice/hold/run.py b/java/test/Ice/hold/run.py
deleted file mode 100755
index 33fc2e8f3ac..00000000000
--- a/java/test/Ice/hold/run.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
-    path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
-    raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-TestUtil.clientServerTest()
diff --git a/java/test/Ice/info/run.py b/java/test/Ice/info/run.py
deleted file mode 100755
index 33fc2e8f3ac..00000000000
--- a/java/test/Ice/info/run.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
-    path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
-    raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-TestUtil.clientServerTest()
diff --git a/java/test/Ice/inheritance/run.py b/java/test/Ice/inheritance/run.py
deleted file mode 100755
index 44aa7d73d00..00000000000
--- a/java/test/Ice/inheritance/run.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
-    path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
-    raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-TestUtil.clientServerTest()
-TestUtil.collocatedTest()
diff --git a/java/test/Ice/location/run.py b/java/test/Ice/location/run.py
deleted file mode 100755
index 33fc2e8f3ac..00000000000
--- a/java/test/Ice/location/run.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
-    path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
-    raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-TestUtil.clientServerTest()
diff --git a/java/test/Ice/packagemd/run.py b/java/test/Ice/packagemd/run.py
deleted file mode 100755
index 33fc2e8f3ac..00000000000
--- a/java/test/Ice/packagemd/run.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
-    path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
-    raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-TestUtil.clientServerTest()
diff --git a/java/test/Ice/retry/run.py b/java/test/Ice/retry/run.py
deleted file mode 100755
index a40df1a1bcb..00000000000
--- a/java/test/Ice/retry/run.py
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
-    path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
-    raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-print("tests with regular server.")
-TestUtil.clientServerTest()
-print("tests with collocated server.")
-TestUtil.collocatedTest()
diff --git a/java/test/Ice/serialize/run.py b/java/test/Ice/serialize/run.py
deleted file mode 100755
index 33fc2e8f3ac..00000000000
--- a/java/test/Ice/serialize/run.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
-    path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
-    raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-TestUtil.clientServerTest()
diff --git a/java/test/Ice/threadPoolPriority/run.py b/java/test/Ice/threadPoolPriority/run.py
deleted file mode 100755
index 3cbc4137c5e..00000000000
--- a/java/test/Ice/threadPoolPriority/run.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
-    path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
-    raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-print("tests with regular server.")
-TestUtil.clientServerTest()
diff --git a/java/test/Ice/timeout/run.py b/java/test/Ice/timeout/run.py
deleted file mode 100755
index 33fc2e8f3ac..00000000000
--- a/java/test/Ice/timeout/run.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
-    path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
-    raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-TestUtil.clientServerTest()
diff --git a/java/test/IceGrid/simple/db/.gitignore b/java/test/IceGrid/simple/db/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/java/test/IceGrid/simple/db/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/java/test/android/.gitignore b/java/test/android/.gitignore
deleted file mode 100644
index 36f971e324f..00000000000
--- a/java/test/android/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-bin/*
diff --git a/java/test/android/.settings/com.zeroc.Slice2JavaPlugin.prefs b/java/test/android/.settings/com.zeroc.Slice2JavaPlugin.prefs
deleted file mode 100644
index e16f272214d..00000000000
--- a/java/test/android/.settings/com.zeroc.Slice2JavaPlugin.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Wed Dec 17 22:14:32 NST 2008
-eclipse.preferences.version=1
-jars=
diff --git a/java/test/android/.settings/org.eclipse.jdt.core.prefs b/java/test/android/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 10b58d391b6..00000000000
--- a/java/test/android/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,266 +0,0 @@
-#Mon Dec 08 10:55:23 NST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=48
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=52
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=18
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=21
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=8
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/java/test/android/.settings/org.eclipse.jdt.ui.prefs b/java/test/android/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 377fe71a31b..00000000000
--- a/java/test/android/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Fri Dec 05 11:14:03 NST 2008
-eclipse.preferences.version=1
-formatter_profile=_ZeroC
-formatter_settings_version=11
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/java/test/android/AndroidManifest.xml b/java/test/android/AndroidManifest.xml
deleted file mode 100644
index ffd725f90b2..00000000000
--- a/java/test/android/AndroidManifest.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.zeroc.testsuite"
-      android:versionCode="1"
-      android:versionName="1.0.0">
-    <uses-permission android:name="android.permission.INTERNET"></uses-permission>
-    <!--
-      http://developer.android.com/guide/topics/manifest/uses-sdk-element.html
-    -->
-    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="17"/>
-    <application android:icon="@raw/icon" android:label="@string/app_name" android:name="TestApp"
-        		 android:allowBackup="false">
-        <activity android:name=".TestSuite"
-                  android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    <activity android:name="TestContainer"></activity>
-</application>
-</manifest> 
\ No newline at end of file
diff --git a/java/test/android/gen/com/zeroc/testsuite/BuildConfig.java b/java/test/android/gen/com/zeroc/testsuite/BuildConfig.java
deleted file mode 100644
index dd14f6c3ca5..00000000000
--- a/java/test/android/gen/com/zeroc/testsuite/BuildConfig.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Automatically generated file. DO NOT MODIFY */
-package com.zeroc.testsuite;
-
-public final class BuildConfig {
-    public final static boolean DEBUG = true;
-}
\ No newline at end of file
diff --git a/java/test/android/gen/com/zeroc/testsuite/R.java b/java/test/android/gen/com/zeroc/testsuite/R.java
deleted file mode 100644
index 77ab4d9e567..00000000000
--- a/java/test/android/gen/com/zeroc/testsuite/R.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package com.zeroc.testsuite;
-
-public final class R {
-    public static final class attr {
-    }
-    public static final class id {
-        public static final int ipv6=0x7f050002;
-        public static final int next=0x7f050000;
-        public static final int secure=0x7f050001;
-    }
-    public static final class layout {
-        public static final int container=0x7f020000;
-        public static final int main=0x7f020001;
-    }
-    public static final class raw {
-        public static final int client=0x7f030000;
-        public static final int icon=0x7f030001;
-        public static final int server=0x7f030002;
-    }
-    public static final class string {
-        public static final int app_name=0x7f040000;
-        public static final int ipv6=0x7f040003;
-        public static final int next=0x7f040001;
-        public static final int ssl=0x7f040002;
-    }
-}
diff --git a/java/test/android/project.properties b/java/test/android/project.properties
deleted file mode 100644
index b7c2081d560..00000000000
--- a/java/test/android/project.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-10
diff --git a/java/test/android/res/layout/container.xml b/java/test/android/res/layout/container.xml
deleted file mode 100644
index 91afb966be7..00000000000
--- a/java/test/android/res/layout/container.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-    
-	<ListView
-	    android:id="@android:id/list"
-	    android:layout_width="fill_parent" 
-	    android:layout_height="0dip"
-        android:layout_weight="1"
-        android:stackFromBottom="true"
-	 android:transcriptMode="alwaysScroll"/>
-	 
-	<Button
-		android:id="@+id/next"
-		android:layout_height="wrap_content"
-		android:layout_width="wrap_content"
-		android:text="@string/next"
-		/>	
- 
- </LinearLayout>
- 
diff --git a/java/test/android/res/layout/main.xml b/java/test/android/res/layout/main.xml
deleted file mode 100644
index 612802f59b4..00000000000
--- a/java/test/android/res/layout/main.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:padding="5dip"
-    >
-
-	<ListView xmlns:android="http://schemas.android.com/apk/res/android"
-	    android:id="@android:id/list"
-	    android:layout_width="fill_parent" 
-	    android:layout_height="0dip"
-	    android:layout_weight="1"
-	    android:stackFromBottom="true"
-	        
-	 />    
-
-	<LinearLayout
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:orientation="horizontal"
-		android:paddingBottom="5dip"
-		>
-	
-		<TextView
-		    android:layout_width="0dip" 
-		    android:layout_height="wrap_content"
-		    android:layout_weight="30" 
-		    android:text="@string/ssl"
-		    />	 
-			
-		<CheckBox
-			android:id="@+id/secure"
-			android:layout_width="0dip"
-			android:layout_weight="70"
-			android:layout_height="wrap_content"
-			/>
-		
-		<TextView
-		    android:layout_width="0dip" 
-		    android:layout_height="wrap_content"
-		    android:layout_weight="30" 
-		    android:text="@string/ipv6"
-		    />	
-		    
-		<CheckBox
-			android:id="@+id/ipv6"
-			android:layout_width="0dip"
-			android:layout_weight="70"
-			android:layout_height="wrap_content"
-			/>
-	
-	</LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/java/test/android/res/raw/client.bks b/java/test/android/res/raw/client.bks
deleted file mode 100644
index 538d360fac0..00000000000
--- a/java/test/android/res/raw/client.bks
+++ /dev/null
diff --git a/java/test/android/res/raw/icon.png b/java/test/android/res/raw/icon.png
deleted file mode 100644
index 75024841d32..00000000000
--- a/java/test/android/res/raw/icon.png
+++ /dev/null
diff --git a/java/test/android/res/raw/server.bks b/java/test/android/res/raw/server.bks
deleted file mode 100644
index 1216ff6f26d..00000000000
--- a/java/test/android/res/raw/server.bks
+++ /dev/null
diff --git a/java/test/android/res/values/strings.xml b/java/test/android/res/values/strings.xml
deleted file mode 100644
index 797e31f6429..00000000000
--- a/java/test/android/res/values/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Test Suite</string>
-    <string name="next">Next</string>
-    <string name="ssl">SSL</string>
-    <string name="ipv6">IPv6</string>
-</resources>
diff --git a/java/test/android/src/com/zeroc/testsuite/TestApp.java b/java/test/android/src/com/zeroc/testsuite/TestApp.java
deleted file mode 100644
index 811d8060f44..00000000000
--- a/java/test/android/src/com/zeroc/testsuite/TestApp.java
+++ /dev/null
@@ -1,795 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package com.zeroc.testsuite;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.Writer;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.CertificateException;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManagerFactory;
-
-import test.Util.Application.CommunicatorListener;
-import Ice.Communicator;
-import android.app.Application;
-import android.os.Handler;
-import android.os.Build.VERSION;
-
-public class TestApp extends Application
-{
-    static private class TestSuiteEntry
-    {
-        TestSuiteEntry(String name, Class<? extends test.Util.Application> client,
-                       Class<? extends test.Util.Application> server,
-                       Class<? extends test.Util.Application> collocated)
-        {
-            _name = name;
-            _client = client;
-            _server = server;
-            _collocated = collocated;
-        }
-
-        String getName()
-        {
-            return _name;
-        }
-
-        test.Util.Application getClient()
-            throws IllegalAccessException, InstantiationException
-        {
-            if(_client == null)
-            {
-                return null;
-            }
-            return _client.newInstance();
-        }
-
-        test.Util.Application getServer()
-            throws IllegalAccessException, InstantiationException
-        {
-            if(_server == null)
-            {
-                return null;
-            }
-
-            return _server.newInstance();
-        }
-
-        test.Util.Application getCollocated()
-            throws IllegalAccessException, InstantiationException
-        {
-            if(_collocated == null)
-            {
-                return null;
-            }
-
-            return _collocated.newInstance();
-        }
-
-        private String _name;
-        private Class<? extends test.Util.Application> _client;
-        private Class<? extends test.Util.Application> _server;
-        private Class<? extends test.Util.Application> _collocated;
-    }
-
-    static final private TestSuiteEntry[] _tests =
-    {
-        new TestSuiteEntry("adapterDeactivation", test.Ice.adapterDeactivation.Client.class,
-                           test.Ice.adapterDeactivation.Server.class, test.Ice.adapterDeactivation.Collocated.class),
-        new TestSuiteEntry("admin", test.Ice.admin.Client.class, test.Ice.admin.Server.class, null),
-        new TestSuiteEntry("ami", test.Ice.ami.Client.class, test.Ice.ami.Server.class, null),
-        new TestSuiteEntry("binding", test.Ice.binding.Client.class, test.Ice.binding.Server.class, null),
-        new TestSuiteEntry("checksum", test.Ice.checksum.Client.class, test.Ice.checksum.Server.class, null),
-        new TestSuiteEntry("classLoader", test.Ice.classLoader.Client.class, test.Ice.classLoader.Server.class, null),
-        new TestSuiteEntry("custom", test.Ice.custom.Client.class, test.Ice.custom.Server.class,
-                           test.Ice.custom.Collocated.class),
-        new TestSuiteEntry("defaultServant", test.Ice.defaultServant.Client.class, null, null),
-        new TestSuiteEntry("defaultValue", test.Ice.defaultValue.Client.class, null, null),
-        new TestSuiteEntry("dispatcher", test.Ice.dispatcher.Client.class, test.Ice.dispatcher.Server.class, null),
-        new TestSuiteEntry("enums", test.Ice.enums.Client.class, test.Ice.enums.Server.class, null),
-        new TestSuiteEntry("exceptions", test.Ice.exceptions.Client.class, test.Ice.exceptions.Server.class,
-                           test.Ice.exceptions.Collocated.class),
-        new TestSuiteEntry("facets", test.Ice.facets.Client.class, test.Ice.facets.Server.class,
-                           test.Ice.facets.Collocated.class),
-        // Require SSL
-        //new TestSuiteEntry("hash", test.Ice.hash.Client.class, null, null),
-        new TestSuiteEntry("hold", test.Ice.hold.Client.class, test.Ice.hold.Server.class, null),
-        // The info test is not currently enabled - it relies on sockets to accurately return
-        // address and port information, which really only works in Android 2.3+.
-        //new TestSuiteEntry("info", test.Ice.info.Client.class, test.Ice.info.Server.class, null),
-        new TestSuiteEntry("inheritance", test.Ice.inheritance.Client.class, test.Ice.inheritance.Server.class,
-                           test.Ice.inheritance.Collocated.class),
-        new TestSuiteEntry("interceptor", test.Ice.interceptor.Client.class, null, null),
-        new TestSuiteEntry("invoke", test.Ice.invoke.Client.class, test.Ice.invoke.Server.class, null),
-        new TestSuiteEntry("location", test.Ice.location.Client.class, test.Ice.location.Server.class, null),
-        // The metrics test uses too much memory.
-        //new TestSuiteEntry("metrics", test.Ice.metrics.Client.class, test.Ice.metrics.Server.class, null),
-        new TestSuiteEntry("objects", test.Ice.objects.Client.class, test.Ice.objects.Server.class,
-                           test.Ice.objects.Collocated.class),
-        new TestSuiteEntry("operations", test.Ice.operations.Client.class, test.Ice.operations.Server.class,
-                           test.Ice.operations.Collocated.class),
-        new TestSuiteEntry("optional", test.Ice.optional.Client.class, test.Ice.optional.Server.class, null),
-        new TestSuiteEntry("packagemd", test.Ice.packagemd.Client.class, test.Ice.packagemd.Server.class, null),
-        new TestSuiteEntry("proxy", test.Ice.proxy.Client.class, test.Ice.proxy.Server.class,
-                           test.Ice.proxy.Collocated.class),
-        new TestSuiteEntry("retry", test.Ice.retry.Client.class, test.Ice.retry.Server.class, null),
-        new TestSuiteEntry("seqMapping", test.Ice.seqMapping.Client.class, test.Ice.seqMapping.Server.class,
-                           test.Ice.seqMapping.Collocated.class),
-        new TestSuiteEntry("serialize", test.Ice.serialize.Client.class, test.Ice.serialize.Server.class, null),
-        new TestSuiteEntry("servantLocator", test.Ice.servantLocator.Client.class,
-                           test.Ice.servantLocator.Server.class, test.Ice.servantLocator.Collocated.class),
-        new TestSuiteEntry("slicing/exceptions", test.Ice.slicing.exceptions.Client.class,
-                           test.Ice.slicing.exceptions.Server.class, null),
-        new TestSuiteEntry("slicing/objects", test.Ice.slicing.objects.Client.class,
-                           test.Ice.slicing.objects.Server.class, null),
-        new TestSuiteEntry("stream", test.Ice.stream.Client.class, null, null),
-        // The throughput test uses too much memory.
-        //new TestSuiteEntry("throughput", test.Ice.throughput.Client.class, test.Ice.throughput.Server.class, null),
-        new TestSuiteEntry("timeout", test.Ice.timeout.Client.class, test.Ice.timeout.Server.class, null),
-    };
-
-    static final private TestSuiteEntry[] _ssltests =
-    {
-        new TestSuiteEntry("adapterDeactivation", test.Ice.adapterDeactivation.Client.class,
-                           test.Ice.adapterDeactivation.Server.class, test.Ice.adapterDeactivation.Collocated.class),
-        new TestSuiteEntry("ami", test.Ice.ami.Client.class, test.Ice.ami.Server.class, null),
-        new TestSuiteEntry("binding", test.Ice.binding.Client.class, test.Ice.binding.Server.class, null),
-        new TestSuiteEntry("checksum", test.Ice.checksum.Client.class, test.Ice.checksum.Server.class, null),
-        new TestSuiteEntry("classLoader", test.Ice.classLoader.Client.class, test.Ice.classLoader.Server.class, null),
-        new TestSuiteEntry("custom", test.Ice.custom.Client.class, test.Ice.custom.Server.class,
-                           test.Ice.custom.Collocated.class),
-        new TestSuiteEntry("defaultServant", test.Ice.defaultServant.Client.class, null, null),
-        new TestSuiteEntry("defaultValue", test.Ice.defaultValue.Client.class, null, null),
-        new TestSuiteEntry("dispatcher", test.Ice.dispatcher.Client.class, test.Ice.dispatcher.Server.class, null),
-        new TestSuiteEntry("enums", test.Ice.enums.Client.class, test.Ice.enums.Server.class, null),
-        new TestSuiteEntry("exceptions", test.Ice.exceptions.Client.class, test.Ice.exceptions.Server.class,
-                           test.Ice.exceptions.Collocated.class),
-        new TestSuiteEntry("facets", test.Ice.facets.Client.class, test.Ice.facets.Server.class,
-                           test.Ice.facets.Collocated.class),
-        // The hash test uses too much memory.
-        //new TestSuiteEntry("hash", test.Ice.hash.Client.class, null, null),
-        new TestSuiteEntry("hold", test.Ice.hold.Client.class, test.Ice.hold.Server.class, null),
-        // The info test is not currently enabled - it relies on sockets to accurately return
-        // address and port information, which really only works in Android 2.3+.
-        //new TestSuiteEntry("info", test.Ice.info.Client.class, test.Ice.info.Server.class, null),
-        new TestSuiteEntry("inheritance", test.Ice.inheritance.Client.class, test.Ice.inheritance.Server.class,
-                           test.Ice.inheritance.Collocated.class),
-        new TestSuiteEntry("interceptor", test.Ice.interceptor.Client.class, null, null),
-        new TestSuiteEntry("invoke", test.Ice.invoke.Client.class, test.Ice.invoke.Server.class, null),
-        new TestSuiteEntry("location", test.Ice.location.Client.class, test.Ice.location.Server.class, null),
-        // The metrics test uses too much memory.
-        //new TestSuiteEntry("metrics", test.Ice.metrics.Client.class, test.Ice.metrics.Server.class, null),
-        new TestSuiteEntry("objects", test.Ice.objects.Client.class, test.Ice.objects.Server.class,
-                           test.Ice.objects.Collocated.class),
-        new TestSuiteEntry("operations", test.Ice.operations.Client.class, test.Ice.operations.Server.class,
-                           test.Ice.operations.Collocated.class),
-        new TestSuiteEntry("optional", test.Ice.optional.Client.class, test.Ice.optional.Server.class, null),
-        new TestSuiteEntry("packagemd", test.Ice.packagemd.Client.class, test.Ice.packagemd.Server.class, null),
-        new TestSuiteEntry("proxy", test.Ice.proxy.Client.class, test.Ice.proxy.Server.class,
-                           test.Ice.proxy.Collocated.class),
-        new TestSuiteEntry("retry", test.Ice.retry.Client.class, test.Ice.retry.Server.class, null),
-        new TestSuiteEntry("serialize", test.Ice.serialize.Client.class, test.Ice.serialize.Server.class, null),
-        new TestSuiteEntry("seqMapping", test.Ice.seqMapping.Client.class, test.Ice.seqMapping.Server.class,
-                           test.Ice.seqMapping.Collocated.class),
-        new TestSuiteEntry("servantLocator", test.Ice.servantLocator.Client.class,
-                           test.Ice.servantLocator.Server.class, test.Ice.servantLocator.Collocated.class),
-        new TestSuiteEntry("slicing/exceptions", test.Ice.slicing.exceptions.Client.class,
-                           test.Ice.slicing.exceptions.Server.class, null),
-        new TestSuiteEntry("slicing/objects", test.Ice.slicing.objects.Client.class,
-                           test.Ice.slicing.objects.Server.class, null),
-        new TestSuiteEntry("stream", test.Ice.stream.Client.class, null, null),
-        new TestSuiteEntry("timeout", test.Ice.timeout.Client.class, test.Ice.timeout.Server.class, null),
-    };
-    private TestSuiteEntry[] _curtests = _tests;
-    
-    class MyWriter extends Writer
-    {
-        @Override
-        public void close()
-            throws IOException
-        {
-            flush();
-        }
-
-        @Override
-        public void flush()
-            throws IOException
-        {
-            final String s = _data.toString();
-            if(s.length() > 0)
-            {
-                postOnOutput(s);
-            }
-            _data = new StringBuffer();
-        }
-
-        @Override
-        public void write(char[] buf, int offset, int count)
-            throws IOException
-        {
-            _data.append(buf, offset, count);
-        }
-
-        private StringBuffer _data = new StringBuffer();
-    }
-
-    private Handler _handler;
-    private LinkedList<String> _strings = new LinkedList<String>();
-
-    public interface TestListener
-    {
-        public void onStartTest(String test);
-
-        public void onOutput(String s);
-
-        public void onComplete(int status);
-    }
-
-    private TestListener _listener = null;
-
-    private boolean _complete = false;
-    private int _status = 0;
-    private int _currentTest = -1;
-
-    private boolean _ssl = false;
-    private boolean _sslInitialized = false;
-    private boolean _sslSupported = false;
-    private boolean _ipv6 = false;
-    private SSLContext _clientContext = null;
-    private SSLContext _serverContext = null;
-    private SSLInitializationListener _ssllistener;
-
-    static abstract class TestThread extends Thread
-    {
-        test.Util.Application _app;
-        protected int _status;
-
-        TestThread(test.Util.Application app)
-        {
-            _app = app;
-        }
-
-        public int getStatus()
-        {
-            return _status;
-        }
-        
-        protected String[] setupAddress(String[] args, boolean ipv6)
-        {
-            if(ipv6)
-            {
-                String[] ipv6Args =
-                {
-                    "--Ice.Default.Host=0:0:0:0:0:0:0:1",
-                    "--Ice.IPv4=1",
-                    "--Ice.IPv6=1",
-                    "--Ice.PreferIPv6Address=1",
-                };
-                
-                String[] nargs = new String[args.length + ipv6Args.length];
-                System.arraycopy(args, 0, nargs, 0, args.length);
-                System.arraycopy(ipv6Args, 0, nargs, args.length, ipv6Args.length);
-                return nargs;
-            }
-            else
-            {
-                String[] ipv4Args =
-                {
-                    "--Ice.Default.Host=127.0.0.1",
-                    "--Ice.IPv4=1",
-                    "--Ice.IPv6=0"
-                };
-                
-                String[] nargs = new String[args.length + ipv4Args.length];
-                System.arraycopy(args, 0, nargs, 0, args.length);
-                System.arraycopy(ipv4Args, 0, nargs, args.length, ipv4Args.length);
-                return nargs;
-            }
-        }
-
-        protected String[] setupssl(String[] args, final SSLContext context)
-        {
-            String[] sslargs =
-            {
-                "--Ice.Plugin.IceSSL=IceSSL.PluginFactory", "--Ice.Default.Protocol=ssl", "--Ice.InitPlugins=0"
-            };
-
-            //
-            // Froyo apparently still suffers from Harmony bug 6047, requiring that we
-            // disable server-side verification of client certificates.
-            //
-            if(VERSION.SDK_INT == 8) // android.os.Build.VERSION_CODES.FROYO (8)
-            {
-                String[] arr = new String[sslargs.length + 1];
-                System.arraycopy(sslargs, 0, arr, 0, sslargs.length);
-                arr[arr.length - 1] = "--IceSSL.VerifyPeer=0";
-                sslargs = arr;
-            }
-
-            String[] nargs = new String[args.length + sslargs.length];
-            System.arraycopy(args, 0, nargs, 0, args.length);
-            System.arraycopy(sslargs, 0, nargs, args.length, sslargs.length);
-            args = nargs;
-            _app.setCommunicatorListener(new CommunicatorListener()
-            {
-                public void communicatorInitialized(Communicator c)
-                {
-                    IceSSL.Plugin plugin = (IceSSL.Plugin)c.getPluginManager().getPlugin("IceSSL");
-                    plugin.setContext(context);
-                    c.getPluginManager().initializePlugins();
-                }
-            });
-            return args;
-        }
-    }
-
-    class ClientThread extends TestThread
-    {
-        private test.Util.Application _server;
-
-        ClientThread(test.Util.Application c, test.Util.Application s)
-        {
-            super(c);
-            _server = s;
-            setName("ClientThread");
-        }
-
-        public void run()
-        {
-            String[] args =
-            {
-                "--Ice.NullHandleAbort=1", "--Ice.Warn.Connections=1"
-            };
-            
-            args = setupAddress(args, _ipv6);
-            
-            if(_ssl)
-            {
-                args = setupssl(args, _clientContext);
-            }
-            _status = _app.main("Client", args);
-            // If the client failed, then stop the server -- the test is over.
-            if(_status != 0 && _server != null)
-            {
-                _server.stop();
-            }
-        }
-    }
-
-    class ServerThread extends TestThread
-    {
-        private test.Util.Application _client;
-        private ClientThread _clientThread;
-
-        ServerThread(test.Util.Application c, test.Util.Application s)
-        {
-            super(s);
-            setName("ServerThread");
-            _client = c;
-        }
-
-        public void run()
-        {
-            String[] args =
-            {
-                "--Ice.NullHandleAbort=1",
-                "--Ice.Warn.Connections=1",
-                "--Ice.ThreadPool.Server.Size=1",
-                "--Ice.ThreadPool.Server.SizeMax=3",
-                "--Ice.ThreadPool.Server.SizeWarn=0"
-            };
-            
-            args = setupAddress(args, _ipv6);
-            
-            if(_ssl)
-            {
-                args = setupssl(args, _serverContext);
-            }
-            _app.setServerReadyListener(new test.Util.Application.ServerReadyListener()
-            {
-                public void serverReady()
-                {
-                    if(_client != null)
-                    {
-                        _clientThread = new ClientThread(_client, _app);
-                        _clientThread.start();
-                    }
-                }
-            });
-
-            _status = _app.main("Server", args);
-            if(_clientThread != null)
-            {
-                while(_clientThread.isAlive())
-                {
-                    try
-                    {
-                        _clientThread.join();
-                    }
-                    catch(InterruptedException e1)
-                    {
-                    }
-                }
-                if(_clientThread.getStatus() != 0)
-                {
-                    _status = _clientThread.getStatus();
-                }
-            }
-        }
-    }
-
-    class CollocatedThread extends TestThread
-    {
-        CollocatedThread(test.Util.Application c)
-        {
-            super(c);
-            setName("CollocatedThread");
-        }
-
-        public void run()
-        {
-            String[] args =
-            {
-                "--Ice.NullHandleAbort=1"
-            };
-            
-            args = setupAddress(args, _ipv6);
-            
-            if(_ssl)
-            {
-                args = setupssl(args, _clientContext);
-            }
-            _status = _app.main("Collocated", args);
-        }
-    }
-
-    class TestRunner extends Thread
-    {
-        private List<TestThread> _threads;
-
-        TestRunner(List<TestThread> l)
-        {
-            _threads = l;
-        }
-
-        public void run()
-        {
-            for(TestThread t : _threads)
-            {
-                t.start();
-                while(t.isAlive())
-                {
-                    try
-                    {
-                        t.join();
-                    }
-                    catch(InterruptedException e)
-                    {
-                    }
-                }
-                int status = t.getStatus();
-                if(status != 0)
-                {
-                    postOnComplete(status);
-                    return;
-                }
-            }
-            postOnComplete(0);
-        }
-    }
-
-    synchronized private void postOnOutput(final String s)
-    {
-        _strings.add(s);
-        if(_listener != null)
-        {
-            final TestListener l = _listener;
-            _handler.post(new Runnable()
-            {
-                public void run()
-                {
-                    l.onOutput(s);
-                }
-            });
-        }
-    }
-
-    synchronized private void postOnComplete(final int status)
-    {
-        _status = status;
-        _complete = true;
-        if(_listener != null)
-        {
-            final TestListener l = _listener;
-            _handler.post(new Runnable()
-            {
-                public void run()
-                {
-                    l.onComplete(status);
-                }
-            });
-        }
-    }
-    
-    public interface SSLInitializationListener
-    {
-        public void onComplete();
-
-        public void onError();
-
-        public void onWait();
-    }
-
-    // This is called from the SSL initialization thread.
-    synchronized private void sslContextInitialized(SSLContext clientContext, SSLContext serverContext)
-    {
-        _clientContext = clientContext;
-        _serverContext = serverContext;
-        _sslInitialized = true;
-
-        if(_ssllistener != null)
-        {
-            final SSLInitializationListener listener = _ssllistener;
-            if(_clientContext == null | _serverContext == null)
-            {
-                _handler.post(new Runnable()
-                {
-                    public void run()
-                    {
-                        listener.onError();
-                    }
-                });
-            }
-            else
-            {
-                _handler.post(new Runnable()
-                {
-                    public void run()
-                    {
-                        listener.onComplete();
-                    }
-                });
-            }
-        }
-    }
-
-    @Override
-    public void onCreate()
-    {
-        _handler = new Handler();
-
-        if(VERSION.SDK_INT == 8) // android.os.Build.VERSION_CODES.FROYO (8)
-        {
-            //
-            // Workaround for a bug in Android 2.2 (Froyo).
-            //
-            // See http://code.google.com/p/android/issues/detail?id=9431
-            //
-            java.lang.System.setProperty("java.net.preferIPv4Stack", "true");
-            java.lang.System.setProperty("java.net.preferIPv6Addresses", "false");
-        }
-
-        //
-        // The SSLEngine class only works properly in Froyo (or later).
-        //
-        _sslSupported = VERSION.SDK_INT >= 8;
-    }
-
-    @Override
-    public void onTerminate()
-    {
-    }
-
-    public List<String> getTestNames()
-    {
-        List<String> s = new ArrayList<String>();
-        for(TestSuiteEntry t : _curtests)
-        {
-            s.add(t.getName());
-        }
-        return s;
-    }
-
-    synchronized public void setTestListener(TestListener listener)
-    {
-        _listener = listener;
-        if(_listener != null && _currentTest != -1)
-        {
-            _listener.onStartTest(_curtests[_currentTest].getName());
-            for(String s : _strings)
-            {
-                _listener.onOutput(s);
-            }
-            if(_complete)
-            {
-                _listener.onComplete(_status);
-            }
-        }
-    }
-
-    public void startNextTest()
-    {
-        assert _complete;
-        startTest((_currentTest + 1) % _curtests.length);
-    }
-
-    synchronized public void startTest(int position)
-    {
-        assert !_ssl || (_ssl && _sslInitialized);
-
-        PrintWriter pw = new PrintWriter(new MyWriter());
-
-        _currentTest = position;
-        _complete = false;
-        _strings.clear();
-
-        TestSuiteEntry entry = _curtests[position];
-        test.Util.Application client;
-        test.Util.Application server;
-        test.Util.Application collocated;
-
-        if(_listener != null)
-        {
-            _listener.onStartTest(entry.getName());
-        }
-
-        try
-        {
-            client = entry.getClient();
-            server = entry.getServer();
-            collocated = entry.getCollocated();
-        }
-        catch(IllegalAccessException e)
-        {
-            e.printStackTrace(pw);
-            postOnComplete(-1);
-            return;
-        }
-        catch(InstantiationException e)
-        {
-            e.printStackTrace(pw);
-            postOnComplete(-1);
-            return;
-        }
-
-        List<TestThread> l = new ArrayList<TestThread>();
-        if(server != null)
-        {
-            server.setWriter(new MyWriter());
-            // All servers must have a client.
-            assert client != null;
-            client.setWriter(new MyWriter());    
-            l.add(new ServerThread(client, server));
-            if(collocated != null)
-            {
-                collocated.setWriter(new MyWriter());
-                l.add(new CollocatedThread(collocated));
-            }
-        }
-        else
-        {
-            client.setWriter(new MyWriter());
-            l.add(new ClientThread(client, null));
-        }
-        TestRunner r = new TestRunner(l);
-        r.setDaemon(true);
-        r.start();
-    }
-
-    public boolean isSSLSupported()
-    {
-        return _sslSupported;
-    }
-    
-    public void setIPv6(boolean ipv6)
-    {
-        _ipv6 = ipv6;
-    }
-
-    public void setSSL(boolean ssl)
-    {
-        assert(!ssl || (ssl && _sslSupported));
-        _ssl = ssl;
-        if(_ssl)
-        {
-            _curtests = _ssltests;
-        }
-        else
-        {
-            _curtests = _tests;
-        }
-        if(_currentTest > _curtests.length-1)
-        {
-            _currentTest = _curtests.length-1;
-        }
-
-        if(_ssl && !_sslInitialized)
-        {
-            if(_ssllistener != null)
-            {
-                _ssllistener.onWait();
-            }
-            Runnable r = new Runnable()
-            {
-                private SSLContext initializeContext(java.io.InputStream cert)
-                    throws NoSuchAlgorithmException, KeyStoreException, IOException, CertificateException,
-                    FileNotFoundException, UnrecoverableKeyException, KeyManagementException
-                {
-                    SSLContext context = SSLContext.getInstance("TLS");
-                    KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-
-                    KeyStore ks = KeyStore.getInstance("BKS");
-                    char[] passphrase = "password".toCharArray();
-                    ks.load(cert, passphrase);
-                    kmf.init(ks, passphrase);
-
-                    TrustManagerFactory tmf =
-                        TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-                    tmf.init(ks);
-
-                    context.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
-                    return context;
-                }
-
-                public void run()
-                {
-                    SSLContext clientContext = null;
-                    SSLContext serverContext = null;
-                    try
-                    {
-                        clientContext = initializeContext(getResources().openRawResource(R.raw.client));
-                        serverContext = initializeContext(getResources().openRawResource(R.raw.server));
-                    }
-                    catch(Exception ex)
-                    {
-                        ex.printStackTrace();
-                    }
-                    sslContextInitialized(clientContext, serverContext);
-                }
-            };
-
-            Thread t = new Thread(r);
-            t.setName("Initialize SSL Thread");
-            t.setDaemon(true);
-            t.start();
-        }
-    }
-
-    synchronized public void setSSLInitializationListener(SSLInitializationListener listener)
-    {
-        _ssllistener = listener;
-        if(_ssl)
-        {
-            if(!_sslInitialized)
-            {
-                listener.onWait();
-            }
-            else if(_clientContext == null || _serverContext == null)
-            {
-                listener.onError();
-            }
-            else
-            {
-                listener.onComplete();
-            }
-        }
-    }
-}
diff --git a/java/test/android/src/com/zeroc/testsuite/TestContainer.java b/java/test/android/src/com/zeroc/testsuite/TestContainer.java
deleted file mode 100644
index 0c9dacbaf69..00000000000
--- a/java/test/android/src/com/zeroc/testsuite/TestContainer.java
+++ /dev/null
@@ -1,113 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package com.zeroc.testsuite;
-
-import java.util.LinkedList;
-
-import android.app.ListActivity;
-import android.os.Bundle;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-
-public class TestContainer extends ListActivity implements TestApp.TestListener
-{
-    private LinkedList<String> _strings = new LinkedList<String>();
-    private ArrayAdapter<String> _adapter;
-    private boolean _partial = false;
-    private Button _next;
-
-    /** Called when the activity is first created. */
-    @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.container);
-        _adapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, _strings);
-        setListAdapter(_adapter);
-        
-        _next = (Button)findViewById(R.id.next);
-        _next.setOnClickListener(new android.view.View.OnClickListener()
-        {
-            public void onClick(android.view.View v)
-            {
-                TestApp app = (TestApp)getApplication();
-                app.startNextTest();
-            }
-        });
-        _next.setEnabled(false);
-    }
-
-    @Override
-    public void onResume()
-    {
-        super.onResume();
-        TestApp app = (TestApp)getApplication();
-        app.setTestListener(this);
-    }
-
-    @Override
-    public void onStop()
-    {
-        super.onStop();
-        TestApp app = (TestApp)getApplication();
-        app.setTestListener(null);
-    }
-
-    public void onStartTest(String test)
-    {
-        setTitle(test);
-        _partial = false;
-        _strings.clear();
-        _adapter.notifyDataSetChanged();
-        _next.setEnabled(false);
-    }
-    
-    public void onComplete(int status)
-    {
-        _next.setEnabled(true);
-    }
-
-    public void onOutput(String s)
-    {
-        int start = 0;
-        int end = s.length();
-        int pos;
-        do
-        {
-            pos = s.indexOf('\n', start);
-            if(pos != -1)
-            {
-                addData(s.substring(start, pos), false);
-                start = pos+1;
-            }
-        }
-        while(start < end && pos != -1);
-        if(start < end)
-        {
-            addData(s.substring(start, end), true);
-        }
-    }
-    
-    private void addData(String s, boolean partialLine)
-    {
-        if(_partial)
-        {
-            String last = _strings.removeLast();
-            last = last + s;
-            _strings.add(last);
-            _adapter.notifyDataSetChanged();
-        }
-        else
-        {
-            _adapter.add(s);
-        }
-        _partial = partialLine;
-    }
-}
diff --git a/java/test/android/src/com/zeroc/testsuite/TestSuite.java b/java/test/android/src/com/zeroc/testsuite/TestSuite.java
deleted file mode 100644
index 0b0a1178d6f..00000000000
--- a/java/test/android/src/com/zeroc/testsuite/TestSuite.java
+++ /dev/null
@@ -1,143 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package com.zeroc.testsuite;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.ListActivity;
-import android.app.ProgressDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ArrayAdapter;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.ListView;
-import android.widget.CompoundButton.OnCheckedChangeListener;
-
-public class TestSuite extends ListActivity
-{
-    private static final int DIALOG_INITIALIZING = 1;
-    private static final int DIALOG_SSL_FAILED = 2;
-    private List<String> _tests = new ArrayList<String>();
-
-    @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.main);
-
-        final TestApp app = (TestApp)getApplication();
-        _tests.addAll(app.getTestNames());
-        final ArrayAdapter<String> adapter =
-            new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, _tests);
-        setListAdapter(adapter);
-        app.setSSLInitializationListener(new TestApp.SSLInitializationListener()
-        {
-            private boolean dismiss = false;
-
-            public void onComplete()
-            {
-                if(dismiss)
-                {
-                    dismissDialog(DIALOG_INITIALIZING);
-                }
-            }
-
-            public void onError()
-            {
-                if(dismiss)
-                {
-                    dismissDialog(DIALOG_INITIALIZING);
-                }
-                showDialog(DIALOG_SSL_FAILED);
-            }
-
-            public void onWait()
-            {
-                // Show the initializing dialog.
-                dismiss = true;
-                showDialog(DIALOG_INITIALIZING);
-            }
-        });
-        CheckBox secure = (CheckBox)findViewById(R.id.secure);
-        if(app.isSSLSupported())
-        {
-            secure.setOnCheckedChangeListener(new OnCheckedChangeListener()
-            {
-                public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
-                {
-                    app.setSSL(isChecked);
-                    _tests.clear();
-                    _tests.addAll(app.getTestNames());
-                    adapter.notifyDataSetChanged();
-                }
-            });
-        }
-        else
-        {
-            secure.setEnabled(false);
-        }
-        
-        CheckBox ipv6 = (CheckBox)findViewById(R.id.ipv6);
-        ipv6.setOnCheckedChangeListener(new OnCheckedChangeListener()
-        {
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
-            {
-                app.setIPv6(isChecked);
-            }
-        });
-    }
-
-    protected void onListItemClick(ListView l, View v, int position, long id)
-    {
-        TestApp app = (TestApp)getApplication();
-        app.startTest(position);
-        startActivity(new Intent(this, TestContainer.class));
-    }
-
-    @Override
-    protected Dialog onCreateDialog(int id)
-    {
-        switch (id)
-        {
-        case DIALOG_INITIALIZING:
-        {
-            ProgressDialog dialog = new ProgressDialog(this);
-            dialog.setTitle("Initializing");
-            dialog.setMessage("Please wait while initializing SSL...");
-            dialog.setIndeterminate(true);
-            dialog.setCancelable(false);
-            return dialog;
-        }
-
-        case DIALOG_SSL_FAILED:
-        {
-            AlertDialog.Builder builder = new AlertDialog.Builder(this);
-            builder.setTitle("Error");
-            builder.setMessage("SSL Initialization failed");
-            builder.setCancelable(false);
-            builder.setPositiveButton("Ok", new DialogInterface.OnClickListener()
-            {
-                public void onClick(DialogInterface dialog, int whichButton)
-                {
-                    finish();
-                }
-            });
-            return builder.create();
-        }
-        }
-        return null;
-    }
-}
diff --git a/java/test/build.gradle b/java/test/build.gradle
index f306f6c1aa7..366f51f9ed2 100644
--- a/java/test/build.gradle
+++ b/java/test/build.gradle
@@ -7,144 +7,14 @@
 //
 // **********************************************************************
 
-slice {
-    java {
-        set1 {
-            include = ["${sliceDir}"]
-            files = fileTree(dir: ".", includes:['Ice/adapterDeactivation/*.ice',
-                                                 'Ice/ami/*.ice',
-                                                 'Ice/admin/*.ice',
-                                                 'Ice/background/*.ice',
-                                                 'Ice/binding/*.ice',
-                                                 'Ice/classLoader/*.ice',
-                                                 'Ice/custom/*.ice',
-                                                 'Ice/defaultServant/*.ice',
-                                                 'Ice/defaultValue/*.ice',
-                                                 'Ice/dispatcher/*.ice',
-                                                 'Ice/echo/*.ice',
-                                                 'Ice/exceptions/*.ice',
-                                                 'Ice/facets/*.ice',
-                                                 'Ice/faultTolerance/*.ice',
-                                                 'Ice/hash/*.ice',
-                                                 'Ice/hold/*.ice',
-                                                 'Ice/info/*.ice',
-                                                 'Ice/inheritance/*.ice',
-                                                 'Ice/interceptor/*.ice',
-                                                 'Ice/interrupt/*.ice',
-                                                 'Ice/invoke/*.ice',
-                                                 'Ice/location/*.ice',
-                                                 'Ice/metrics/*.ice',
-                                                 'Ice/networkProxy/*.ice',
-                                                 'Ice/proxy/*.ice',
-                                                 'Ice/retry/*.ice',
-                                                 'Ice/seqMapping/*.ice',
-                                                 'Ice/servantLocator/*.ice',
-                                                 'Ice/serialize/*.ice',
-                                                 'Ice/slicing/exceptions/*.ice',
-                                                 'Ice/slicing/objects/*.ice',
-                                                 'Ice/timeout/*.ice',
-                                                 'Ice/acm/*.ice',
-                                                 'Ice/throughput/*.ice',
-                                                 'Ice/threadPoolPriority/*.ice',
-                                                 'Ice/udp/*.ice',
-                                                 'Freeze/complex/*.ice',
-                                                 'Glacier2/router/*.ice',
-                                                 'Glacier2/sessionHelper/*.ice',
-                                                 'IceDiscovery/simple/*.ice',
-                                                 'IceGrid/simple/*.ice',
-                                                 'IceBox/admin/*.ice',
-                                                 'IceBox/configuration/*.ice',
-                                                 'IceSSL/configuration/*.ice',
-                                                 'Slice/keyword/*.ice',
-                                                 'Slice/macros/*.ice',
-                                                 'Slice/structure/*.ice'])
-        }
-        set2 {
-            include = ["${sliceDir}"]
-            args = "--tie"
-            files = fileTree(dir: ".", includes:['Ice/operations/*.ice',
-                                                 'Freeze/evictor/*.ice'])
-        }
-        set3 {
-            include = ["${sliceDir}"]
-            args = "--stream"
-            files = fileTree(dir: ".", includes:['Ice/objects/*.ice',
-                                                 'Ice/optional/*.ice',
-                                                 'Ice/stream/*.ice',
-                                                 'Ice/enums/*.ice'])
-        }
-        set4 {
-            include = ["${sliceDir}"]
-            args = "--checksum test.Ice.checksum.Test.SliceChecksums"
-            files = fileTree(dir: ".", includes:['Ice/checksum/Test.ice',
-                                                 'Ice/checksum/Types.ice'])
-        }
-        set5 {
-            include = ["${sliceDir}", "${projectDir}/Ice/packagemd"]
-            files = fileTree(dir: ".", includes:['Ice/packagemd/*.ice'])
-        }
-        set6 {
-            include = ["${sliceDir}"]
-            args = "--checksum test.Ice.checksum.server.Test.SliceChecksums"
-            files = fileTree(dir: ".", includes:['Ice/checksum/TestServer.ice',
-                                                 'Ice/checksum/TypesServer.ice'])
-        }
-    }
-    freezej {
-        files = [file("Freeze/complex/Complex.ice"),
-                 file("${sliceDir}/Ice/Identity.ice")]
-        include = ["${sliceDir}"]
-        args = "--ice"
-        dict {
-            ComplexDict {
-                javaType = "test.Freeze.complex.Complex.ComplexDict"
-                key = "Complex::Key"
-                value = "Complex::Node"
-            }
-        }
-        dict {
-            ByteIntMap {
-                javaType = "test.Freeze.dbmap.ByteIntMap"
-                key = "byte"
-                value = "int"
-                index = [[:]]
-            }
-        }
-        dict {
-            IntIdentityMap {
-                javaType = "test.Freeze.dbmap.IntIdentityMap"
-                key = "int"
-                value = "Ice::Identity"
-            }
-        }
-        dict {
-            IntIdentityMapWithIndex {
-                javaType = "test.Freeze.dbmap.IntIdentityMapWithIndex"
-                key = "int"
-                value = "Ice::Identity"
-                index = [[ member: 'category']]
-            }
-        }
-        dict {
-            SortedMap {
-                javaType = "test.Freeze.dbmap.SortedMap"
-                key = "int"
-                value = "Ice::Identity"
-                index = [[ member: 'category']]
-            }
-        }
-    }
-}
+ext.testDir = "${projectDir}/src/main/java/test"
+apply from: "slice.gradle"
 
 def hasLambda = org.gradle.internal.jvm.Jvm.current().getJavaVersion().toString().toFloat() >= 1.8f
 
 sourceSets {
     main {
         java {
-            srcDir '.'
-            exclude 'Ice/translator'
-            exclude 'Slice/generation'
-            exclude 'android'
             if (!hasLambda) {
                 exclude '**/lambda'
             }
@@ -160,13 +30,13 @@ idea.module {
 
 if (distJarDir == null) {
     dependencies {
-        compile project(':src/Ice')
-        compile project(':src/Freeze')
-        compile project(':src/IceDiscovery')
-        compile project(':src/IceBox')
-        compile project(':src/Glacier2')
-        compile project(':src/IceStorm')
-        compile project(':src/IceGrid')
+        compile project(':Ice')
+        compile project(':Freeze')
+        compile project(':IceDiscovery')
+        compile project(':IceBox')
+        compile project(':Glacier2')
+        compile project(':IceStorm')
+        compile project(':IceGrid')
     }
 } else {
     println "Using Ice jars installed in ${distJarDir}"
diff --git a/java/test/slice.gradle b/java/test/slice.gradle
new file mode 100644
index 00000000000..d743521c36f
--- /dev/null
+++ b/java/test/slice.gradle
@@ -0,0 +1,139 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+task testSliceTask {
+    slice {
+        java {
+            set1 {
+                include = ["${sliceDir}"]
+                files = fileTree(dir: testDir, includes:['Ice/adapterDeactivation/*.ice',
+                                                     'Ice/ami/*.ice',
+                                                     'Ice/admin/*.ice',
+                                                     'Ice/background/*.ice',
+                                                     'Ice/binding/*.ice',
+                                                     'Ice/classLoader/*.ice',
+                                                     'Ice/custom/*.ice',
+                                                     'Ice/defaultServant/*.ice',
+                                                     'Ice/defaultValue/*.ice',
+                                                     'Ice/dispatcher/*.ice',
+                                                     'Ice/echo/*.ice',
+                                                     'Ice/exceptions/*.ice',
+                                                     'Ice/facets/*.ice',
+                                                     'Ice/faultTolerance/*.ice',
+                                                     'Ice/hash/*.ice',
+                                                     'Ice/hold/*.ice',
+                                                     'Ice/info/*.ice',
+                                                     'Ice/inheritance/*.ice',
+                                                     'Ice/interceptor/*.ice',
+                                                     'Ice/interrupt/*.ice',
+                                                     'Ice/invoke/*.ice',
+                                                     'Ice/location/*.ice',
+                                                     'Ice/metrics/*.ice',
+                                                     'Ice/networkProxy/*.ice',
+                                                     'Ice/proxy/*.ice',
+                                                     'Ice/retry/*.ice',
+                                                     'Ice/seqMapping/*.ice',
+                                                     'Ice/servantLocator/*.ice',
+                                                     'Ice/serialize/*.ice',
+                                                     'Ice/slicing/exceptions/*.ice',
+                                                     'Ice/slicing/objects/*.ice',
+                                                     'Ice/timeout/*.ice',
+                                                     'Ice/acm/*.ice',
+                                                     'Ice/throughput/*.ice',
+                                                     'Ice/threadPoolPriority/*.ice',
+                                                     'Ice/udp/*.ice',
+                                                     'Freeze/complex/*.ice',
+                                                     'Glacier2/router/*.ice',
+                                                     'Glacier2/sessionHelper/*.ice',
+                                                     'IceDiscovery/simple/*.ice',
+                                                     'IceGrid/simple/*.ice',
+                                                     'IceBox/admin/*.ice',
+                                                     'IceBox/configuration/*.ice',
+                                                     'IceSSL/configuration/*.ice',
+                                                     'Slice/keyword/*.ice',
+                                                     'Slice/macros/*.ice',
+                                                     'Slice/structure/*.ice'])
+            }
+            set2 {
+                include = ["${sliceDir}"]
+                args = "--tie"
+                files = fileTree(dir: testDir, includes:['Ice/operations/*.ice',
+                                                     'Freeze/evictor/*.ice'])
+            }
+            set3 {
+                include = ["${sliceDir}"]
+                args = "--stream"
+                files = fileTree(dir: testDir, includes:['Ice/objects/*.ice',
+                                                     'Ice/optional/*.ice',
+                                                     'Ice/stream/*.ice',
+                                                     'Ice/enums/*.ice'])
+            }
+            set4 {
+                include = ["${sliceDir}"]
+                args = "--checksum test.Ice.checksum.Test.SliceChecksums"
+                files = fileTree(dir: testDir, includes:['Ice/checksum/Test.ice',
+                                                     'Ice/checksum/Types.ice'])
+            }
+            set5 {
+                include = ["${sliceDir}", "${testDir}/Ice/packagemd"]
+                files = fileTree(dir: testDir, includes:['Ice/packagemd/*.ice'])
+            }
+            set6 {
+                include = ["${sliceDir}"]
+                args = "--checksum test.Ice.checksum.server.Test.SliceChecksums"
+                files = fileTree(dir: testDir, includes:['Ice/checksum/TestServer.ice',
+                                                     'Ice/checksum/TypesServer.ice'])
+            }
+        }
+        freezej {
+            files = [file("${testDir}/Freeze/complex/Complex.ice"),
+                     file("${sliceDir}/Ice/Identity.ice")]
+            include = ["${sliceDir}"]
+            args = "--ice"
+            dict {
+                ComplexDict {
+                    javaType = "test.Freeze.complex.Complex.ComplexDict"
+                    key = "Complex::Key"
+                    value = "Complex::Node"
+                }
+            }
+            dict {
+                ByteIntMap {
+                    javaType = "test.Freeze.dbmap.ByteIntMap"
+                    key = "byte"
+                    value = "int"
+                    index = [[:]]
+                }
+            }
+            dict {
+                IntIdentityMap {
+                    javaType = "test.Freeze.dbmap.IntIdentityMap"
+                    key = "int"
+                    value = "Ice::Identity"
+                }
+            }
+            dict {
+                IntIdentityMapWithIndex {
+                    javaType = "test.Freeze.dbmap.IntIdentityMapWithIndex"
+                    key = "int"
+                    value = "Ice::Identity"
+                    index = [[ member: 'category']]
+                }
+            }
+            dict {
+                SortedMap {
+                    javaType = "test.Freeze.dbmap.SortedMap"
+                    key = "int"
+                    value = "Ice::Identity"
+                    index = [[ member: 'category']]
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/java/test/Freeze/complex/.gitignore b/java/test/src/main/java/test/Freeze/complex/.gitignore
index ca51e824975..ca51e824975 100644
--- a/java/test/Freeze/complex/.gitignore
+++ b/java/test/src/main/java/test/Freeze/complex/.gitignore
diff --git a/java/test/Freeze/complex/Client.java b/java/test/src/main/java/test/Freeze/complex/Client.java
index e98b4ebb6fb..e98b4ebb6fb 100644
--- a/java/test/Freeze/complex/Client.java
+++ b/java/test/src/main/java/test/Freeze/complex/Client.java
diff --git a/java/test/Freeze/complex/Complex.ice b/java/test/src/main/java/test/Freeze/complex/Complex.ice
index 1953e7e3caa..1953e7e3caa 100644
--- a/java/test/Freeze/complex/Complex.ice
+++ b/java/test/src/main/java/test/Freeze/complex/Complex.ice
diff --git a/java/test/Freeze/complex/Complex/AddNodeI.java b/java/test/src/main/java/test/Freeze/complex/Complex/AddNodeI.java
index d380923382a..d380923382a 100644
--- a/java/test/Freeze/complex/Complex/AddNodeI.java
+++ b/java/test/src/main/java/test/Freeze/complex/Complex/AddNodeI.java
diff --git a/java/test/Freeze/complex/Complex/MultiplyNodeI.java b/java/test/src/main/java/test/Freeze/complex/Complex/MultiplyNodeI.java
index 67dab5d7b71..67dab5d7b71 100644
--- a/java/test/Freeze/complex/Complex/MultiplyNodeI.java
+++ b/java/test/src/main/java/test/Freeze/complex/Complex/MultiplyNodeI.java
diff --git a/java/test/Freeze/complex/Complex/NumberNodeI.java b/java/test/src/main/java/test/Freeze/complex/Complex/NumberNodeI.java
index 308f59b6170..308f59b6170 100644
--- a/java/test/Freeze/complex/Complex/NumberNodeI.java
+++ b/java/test/src/main/java/test/Freeze/complex/Complex/NumberNodeI.java
diff --git a/java/test/Freeze/complex/Complex/ObjectFactoryI.java b/java/test/src/main/java/test/Freeze/complex/Complex/ObjectFactoryI.java
index 66c92bfbf7b..66c92bfbf7b 100644
--- a/java/test/Freeze/complex/Complex/ObjectFactoryI.java
+++ b/java/test/src/main/java/test/Freeze/complex/Complex/ObjectFactoryI.java
diff --git a/java/test/Freeze/complex/ParseError.java b/java/test/src/main/java/test/Freeze/complex/ParseError.java
index 05b510c7093..05b510c7093 100644
--- a/java/test/Freeze/complex/ParseError.java
+++ b/java/test/src/main/java/test/Freeze/complex/ParseError.java
diff --git a/java/test/Freeze/complex/Parser.java b/java/test/src/main/java/test/Freeze/complex/Parser.java
index 87edceea504..87edceea504 100644
--- a/java/test/Freeze/complex/Parser.java
+++ b/java/test/src/main/java/test/Freeze/complex/Parser.java
diff --git a/java/test/src/main/java/test/Freeze/complex/db/.gitignore b/java/test/src/main/java/test/Freeze/complex/db/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/java/test/src/main/java/test/Freeze/complex/db/.gitignore
diff --git a/java/test/Freeze/complex/run.py b/java/test/src/main/java/test/Freeze/complex/run.py
index 1b63b3c6e0d..1fdd637162c 100755
--- a/java/test/Freeze/complex/run.py
+++ b/java/test/src/main/java/test/Freeze/complex/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+	 "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Freeze/dbmap/.gitignore b/java/test/src/main/java/test/Freeze/dbmap/.gitignore
index 9c39416c539..9c39416c539 100644
--- a/java/test/Freeze/dbmap/.gitignore
+++ b/java/test/src/main/java/test/Freeze/dbmap/.gitignore
diff --git a/java/test/Freeze/dbmap/Client.java b/java/test/src/main/java/test/Freeze/dbmap/Client.java
index fe6c9a06680..fe6c9a06680 100644
--- a/java/test/Freeze/dbmap/Client.java
+++ b/java/test/src/main/java/test/Freeze/dbmap/Client.java
diff --git a/java/test/src/main/java/test/Freeze/dbmap/db/.gitignore b/java/test/src/main/java/test/Freeze/dbmap/db/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/java/test/src/main/java/test/Freeze/dbmap/db/.gitignore
diff --git a/java/test/Freeze/dbmap/run.py b/java/test/src/main/java/test/Freeze/dbmap/run.py
index 3f6f310a18e..d2ed1ebbb13 100755
--- a/java/test/Freeze/dbmap/run.py
+++ b/java/test/src/main/java/test/Freeze/dbmap/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Freeze/evictor/.gitignore b/java/test/src/main/java/test/Freeze/evictor/.gitignore
index 9c39416c539..9c39416c539 100644
--- a/java/test/Freeze/evictor/.gitignore
+++ b/java/test/src/main/java/test/Freeze/evictor/.gitignore
diff --git a/java/test/Freeze/evictor/AccountI.java b/java/test/src/main/java/test/Freeze/evictor/AccountI.java
index 55e754e2553..55e754e2553 100644
--- a/java/test/Freeze/evictor/AccountI.java
+++ b/java/test/src/main/java/test/Freeze/evictor/AccountI.java
diff --git a/java/test/Freeze/evictor/Client.java b/java/test/src/main/java/test/Freeze/evictor/Client.java
index a5e649fdf48..a5e649fdf48 100644
--- a/java/test/Freeze/evictor/Client.java
+++ b/java/test/src/main/java/test/Freeze/evictor/Client.java
diff --git a/java/test/Freeze/evictor/FacetI.java b/java/test/src/main/java/test/Freeze/evictor/FacetI.java
index 46017f4d52a..46017f4d52a 100644
--- a/java/test/Freeze/evictor/FacetI.java
+++ b/java/test/src/main/java/test/Freeze/evictor/FacetI.java
diff --git a/java/test/Freeze/evictor/RemoteEvictorFactoryI.java b/java/test/src/main/java/test/Freeze/evictor/RemoteEvictorFactoryI.java
index dcec049d6af..dcec049d6af 100644
--- a/java/test/Freeze/evictor/RemoteEvictorFactoryI.java
+++ b/java/test/src/main/java/test/Freeze/evictor/RemoteEvictorFactoryI.java
diff --git a/java/test/Freeze/evictor/RemoteEvictorI.java b/java/test/src/main/java/test/Freeze/evictor/RemoteEvictorI.java
index d3667113863..d3667113863 100644
--- a/java/test/Freeze/evictor/RemoteEvictorI.java
+++ b/java/test/src/main/java/test/Freeze/evictor/RemoteEvictorI.java
diff --git a/java/test/Freeze/evictor/ServantI.java b/java/test/src/main/java/test/Freeze/evictor/ServantI.java
index cff361d94e2..cff361d94e2 100644
--- a/java/test/Freeze/evictor/ServantI.java
+++ b/java/test/src/main/java/test/Freeze/evictor/ServantI.java
diff --git a/java/test/Freeze/evictor/Server.java b/java/test/src/main/java/test/Freeze/evictor/Server.java
index e457fdf619e..e457fdf619e 100644
--- a/java/test/Freeze/evictor/Server.java
+++ b/java/test/src/main/java/test/Freeze/evictor/Server.java
diff --git a/java/test/Freeze/evictor/Test.ice b/java/test/src/main/java/test/Freeze/evictor/Test.ice
index c31effe8451..c31effe8451 100644
--- a/java/test/Freeze/evictor/Test.ice
+++ b/java/test/src/main/java/test/Freeze/evictor/Test.ice
diff --git a/java/test/Freeze/evictor/config b/java/test/src/main/java/test/Freeze/evictor/config
index 3fb2a18d86a..3fb2a18d86a 100644
--- a/java/test/Freeze/evictor/config
+++ b/java/test/src/main/java/test/Freeze/evictor/config
diff --git a/java/test/src/main/java/test/Freeze/evictor/db/.gitignore b/java/test/src/main/java/test/Freeze/evictor/db/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/java/test/src/main/java/test/Freeze/evictor/db/.gitignore
diff --git a/java/test/Freeze/evictor/run.py b/java/test/src/main/java/test/Freeze/evictor/run.py
index e88a97b8412..ee33a5ae7ea 100755
--- a/java/test/Freeze/evictor/run.py
+++ b/java/test/src/main/java/test/Freeze/evictor/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Freeze/fileLock/.gitignore b/java/test/src/main/java/test/Freeze/fileLock/.gitignore
index 9c39416c539..9c39416c539 100644
--- a/java/test/Freeze/fileLock/.gitignore
+++ b/java/test/src/main/java/test/Freeze/fileLock/.gitignore
diff --git a/java/test/Freeze/fileLock/Client.java b/java/test/src/main/java/test/Freeze/fileLock/Client.java
index 8b8fd8c13a2..8b8fd8c13a2 100644
--- a/java/test/Freeze/fileLock/Client.java
+++ b/java/test/src/main/java/test/Freeze/fileLock/Client.java
diff --git a/java/test/Freeze/fileLock/ClientFail.java b/java/test/src/main/java/test/Freeze/fileLock/ClientFail.java
index 2c589a90eb1..2c589a90eb1 100644
--- a/java/test/Freeze/fileLock/ClientFail.java
+++ b/java/test/src/main/java/test/Freeze/fileLock/ClientFail.java
diff --git a/java/test/src/main/java/test/Freeze/fileLock/db/.gitignore b/java/test/src/main/java/test/Freeze/fileLock/db/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/java/test/src/main/java/test/Freeze/fileLock/db/.gitignore
diff --git a/java/test/Freeze/fileLock/run.py b/java/test/src/main/java/test/Freeze/fileLock/run.py
index 54fd6966dae..8f7217a04e9 100755
--- a/java/test/Freeze/fileLock/run.py
+++ b/java/test/src/main/java/test/Freeze/fileLock/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Glacier2/router/Callback.ice b/java/test/src/main/java/test/Glacier2/router/Callback.ice
index 68a40cb866c..68a40cb866c 100644
--- a/java/test/Glacier2/router/Callback.ice
+++ b/java/test/src/main/java/test/Glacier2/router/Callback.ice
diff --git a/java/test/Glacier2/router/CallbackI.java b/java/test/src/main/java/test/Glacier2/router/CallbackI.java
index e9290aa6b3e..e9290aa6b3e 100644
--- a/java/test/Glacier2/router/CallbackI.java
+++ b/java/test/src/main/java/test/Glacier2/router/CallbackI.java
diff --git a/java/test/Glacier2/router/CallbackReceiverI.java b/java/test/src/main/java/test/Glacier2/router/CallbackReceiverI.java
index ecf7e1d62b2..ecf7e1d62b2 100644
--- a/java/test/Glacier2/router/CallbackReceiverI.java
+++ b/java/test/src/main/java/test/Glacier2/router/CallbackReceiverI.java
diff --git a/java/test/Glacier2/router/Client.java b/java/test/src/main/java/test/Glacier2/router/Client.java
index 257e81c12cd..257e81c12cd 100644
--- a/java/test/Glacier2/router/Client.java
+++ b/java/test/src/main/java/test/Glacier2/router/Client.java
diff --git a/java/test/Glacier2/router/Server.java b/java/test/src/main/java/test/Glacier2/router/Server.java
index 78ad7b573ce..78ad7b573ce 100644
--- a/java/test/Glacier2/router/Server.java
+++ b/java/test/src/main/java/test/Glacier2/router/Server.java
diff --git a/java/test/Glacier2/router/passwords b/java/test/src/main/java/test/Glacier2/router/passwords
index a1527dec2b9..a1527dec2b9 100644
--- a/java/test/Glacier2/router/passwords
+++ b/java/test/src/main/java/test/Glacier2/router/passwords
diff --git a/java/test/Glacier2/router/run.py b/java/test/src/main/java/test/Glacier2/router/run.py
index 68f88d7ef33..0fe99c10f25 100755
--- a/java/test/Glacier2/router/run.py
+++ b/java/test/src/main/java/test/Glacier2/router/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Glacier2/sessionHelper/Callback.ice b/java/test/src/main/java/test/Glacier2/sessionHelper/Callback.ice
index cd37cdb95df..cd37cdb95df 100644
--- a/java/test/Glacier2/sessionHelper/Callback.ice
+++ b/java/test/src/main/java/test/Glacier2/sessionHelper/Callback.ice
diff --git a/java/test/Glacier2/sessionHelper/CallbackI.java b/java/test/src/main/java/test/Glacier2/sessionHelper/CallbackI.java
index 2cfacf26f5d..2cfacf26f5d 100644
--- a/java/test/Glacier2/sessionHelper/CallbackI.java
+++ b/java/test/src/main/java/test/Glacier2/sessionHelper/CallbackI.java
diff --git a/java/test/Glacier2/sessionHelper/Client.java b/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java
index f61f84d0051..f61f84d0051 100644
--- a/java/test/Glacier2/sessionHelper/Client.java
+++ b/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java
diff --git a/java/test/Glacier2/sessionHelper/Server.java b/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java
index d0cfd717a14..d0cfd717a14 100644
--- a/java/test/Glacier2/sessionHelper/Server.java
+++ b/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java
diff --git a/java/test/Glacier2/sessionHelper/passwords b/java/test/src/main/java/test/Glacier2/sessionHelper/passwords
index a1527dec2b9..a1527dec2b9 100644
--- a/java/test/Glacier2/sessionHelper/passwords
+++ b/java/test/src/main/java/test/Glacier2/sessionHelper/passwords
diff --git a/java/test/Glacier2/sessionHelper/run.py b/java/test/src/main/java/test/Glacier2/sessionHelper/run.py
index f6e9c94d370..ddb8006f352 100755
--- a/java/test/Glacier2/sessionHelper/run.py
+++ b/java/test/src/main/java/test/Glacier2/sessionHelper/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/acm/AllTests.java b/java/test/src/main/java/test/Ice/acm/AllTests.java
index a700cdb26b6..a700cdb26b6 100644
--- a/java/test/Ice/acm/AllTests.java
+++ b/java/test/src/main/java/test/Ice/acm/AllTests.java
diff --git a/java/test/Ice/acm/Client.java b/java/test/src/main/java/test/Ice/acm/Client.java
index c6045f9a6ca..c6045f9a6ca 100644
--- a/java/test/Ice/acm/Client.java
+++ b/java/test/src/main/java/test/Ice/acm/Client.java
diff --git a/java/test/Ice/acm/RemoteCommunicatorI.java b/java/test/src/main/java/test/Ice/acm/RemoteCommunicatorI.java
index 38cb0fc0384..38cb0fc0384 100644
--- a/java/test/Ice/acm/RemoteCommunicatorI.java
+++ b/java/test/src/main/java/test/Ice/acm/RemoteCommunicatorI.java
diff --git a/java/test/Ice/acm/RemoteObjectAdapterI.java b/java/test/src/main/java/test/Ice/acm/RemoteObjectAdapterI.java
index f216f0fee69..f216f0fee69 100644
--- a/java/test/Ice/acm/RemoteObjectAdapterI.java
+++ b/java/test/src/main/java/test/Ice/acm/RemoteObjectAdapterI.java
diff --git a/java/test/Ice/acm/Server.java b/java/test/src/main/java/test/Ice/acm/Server.java
index e267b9fa498..e267b9fa498 100644
--- a/java/test/Ice/acm/Server.java
+++ b/java/test/src/main/java/test/Ice/acm/Server.java
diff --git a/java/test/Ice/acm/Test.ice b/java/test/src/main/java/test/Ice/acm/Test.ice
index 7a2085083e4..7a2085083e4 100644
--- a/java/test/Ice/acm/Test.ice
+++ b/java/test/src/main/java/test/Ice/acm/Test.ice
diff --git a/java/test/Ice/acm/TestI.java b/java/test/src/main/java/test/Ice/acm/TestI.java
index be2e3a4a58e..be2e3a4a58e 100644
--- a/java/test/Ice/acm/TestI.java
+++ b/java/test/src/main/java/test/Ice/acm/TestI.java
diff --git a/java/test/Ice/acm/run.py b/java/test/src/main/java/test/Ice/acm/run.py
index 519f05d7278..408be7e3127 100755
--- a/java/test/Ice/acm/run.py
+++ b/java/test/src/main/java/test/Ice/acm/run.py
@@ -10,7 +10,8 @@
 
 import os, sys, getopt
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/adapterDeactivation/AllTests.java b/java/test/src/main/java/test/Ice/adapterDeactivation/AllTests.java
index 05cbc8f3d59..05cbc8f3d59 100644
--- a/java/test/Ice/adapterDeactivation/AllTests.java
+++ b/java/test/src/main/java/test/Ice/adapterDeactivation/AllTests.java
diff --git a/java/test/Ice/adapterDeactivation/Client.java b/java/test/src/main/java/test/Ice/adapterDeactivation/Client.java
index d5e66de93b6..d5e66de93b6 100644
--- a/java/test/Ice/adapterDeactivation/Client.java
+++ b/java/test/src/main/java/test/Ice/adapterDeactivation/Client.java
diff --git a/java/test/Ice/adapterDeactivation/Collocated.java b/java/test/src/main/java/test/Ice/adapterDeactivation/Collocated.java
index 2ddd551b6ac..2ddd551b6ac 100644
--- a/java/test/Ice/adapterDeactivation/Collocated.java
+++ b/java/test/src/main/java/test/Ice/adapterDeactivation/Collocated.java
diff --git a/java/test/Ice/adapterDeactivation/CookieI.java b/java/test/src/main/java/test/Ice/adapterDeactivation/CookieI.java
index 2d5d990508b..2d5d990508b 100644
--- a/java/test/Ice/adapterDeactivation/CookieI.java
+++ b/java/test/src/main/java/test/Ice/adapterDeactivation/CookieI.java
diff --git a/java/test/Ice/adapterDeactivation/ServantLocatorI.java b/java/test/src/main/java/test/Ice/adapterDeactivation/ServantLocatorI.java
index 1856f6bddcd..1856f6bddcd 100644
--- a/java/test/Ice/adapterDeactivation/ServantLocatorI.java
+++ b/java/test/src/main/java/test/Ice/adapterDeactivation/ServantLocatorI.java
diff --git a/java/test/Ice/adapterDeactivation/Server.java b/java/test/src/main/java/test/Ice/adapterDeactivation/Server.java
index 56d9ccd5c6b..56d9ccd5c6b 100644
--- a/java/test/Ice/adapterDeactivation/Server.java
+++ b/java/test/src/main/java/test/Ice/adapterDeactivation/Server.java
diff --git a/java/test/Ice/adapterDeactivation/Test.ice b/java/test/src/main/java/test/Ice/adapterDeactivation/Test.ice
index 7b1bd988078..7b1bd988078 100644
--- a/java/test/Ice/adapterDeactivation/Test.ice
+++ b/java/test/src/main/java/test/Ice/adapterDeactivation/Test.ice
diff --git a/java/test/Ice/adapterDeactivation/TestI.java b/java/test/src/main/java/test/Ice/adapterDeactivation/TestI.java
index 38ce346f3de..38ce346f3de 100644
--- a/java/test/Ice/adapterDeactivation/TestI.java
+++ b/java/test/src/main/java/test/Ice/adapterDeactivation/TestI.java
diff --git a/java/test/Ice/adapterDeactivation/run.py b/java/test/src/main/java/test/Ice/adapterDeactivation/run.py
index 44aa7d73d00..8bb456187d9 100755
--- a/java/test/Ice/adapterDeactivation/run.py
+++ b/java/test/src/main/java/test/Ice/adapterDeactivation/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/admin/AllTests.java b/java/test/src/main/java/test/Ice/admin/AllTests.java
index abc85ce0b86..abc85ce0b86 100644
--- a/java/test/Ice/admin/AllTests.java
+++ b/java/test/src/main/java/test/Ice/admin/AllTests.java
diff --git a/java/test/Ice/admin/Client.java b/java/test/src/main/java/test/Ice/admin/Client.java
index bdd21e20559..bdd21e20559 100644
--- a/java/test/Ice/admin/Client.java
+++ b/java/test/src/main/java/test/Ice/admin/Client.java
diff --git a/java/test/Ice/admin/RemoteCommunicatorFactoryI.java b/java/test/src/main/java/test/Ice/admin/RemoteCommunicatorFactoryI.java
index 3100081f816..3100081f816 100644
--- a/java/test/Ice/admin/RemoteCommunicatorFactoryI.java
+++ b/java/test/src/main/java/test/Ice/admin/RemoteCommunicatorFactoryI.java
diff --git a/java/test/Ice/admin/RemoteCommunicatorI.java b/java/test/src/main/java/test/Ice/admin/RemoteCommunicatorI.java
index a4137dd3d9d..a4137dd3d9d 100644
--- a/java/test/Ice/admin/RemoteCommunicatorI.java
+++ b/java/test/src/main/java/test/Ice/admin/RemoteCommunicatorI.java
diff --git a/java/test/Ice/admin/RemoteLoggerI.java b/java/test/src/main/java/test/Ice/admin/RemoteLoggerI.java
index 8a5a2a8e06e..8a5a2a8e06e 100644
--- a/java/test/Ice/admin/RemoteLoggerI.java
+++ b/java/test/src/main/java/test/Ice/admin/RemoteLoggerI.java
diff --git a/java/test/Ice/admin/Server.java b/java/test/src/main/java/test/Ice/admin/Server.java
index a29e6a6d5a2..a29e6a6d5a2 100644
--- a/java/test/Ice/admin/Server.java
+++ b/java/test/src/main/java/test/Ice/admin/Server.java
diff --git a/java/test/Ice/admin/Test.ice b/java/test/src/main/java/test/Ice/admin/Test.ice
index 608e6068a9b..608e6068a9b 100644
--- a/java/test/Ice/admin/Test.ice
+++ b/java/test/src/main/java/test/Ice/admin/Test.ice
diff --git a/java/test/Ice/admin/TestFacetI.java b/java/test/src/main/java/test/Ice/admin/TestFacetI.java
index a1246dd8ff0..a1246dd8ff0 100644
--- a/java/test/Ice/admin/TestFacetI.java
+++ b/java/test/src/main/java/test/Ice/admin/TestFacetI.java
diff --git a/java/test/Ice/admin/run.py b/java/test/src/main/java/test/Ice/admin/run.py
index 33fc2e8f3ac..d5fe04787c9 100755
--- a/java/test/Ice/admin/run.py
+++ b/java/test/src/main/java/test/Ice/admin/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/ami/AMI.java b/java/test/src/main/java/test/Ice/ami/AMI.java
index 94c9b751401..94c9b751401 100644
--- a/java/test/Ice/ami/AMI.java
+++ b/java/test/src/main/java/test/Ice/ami/AMI.java
diff --git a/java/test/Ice/ami/AllTests.java b/java/test/src/main/java/test/Ice/ami/AllTests.java
index cfb6be791c3..cfb6be791c3 100644
--- a/java/test/Ice/ami/AllTests.java
+++ b/java/test/src/main/java/test/Ice/ami/AllTests.java
diff --git a/java/test/Ice/ami/Client.java b/java/test/src/main/java/test/Ice/ami/Client.java
index 3e547a17ec0..3e547a17ec0 100644
--- a/java/test/Ice/ami/Client.java
+++ b/java/test/src/main/java/test/Ice/ami/Client.java
diff --git a/java/test/Ice/ami/Collocated.java b/java/test/src/main/java/test/Ice/ami/Collocated.java
index 2c77bbd3833..2c77bbd3833 100644
--- a/java/test/Ice/ami/Collocated.java
+++ b/java/test/src/main/java/test/Ice/ami/Collocated.java
diff --git a/java/test/Ice/ami/Server.java b/java/test/src/main/java/test/Ice/ami/Server.java
index b22e052fa06..b22e052fa06 100644
--- a/java/test/Ice/ami/Server.java
+++ b/java/test/src/main/java/test/Ice/ami/Server.java
diff --git a/java/test/Ice/ami/Test.ice b/java/test/src/main/java/test/Ice/ami/Test.ice
index 7d1ddc7f374..7d1ddc7f374 100644
--- a/java/test/Ice/ami/Test.ice
+++ b/java/test/src/main/java/test/Ice/ami/Test.ice
diff --git a/java/test/Ice/ami/TestControllerI.java b/java/test/src/main/java/test/Ice/ami/TestControllerI.java
index 9eebceb7214..9eebceb7214 100644
--- a/java/test/Ice/ami/TestControllerI.java
+++ b/java/test/src/main/java/test/Ice/ami/TestControllerI.java
diff --git a/java/test/Ice/ami/TestI.java b/java/test/src/main/java/test/Ice/ami/TestI.java
index cc4f2a2040d..cc4f2a2040d 100644
--- a/java/test/Ice/ami/TestI.java
+++ b/java/test/src/main/java/test/Ice/ami/TestI.java
diff --git a/java/test/Ice/ami/lambda/AMI.java b/java/test/src/main/java/test/Ice/ami/lambda/AMI.java
index 65bd185a849..65bd185a849 100644
--- a/java/test/Ice/ami/lambda/AMI.java
+++ b/java/test/src/main/java/test/Ice/ami/lambda/AMI.java
diff --git a/java/test/Ice/ami/run.py b/java/test/src/main/java/test/Ice/ami/run.py
index a40df1a1bcb..6444a527f9a 100755
--- a/java/test/Ice/ami/run.py
+++ b/java/test/src/main/java/test/Ice/ami/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/background/Acceptor.java b/java/test/src/main/java/test/Ice/background/Acceptor.java
index 598ff348fb2..598ff348fb2 100644
--- a/java/test/Ice/background/Acceptor.java
+++ b/java/test/src/main/java/test/Ice/background/Acceptor.java
diff --git a/java/test/Ice/background/AllTests.java b/java/test/src/main/java/test/Ice/background/AllTests.java
index ba04e6421b7..ba04e6421b7 100644
--- a/java/test/Ice/background/AllTests.java
+++ b/java/test/src/main/java/test/Ice/background/AllTests.java
diff --git a/java/test/Ice/background/BackgroundControllerI.java b/java/test/src/main/java/test/Ice/background/BackgroundControllerI.java
index fb1a591e193..fb1a591e193 100644
--- a/java/test/Ice/background/BackgroundControllerI.java
+++ b/java/test/src/main/java/test/Ice/background/BackgroundControllerI.java
diff --git a/java/test/Ice/background/BackgroundI.java b/java/test/src/main/java/test/Ice/background/BackgroundI.java
index 57adf958ca5..57adf958ca5 100644
--- a/java/test/Ice/background/BackgroundI.java
+++ b/java/test/src/main/java/test/Ice/background/BackgroundI.java
diff --git a/java/test/Ice/background/Client.java b/java/test/src/main/java/test/Ice/background/Client.java
index 1955472ebab..1955472ebab 100644
--- a/java/test/Ice/background/Client.java
+++ b/java/test/src/main/java/test/Ice/background/Client.java
diff --git a/java/test/Ice/background/Collocated.java b/java/test/src/main/java/test/Ice/background/Collocated.java
index ac3e4622f17..ac3e4622f17 100644
--- a/java/test/Ice/background/Collocated.java
+++ b/java/test/src/main/java/test/Ice/background/Collocated.java
diff --git a/java/test/Ice/background/Configuration.java b/java/test/src/main/java/test/Ice/background/Configuration.java
index befe01738fc..befe01738fc 100644
--- a/java/test/Ice/background/Configuration.java
+++ b/java/test/src/main/java/test/Ice/background/Configuration.java
diff --git a/java/test/Ice/background/Connector.java b/java/test/src/main/java/test/Ice/background/Connector.java
index afc3db49abe..afc3db49abe 100644
--- a/java/test/Ice/background/Connector.java
+++ b/java/test/src/main/java/test/Ice/background/Connector.java
diff --git a/java/test/Ice/background/EndpointFactory.java b/java/test/src/main/java/test/Ice/background/EndpointFactory.java
index 09a8f35290b..09a8f35290b 100644
--- a/java/test/Ice/background/EndpointFactory.java
+++ b/java/test/src/main/java/test/Ice/background/EndpointFactory.java
diff --git a/java/test/Ice/background/EndpointI.java b/java/test/src/main/java/test/Ice/background/EndpointI.java
index bed906911d6..bed906911d6 100644
--- a/java/test/Ice/background/EndpointI.java
+++ b/java/test/src/main/java/test/Ice/background/EndpointI.java
diff --git a/java/test/Ice/background/PluginFactory.java b/java/test/src/main/java/test/Ice/background/PluginFactory.java
index 9edd6c8fa38..9edd6c8fa38 100644
--- a/java/test/Ice/background/PluginFactory.java
+++ b/java/test/src/main/java/test/Ice/background/PluginFactory.java
diff --git a/java/test/Ice/background/Server.java b/java/test/src/main/java/test/Ice/background/Server.java
index 52aaf1f1f49..52aaf1f1f49 100644
--- a/java/test/Ice/background/Server.java
+++ b/java/test/src/main/java/test/Ice/background/Server.java
diff --git a/java/test/Ice/background/Test.ice b/java/test/src/main/java/test/Ice/background/Test.ice
index b612eb4d280..b612eb4d280 100644
--- a/java/test/Ice/background/Test.ice
+++ b/java/test/src/main/java/test/Ice/background/Test.ice
diff --git a/java/test/Ice/background/Transceiver.java b/java/test/src/main/java/test/Ice/background/Transceiver.java
index 738c7ef1f10..738c7ef1f10 100644
--- a/java/test/Ice/background/Transceiver.java
+++ b/java/test/src/main/java/test/Ice/background/Transceiver.java
diff --git a/java/test/Ice/background/run.py b/java/test/src/main/java/test/Ice/background/run.py
index 33fc2e8f3ac..d5fe04787c9 100755
--- a/java/test/Ice/background/run.py
+++ b/java/test/src/main/java/test/Ice/background/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/binding/AllTests.java b/java/test/src/main/java/test/Ice/binding/AllTests.java
index 88aa196b157..88aa196b157 100644
--- a/java/test/Ice/binding/AllTests.java
+++ b/java/test/src/main/java/test/Ice/binding/AllTests.java
diff --git a/java/test/Ice/binding/Client.java b/java/test/src/main/java/test/Ice/binding/Client.java
index 30d087baac3..30d087baac3 100644
--- a/java/test/Ice/binding/Client.java
+++ b/java/test/src/main/java/test/Ice/binding/Client.java
diff --git a/java/test/Ice/binding/RemoteCommunicatorI.java b/java/test/src/main/java/test/Ice/binding/RemoteCommunicatorI.java
index fbebb72cd59..fbebb72cd59 100644
--- a/java/test/Ice/binding/RemoteCommunicatorI.java
+++ b/java/test/src/main/java/test/Ice/binding/RemoteCommunicatorI.java
diff --git a/java/test/Ice/binding/RemoteObjectAdapterI.java b/java/test/src/main/java/test/Ice/binding/RemoteObjectAdapterI.java
index a8b22ec5197..a8b22ec5197 100644
--- a/java/test/Ice/binding/RemoteObjectAdapterI.java
+++ b/java/test/src/main/java/test/Ice/binding/RemoteObjectAdapterI.java
diff --git a/java/test/Ice/binding/Server.java b/java/test/src/main/java/test/Ice/binding/Server.java
index 9c2926cdc3b..9c2926cdc3b 100644
--- a/java/test/Ice/binding/Server.java
+++ b/java/test/src/main/java/test/Ice/binding/Server.java
diff --git a/java/test/Ice/binding/Test.ice b/java/test/src/main/java/test/Ice/binding/Test.ice
index 9b951c9b6fb..9b951c9b6fb 100644
--- a/java/test/Ice/binding/Test.ice
+++ b/java/test/src/main/java/test/Ice/binding/Test.ice
diff --git a/java/test/Ice/binding/TestI.java b/java/test/src/main/java/test/Ice/binding/TestI.java
index 23a13b96ff8..23a13b96ff8 100644
--- a/java/test/Ice/binding/TestI.java
+++ b/java/test/src/main/java/test/Ice/binding/TestI.java
diff --git a/java/test/src/main/java/test/Ice/binding/run.py b/java/test/src/main/java/test/Ice/binding/run.py
new file mode 100755
index 00000000000..d5fe04787c9
--- /dev/null
+++ b/java/test/src/main/java/test/Ice/binding/run.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+import os, sys
+
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
+    raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil
+
+TestUtil.clientServerTest()
diff --git a/java/test/Ice/checksum/AllTests.java b/java/test/src/main/java/test/Ice/checksum/AllTests.java
index 3fb2c711746..3fb2c711746 100644
--- a/java/test/Ice/checksum/AllTests.java
+++ b/java/test/src/main/java/test/Ice/checksum/AllTests.java
diff --git a/java/test/Ice/checksum/ChecksumI.java b/java/test/src/main/java/test/Ice/checksum/ChecksumI.java
index a85707f400e..a85707f400e 100644
--- a/java/test/Ice/checksum/ChecksumI.java
+++ b/java/test/src/main/java/test/Ice/checksum/ChecksumI.java
diff --git a/java/test/Ice/checksum/Client.java b/java/test/src/main/java/test/Ice/checksum/Client.java
index 34d4f3ab1b8..34d4f3ab1b8 100644
--- a/java/test/Ice/checksum/Client.java
+++ b/java/test/src/main/java/test/Ice/checksum/Client.java
diff --git a/java/test/Ice/checksum/Server.java b/java/test/src/main/java/test/Ice/checksum/Server.java
index c64042283e4..c64042283e4 100644
--- a/java/test/Ice/checksum/Server.java
+++ b/java/test/src/main/java/test/Ice/checksum/Server.java
diff --git a/java/test/Ice/checksum/Test.ice b/java/test/src/main/java/test/Ice/checksum/Test.ice
index 060d9078201..060d9078201 100644
--- a/java/test/Ice/checksum/Test.ice
+++ b/java/test/src/main/java/test/Ice/checksum/Test.ice
diff --git a/java/test/Ice/checksum/TestServer.ice b/java/test/src/main/java/test/Ice/checksum/TestServer.ice
index 0fef43faabf..0fef43faabf 100644
--- a/java/test/Ice/checksum/TestServer.ice
+++ b/java/test/src/main/java/test/Ice/checksum/TestServer.ice
diff --git a/java/test/Ice/checksum/Types.ice b/java/test/src/main/java/test/Ice/checksum/Types.ice
index 8da301c229a..8da301c229a 100644
--- a/java/test/Ice/checksum/Types.ice
+++ b/java/test/src/main/java/test/Ice/checksum/Types.ice
diff --git a/java/test/Ice/checksum/TypesServer.ice b/java/test/src/main/java/test/Ice/checksum/TypesServer.ice
index 0fd16b143bc..0fd16b143bc 100644
--- a/java/test/Ice/checksum/TypesServer.ice
+++ b/java/test/src/main/java/test/Ice/checksum/TypesServer.ice
diff --git a/java/test/src/main/java/test/Ice/checksum/run.py b/java/test/src/main/java/test/Ice/checksum/run.py
new file mode 100755
index 00000000000..d5fe04787c9
--- /dev/null
+++ b/java/test/src/main/java/test/Ice/checksum/run.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+import os, sys
+
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
+    raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil
+
+TestUtil.clientServerTest()
diff --git a/java/test/Ice/classLoader/AbstractClassI.java b/java/test/src/main/java/test/Ice/classLoader/AbstractClassI.java
index df7bcf8a4c4..df7bcf8a4c4 100644
--- a/java/test/Ice/classLoader/AbstractClassI.java
+++ b/java/test/src/main/java/test/Ice/classLoader/AbstractClassI.java
diff --git a/java/test/Ice/classLoader/AllTests.java b/java/test/src/main/java/test/Ice/classLoader/AllTests.java
index d0181cff1a6..d0181cff1a6 100644
--- a/java/test/Ice/classLoader/AllTests.java
+++ b/java/test/src/main/java/test/Ice/classLoader/AllTests.java
diff --git a/java/test/Ice/classLoader/CertificateVerifierI.java b/java/test/src/main/java/test/Ice/classLoader/CertificateVerifierI.java
index 3e681297f84..3e681297f84 100644
--- a/java/test/Ice/classLoader/CertificateVerifierI.java
+++ b/java/test/src/main/java/test/Ice/classLoader/CertificateVerifierI.java
diff --git a/java/test/Ice/classLoader/Client.java b/java/test/src/main/java/test/Ice/classLoader/Client.java
index 20152d6b598..20152d6b598 100644
--- a/java/test/Ice/classLoader/Client.java
+++ b/java/test/src/main/java/test/Ice/classLoader/Client.java
diff --git a/java/test/Ice/classLoader/InitialI.java b/java/test/src/main/java/test/Ice/classLoader/InitialI.java
index a8056715aad..a8056715aad 100644
--- a/java/test/Ice/classLoader/InitialI.java
+++ b/java/test/src/main/java/test/Ice/classLoader/InitialI.java
diff --git a/java/test/Ice/classLoader/PasswordCallbackI.java b/java/test/src/main/java/test/Ice/classLoader/PasswordCallbackI.java
index e5eba1462dd..e5eba1462dd 100644
--- a/java/test/Ice/classLoader/PasswordCallbackI.java
+++ b/java/test/src/main/java/test/Ice/classLoader/PasswordCallbackI.java
diff --git a/java/test/Ice/classLoader/PluginFactoryI.java b/java/test/src/main/java/test/Ice/classLoader/PluginFactoryI.java
index 2416e04c420..2416e04c420 100644
--- a/java/test/Ice/classLoader/PluginFactoryI.java
+++ b/java/test/src/main/java/test/Ice/classLoader/PluginFactoryI.java
diff --git a/java/test/Ice/classLoader/Server.java b/java/test/src/main/java/test/Ice/classLoader/Server.java
index 79abca86364..79abca86364 100644
--- a/java/test/Ice/classLoader/Server.java
+++ b/java/test/src/main/java/test/Ice/classLoader/Server.java
diff --git a/java/test/Ice/classLoader/Test.ice b/java/test/src/main/java/test/Ice/classLoader/Test.ice
index 2df8659720e..2df8659720e 100644
--- a/java/test/Ice/classLoader/Test.ice
+++ b/java/test/src/main/java/test/Ice/classLoader/Test.ice
diff --git a/java/test/src/main/java/test/Ice/classLoader/run.py b/java/test/src/main/java/test/Ice/classLoader/run.py
new file mode 100755
index 00000000000..d5fe04787c9
--- /dev/null
+++ b/java/test/src/main/java/test/Ice/classLoader/run.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+import os, sys
+
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
+    raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil
+
+TestUtil.clientServerTest()
diff --git a/java/test/Ice/custom/AllTests.java b/java/test/src/main/java/test/Ice/custom/AllTests.java
index be731b43efe..be731b43efe 100644
--- a/java/test/Ice/custom/AllTests.java
+++ b/java/test/src/main/java/test/Ice/custom/AllTests.java
diff --git a/java/test/Ice/custom/Client.java b/java/test/src/main/java/test/Ice/custom/Client.java
index 17ad54b561f..17ad54b561f 100644
--- a/java/test/Ice/custom/Client.java
+++ b/java/test/src/main/java/test/Ice/custom/Client.java
diff --git a/java/test/Ice/custom/Collocated.java b/java/test/src/main/java/test/Ice/custom/Collocated.java
index 2d8fd94f500..2d8fd94f500 100644
--- a/java/test/Ice/custom/Collocated.java
+++ b/java/test/src/main/java/test/Ice/custom/Collocated.java
diff --git a/java/test/Ice/custom/Server.java b/java/test/src/main/java/test/Ice/custom/Server.java
index fe959c086ff..fe959c086ff 100644
--- a/java/test/Ice/custom/Server.java
+++ b/java/test/src/main/java/test/Ice/custom/Server.java
diff --git a/java/test/Ice/custom/Test.ice b/java/test/src/main/java/test/Ice/custom/Test.ice
index 4743eb95492..4743eb95492 100644
--- a/java/test/Ice/custom/Test.ice
+++ b/java/test/src/main/java/test/Ice/custom/Test.ice
diff --git a/java/test/Ice/custom/TestI.java b/java/test/src/main/java/test/Ice/custom/TestI.java
index e384d531ffd..e384d531ffd 100644
--- a/java/test/Ice/custom/TestI.java
+++ b/java/test/src/main/java/test/Ice/custom/TestI.java
diff --git a/java/test/Ice/custom/run.py b/java/test/src/main/java/test/Ice/custom/run.py
index 44aa7d73d00..8bb456187d9 100755
--- a/java/test/Ice/custom/run.py
+++ b/java/test/src/main/java/test/Ice/custom/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/defaultServant/AllTests.java b/java/test/src/main/java/test/Ice/defaultServant/AllTests.java
index 50589050baf..50589050baf 100644
--- a/java/test/Ice/defaultServant/AllTests.java
+++ b/java/test/src/main/java/test/Ice/defaultServant/AllTests.java
diff --git a/java/test/Ice/defaultServant/Client.java b/java/test/src/main/java/test/Ice/defaultServant/Client.java
index 4f9b3be9ec4..4f9b3be9ec4 100644
--- a/java/test/Ice/defaultServant/Client.java
+++ b/java/test/src/main/java/test/Ice/defaultServant/Client.java
diff --git a/java/test/Ice/defaultServant/MyObjectI.java b/java/test/src/main/java/test/Ice/defaultServant/MyObjectI.java
index 64d4548f920..64d4548f920 100644
--- a/java/test/Ice/defaultServant/MyObjectI.java
+++ b/java/test/src/main/java/test/Ice/defaultServant/MyObjectI.java
diff --git a/java/test/Ice/defaultServant/Test.ice b/java/test/src/main/java/test/Ice/defaultServant/Test.ice
index ce986ce32c3..ce986ce32c3 100644
--- a/java/test/Ice/defaultServant/Test.ice
+++ b/java/test/src/main/java/test/Ice/defaultServant/Test.ice
diff --git a/java/test/Ice/defaultServant/run.py b/java/test/src/main/java/test/Ice/defaultServant/run.py
index eac86a98816..d36e7a611b3 100755
--- a/java/test/Ice/defaultServant/run.py
+++ b/java/test/src/main/java/test/Ice/defaultServant/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/defaultValue/AllTests.java b/java/test/src/main/java/test/Ice/defaultValue/AllTests.java
index a53a798bde6..a53a798bde6 100644
--- a/java/test/Ice/defaultValue/AllTests.java
+++ b/java/test/src/main/java/test/Ice/defaultValue/AllTests.java
diff --git a/java/test/Ice/defaultValue/Client.java b/java/test/src/main/java/test/Ice/defaultValue/Client.java
index 78685aa1939..78685aa1939 100644
--- a/java/test/Ice/defaultValue/Client.java
+++ b/java/test/src/main/java/test/Ice/defaultValue/Client.java
diff --git a/java/test/Ice/defaultValue/Test.ice b/java/test/src/main/java/test/Ice/defaultValue/Test.ice
index 2c41e0a3293..2c41e0a3293 100644
--- a/java/test/Ice/defaultValue/Test.ice
+++ b/java/test/src/main/java/test/Ice/defaultValue/Test.ice
diff --git a/java/test/Ice/defaultValue/run.py b/java/test/src/main/java/test/Ice/defaultValue/run.py
index 2d55428a099..06025e5d073 100755
--- a/java/test/Ice/defaultValue/run.py
+++ b/java/test/src/main/java/test/Ice/defaultValue/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/dispatcher/AllTests.java b/java/test/src/main/java/test/Ice/dispatcher/AllTests.java
index e1badc24a9a..e1badc24a9a 100644
--- a/java/test/Ice/dispatcher/AllTests.java
+++ b/java/test/src/main/java/test/Ice/dispatcher/AllTests.java
diff --git a/java/test/Ice/dispatcher/Client.java b/java/test/src/main/java/test/Ice/dispatcher/Client.java
index 9b490d763c1..9b490d763c1 100644
--- a/java/test/Ice/dispatcher/Client.java
+++ b/java/test/src/main/java/test/Ice/dispatcher/Client.java
diff --git a/java/test/Ice/dispatcher/Collocated.java b/java/test/src/main/java/test/Ice/dispatcher/Collocated.java
index 453311a3584..453311a3584 100644
--- a/java/test/Ice/dispatcher/Collocated.java
+++ b/java/test/src/main/java/test/Ice/dispatcher/Collocated.java
diff --git a/java/test/Ice/dispatcher/Dispatcher.java b/java/test/src/main/java/test/Ice/dispatcher/Dispatcher.java
index 2ee5dbb6f4d..2ee5dbb6f4d 100644
--- a/java/test/Ice/dispatcher/Dispatcher.java
+++ b/java/test/src/main/java/test/Ice/dispatcher/Dispatcher.java
diff --git a/java/test/Ice/dispatcher/Server.java b/java/test/src/main/java/test/Ice/dispatcher/Server.java
index c4ef87e7451..c4ef87e7451 100644
--- a/java/test/Ice/dispatcher/Server.java
+++ b/java/test/src/main/java/test/Ice/dispatcher/Server.java
diff --git a/java/test/Ice/dispatcher/Test.ice b/java/test/src/main/java/test/Ice/dispatcher/Test.ice
index bbeabc2210a..bbeabc2210a 100644
--- a/java/test/Ice/dispatcher/Test.ice
+++ b/java/test/src/main/java/test/Ice/dispatcher/Test.ice
diff --git a/java/test/Ice/dispatcher/TestControllerI.java b/java/test/src/main/java/test/Ice/dispatcher/TestControllerI.java
index cd24a7982b3..cd24a7982b3 100644
--- a/java/test/Ice/dispatcher/TestControllerI.java
+++ b/java/test/src/main/java/test/Ice/dispatcher/TestControllerI.java
diff --git a/java/test/Ice/dispatcher/TestI.java b/java/test/src/main/java/test/Ice/dispatcher/TestI.java
index 93dd8513ecc..93dd8513ecc 100644
--- a/java/test/Ice/dispatcher/TestI.java
+++ b/java/test/src/main/java/test/Ice/dispatcher/TestI.java
diff --git a/java/test/Ice/dispatcher/run.py b/java/test/src/main/java/test/Ice/dispatcher/run.py
index a40df1a1bcb..6444a527f9a 100755
--- a/java/test/Ice/dispatcher/run.py
+++ b/java/test/src/main/java/test/Ice/dispatcher/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/echo/BlobjectI.java b/java/test/src/main/java/test/Ice/echo/BlobjectI.java
index 946284608c1..946284608c1 100644
--- a/java/test/Ice/echo/BlobjectI.java
+++ b/java/test/src/main/java/test/Ice/echo/BlobjectI.java
diff --git a/java/test/Ice/echo/Server.java b/java/test/src/main/java/test/Ice/echo/Server.java
index 88daf466e01..88daf466e01 100644
--- a/java/test/Ice/echo/Server.java
+++ b/java/test/src/main/java/test/Ice/echo/Server.java
diff --git a/java/test/Ice/echo/Test.ice b/java/test/src/main/java/test/Ice/echo/Test.ice
index 6528f1a7501..6528f1a7501 100644
--- a/java/test/Ice/echo/Test.ice
+++ b/java/test/src/main/java/test/Ice/echo/Test.ice
diff --git a/java/test/Ice/echo/run.py b/java/test/src/main/java/test/Ice/echo/run.py
index 74984e633a4..de17f7cd696 100755
--- a/java/test/Ice/echo/run.py
+++ b/java/test/src/main/java/test/Ice/echo/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/enums/AllTests.java b/java/test/src/main/java/test/Ice/enums/AllTests.java
index 47aef9c0c83..47aef9c0c83 100644
--- a/java/test/Ice/enums/AllTests.java
+++ b/java/test/src/main/java/test/Ice/enums/AllTests.java
diff --git a/java/test/Ice/enums/Client.java b/java/test/src/main/java/test/Ice/enums/Client.java
index f27ee458960..f27ee458960 100644
--- a/java/test/Ice/enums/Client.java
+++ b/java/test/src/main/java/test/Ice/enums/Client.java
diff --git a/java/test/Ice/enums/Server.java b/java/test/src/main/java/test/Ice/enums/Server.java
index 24ef6d00730..24ef6d00730 100644
--- a/java/test/Ice/enums/Server.java
+++ b/java/test/src/main/java/test/Ice/enums/Server.java
diff --git a/java/test/Ice/enums/Test.ice b/java/test/src/main/java/test/Ice/enums/Test.ice
index 5f7f84ec899..5f7f84ec899 100644
--- a/java/test/Ice/enums/Test.ice
+++ b/java/test/src/main/java/test/Ice/enums/Test.ice
diff --git a/java/test/Ice/enums/TestIntfI.java b/java/test/src/main/java/test/Ice/enums/TestIntfI.java
index cbb511e7edd..cbb511e7edd 100644
--- a/java/test/Ice/enums/TestIntfI.java
+++ b/java/test/src/main/java/test/Ice/enums/TestIntfI.java
diff --git a/java/test/Ice/enums/run.py b/java/test/src/main/java/test/Ice/enums/run.py
index efa77639a65..946154e0d1a 100755
--- a/java/test/Ice/enums/run.py
+++ b/java/test/src/main/java/test/Ice/enums/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/exceptions/AMDServer.java b/java/test/src/main/java/test/Ice/exceptions/AMDServer.java
index afd5450bffc..afd5450bffc 100644
--- a/java/test/Ice/exceptions/AMDServer.java
+++ b/java/test/src/main/java/test/Ice/exceptions/AMDServer.java
diff --git a/java/test/Ice/exceptions/AMDThrowerI.java b/java/test/src/main/java/test/Ice/exceptions/AMDThrowerI.java
index bd1013bd589..bd1013bd589 100644
--- a/java/test/Ice/exceptions/AMDThrowerI.java
+++ b/java/test/src/main/java/test/Ice/exceptions/AMDThrowerI.java
diff --git a/java/test/Ice/exceptions/AllTests.java b/java/test/src/main/java/test/Ice/exceptions/AllTests.java
index 7d68606047e..7d68606047e 100644
--- a/java/test/Ice/exceptions/AllTests.java
+++ b/java/test/src/main/java/test/Ice/exceptions/AllTests.java
diff --git a/java/test/Ice/exceptions/Client.java b/java/test/src/main/java/test/Ice/exceptions/Client.java
index ef66546fa26..ef66546fa26 100644
--- a/java/test/Ice/exceptions/Client.java
+++ b/java/test/src/main/java/test/Ice/exceptions/Client.java
diff --git a/java/test/Ice/exceptions/Collocated.java b/java/test/src/main/java/test/Ice/exceptions/Collocated.java
index b85ca002b94..b85ca002b94 100644
--- a/java/test/Ice/exceptions/Collocated.java
+++ b/java/test/src/main/java/test/Ice/exceptions/Collocated.java
diff --git a/java/test/Ice/exceptions/DummyLogger.java b/java/test/src/main/java/test/Ice/exceptions/DummyLogger.java
index 4230b744f94..4230b744f94 100644
--- a/java/test/Ice/exceptions/DummyLogger.java
+++ b/java/test/src/main/java/test/Ice/exceptions/DummyLogger.java
diff --git a/java/test/Ice/exceptions/EmptyI.java b/java/test/src/main/java/test/Ice/exceptions/EmptyI.java
index f21f1bc484e..f21f1bc484e 100644
--- a/java/test/Ice/exceptions/EmptyI.java
+++ b/java/test/src/main/java/test/Ice/exceptions/EmptyI.java
diff --git a/java/test/Ice/exceptions/ObjectFactoryI.java b/java/test/src/main/java/test/Ice/exceptions/ObjectFactoryI.java
index 87dd29b637b..87dd29b637b 100644
--- a/java/test/Ice/exceptions/ObjectFactoryI.java
+++ b/java/test/src/main/java/test/Ice/exceptions/ObjectFactoryI.java
diff --git a/java/test/Ice/exceptions/ServantLocatorI.java b/java/test/src/main/java/test/Ice/exceptions/ServantLocatorI.java
index 6619cd8f40c..6619cd8f40c 100644
--- a/java/test/Ice/exceptions/ServantLocatorI.java
+++ b/java/test/src/main/java/test/Ice/exceptions/ServantLocatorI.java
diff --git a/java/test/Ice/exceptions/Server.java b/java/test/src/main/java/test/Ice/exceptions/Server.java
index 539ac3bc304..539ac3bc304 100644
--- a/java/test/Ice/exceptions/Server.java
+++ b/java/test/src/main/java/test/Ice/exceptions/Server.java
diff --git a/java/test/Ice/exceptions/Test.ice b/java/test/src/main/java/test/Ice/exceptions/Test.ice
index c1818494ad2..c1818494ad2 100644
--- a/java/test/Ice/exceptions/Test.ice
+++ b/java/test/src/main/java/test/Ice/exceptions/Test.ice
diff --git a/java/test/Ice/exceptions/TestAMD.ice b/java/test/src/main/java/test/Ice/exceptions/TestAMD.ice
index 4007abf0f52..4007abf0f52 100644
--- a/java/test/Ice/exceptions/TestAMD.ice
+++ b/java/test/src/main/java/test/Ice/exceptions/TestAMD.ice
diff --git a/java/test/Ice/exceptions/ThrowerI.java b/java/test/src/main/java/test/Ice/exceptions/ThrowerI.java
index 8859147bd36..8859147bd36 100644
--- a/java/test/Ice/exceptions/ThrowerI.java
+++ b/java/test/src/main/java/test/Ice/exceptions/ThrowerI.java
diff --git a/java/test/Ice/exceptions/run.py b/java/test/src/main/java/test/Ice/exceptions/run.py
index 889f816c644..458762c1dfe 100755
--- a/java/test/Ice/exceptions/run.py
+++ b/java/test/src/main/java/test/Ice/exceptions/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/facets/AI.java b/java/test/src/main/java/test/Ice/facets/AI.java
index eb993bf3082..eb993bf3082 100644
--- a/java/test/Ice/facets/AI.java
+++ b/java/test/src/main/java/test/Ice/facets/AI.java
diff --git a/java/test/Ice/facets/AllTests.java b/java/test/src/main/java/test/Ice/facets/AllTests.java
index 79308c3b113..79308c3b113 100644
--- a/java/test/Ice/facets/AllTests.java
+++ b/java/test/src/main/java/test/Ice/facets/AllTests.java
diff --git a/java/test/Ice/facets/BI.java b/java/test/src/main/java/test/Ice/facets/BI.java
index bcc05365e0f..bcc05365e0f 100644
--- a/java/test/Ice/facets/BI.java
+++ b/java/test/src/main/java/test/Ice/facets/BI.java
diff --git a/java/test/Ice/facets/CI.java b/java/test/src/main/java/test/Ice/facets/CI.java
index fab2a5758ee..fab2a5758ee 100644
--- a/java/test/Ice/facets/CI.java
+++ b/java/test/src/main/java/test/Ice/facets/CI.java
diff --git a/java/test/Ice/facets/Client.java b/java/test/src/main/java/test/Ice/facets/Client.java
index 22867839eb7..22867839eb7 100644
--- a/java/test/Ice/facets/Client.java
+++ b/java/test/src/main/java/test/Ice/facets/Client.java
diff --git a/java/test/Ice/facets/Collocated.java b/java/test/src/main/java/test/Ice/facets/Collocated.java
index 9503a7e7748..9503a7e7748 100644
--- a/java/test/Ice/facets/Collocated.java
+++ b/java/test/src/main/java/test/Ice/facets/Collocated.java
diff --git a/java/test/Ice/facets/DI.java b/java/test/src/main/java/test/Ice/facets/DI.java
index cd4274dbaac..cd4274dbaac 100644
--- a/java/test/Ice/facets/DI.java
+++ b/java/test/src/main/java/test/Ice/facets/DI.java
diff --git a/java/test/Ice/facets/EI.java b/java/test/src/main/java/test/Ice/facets/EI.java
index 6ebeb0ee8b3..6ebeb0ee8b3 100644
--- a/java/test/Ice/facets/EI.java
+++ b/java/test/src/main/java/test/Ice/facets/EI.java
diff --git a/java/test/Ice/facets/EmptyI.java b/java/test/src/main/java/test/Ice/facets/EmptyI.java
index 89d633d6b7b..89d633d6b7b 100644
--- a/java/test/Ice/facets/EmptyI.java
+++ b/java/test/src/main/java/test/Ice/facets/EmptyI.java
diff --git a/java/test/Ice/facets/FI.java b/java/test/src/main/java/test/Ice/facets/FI.java
index 5d945d86714..5d945d86714 100644
--- a/java/test/Ice/facets/FI.java
+++ b/java/test/src/main/java/test/Ice/facets/FI.java
diff --git a/java/test/Ice/facets/GI.java b/java/test/src/main/java/test/Ice/facets/GI.java
index 397501ddeb7..397501ddeb7 100644
--- a/java/test/Ice/facets/GI.java
+++ b/java/test/src/main/java/test/Ice/facets/GI.java
diff --git a/java/test/Ice/facets/HI.java b/java/test/src/main/java/test/Ice/facets/HI.java
index 49bc8de2337..49bc8de2337 100644
--- a/java/test/Ice/facets/HI.java
+++ b/java/test/src/main/java/test/Ice/facets/HI.java
diff --git a/java/test/Ice/facets/Server.java b/java/test/src/main/java/test/Ice/facets/Server.java
index 0bba8b89cdf..0bba8b89cdf 100644
--- a/java/test/Ice/facets/Server.java
+++ b/java/test/src/main/java/test/Ice/facets/Server.java
diff --git a/java/test/Ice/facets/Test.ice b/java/test/src/main/java/test/Ice/facets/Test.ice
index fa6a545118e..fa6a545118e 100644
--- a/java/test/Ice/facets/Test.ice
+++ b/java/test/src/main/java/test/Ice/facets/Test.ice
diff --git a/java/test/src/main/java/test/Ice/facets/run.py b/java/test/src/main/java/test/Ice/facets/run.py
new file mode 100755
index 00000000000..8bb456187d9
--- /dev/null
+++ b/java/test/src/main/java/test/Ice/facets/run.py
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+import os, sys
+
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
+    raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil
+
+TestUtil.clientServerTest()
+TestUtil.collocatedTest()
diff --git a/java/test/Ice/faultTolerance/AllTests.java b/java/test/src/main/java/test/Ice/faultTolerance/AllTests.java
index 4e334301a62..4e334301a62 100644
--- a/java/test/Ice/faultTolerance/AllTests.java
+++ b/java/test/src/main/java/test/Ice/faultTolerance/AllTests.java
diff --git a/java/test/Ice/faultTolerance/Client.java b/java/test/src/main/java/test/Ice/faultTolerance/Client.java
index 7f2fb23b80e..7f2fb23b80e 100644
--- a/java/test/Ice/faultTolerance/Client.java
+++ b/java/test/src/main/java/test/Ice/faultTolerance/Client.java
diff --git a/java/test/Ice/faultTolerance/Server.java b/java/test/src/main/java/test/Ice/faultTolerance/Server.java
index 18d113fdeae..18d113fdeae 100644
--- a/java/test/Ice/faultTolerance/Server.java
+++ b/java/test/src/main/java/test/Ice/faultTolerance/Server.java
diff --git a/java/test/Ice/faultTolerance/Test.ice b/java/test/src/main/java/test/Ice/faultTolerance/Test.ice
index e5f616aa8a0..e5f616aa8a0 100644
--- a/java/test/Ice/faultTolerance/Test.ice
+++ b/java/test/src/main/java/test/Ice/faultTolerance/Test.ice
diff --git a/java/test/Ice/faultTolerance/TestI.java b/java/test/src/main/java/test/Ice/faultTolerance/TestI.java
index 3d3b362bd0a..3d3b362bd0a 100644
--- a/java/test/Ice/faultTolerance/TestI.java
+++ b/java/test/src/main/java/test/Ice/faultTolerance/TestI.java
diff --git a/java/test/Ice/faultTolerance/run.py b/java/test/src/main/java/test/Ice/faultTolerance/run.py
index 7ec29613f4c..11e4dfc9efd 100755
--- a/java/test/Ice/faultTolerance/run.py
+++ b/java/test/src/main/java/test/Ice/faultTolerance/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/hash/Client.java b/java/test/src/main/java/test/Ice/hash/Client.java
index 6a01bf62285..6a01bf62285 100644
--- a/java/test/Ice/hash/Client.java
+++ b/java/test/src/main/java/test/Ice/hash/Client.java
diff --git a/java/test/Ice/hash/Test.ice b/java/test/src/main/java/test/Ice/hash/Test.ice
index e6b7243d1e7..e6b7243d1e7 100644
--- a/java/test/Ice/hash/Test.ice
+++ b/java/test/src/main/java/test/Ice/hash/Test.ice
diff --git a/java/test/Ice/hash/run.py b/java/test/src/main/java/test/Ice/hash/run.py
index 3cec68b15ce..29d7f55f0f5 100755
--- a/java/test/Ice/hash/run.py
+++ b/java/test/src/main/java/test/Ice/hash/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/hold/AllTests.java b/java/test/src/main/java/test/Ice/hold/AllTests.java
index edb5aa78e63..edb5aa78e63 100644
--- a/java/test/Ice/hold/AllTests.java
+++ b/java/test/src/main/java/test/Ice/hold/AllTests.java
diff --git a/java/test/Ice/hold/Client.java b/java/test/src/main/java/test/Ice/hold/Client.java
index 58e4e1abd32..58e4e1abd32 100644
--- a/java/test/Ice/hold/Client.java
+++ b/java/test/src/main/java/test/Ice/hold/Client.java
diff --git a/java/test/Ice/hold/HoldI.java b/java/test/src/main/java/test/Ice/hold/HoldI.java
index b127f4bebb8..b127f4bebb8 100644
--- a/java/test/Ice/hold/HoldI.java
+++ b/java/test/src/main/java/test/Ice/hold/HoldI.java
diff --git a/java/test/Ice/hold/Server.java b/java/test/src/main/java/test/Ice/hold/Server.java
index 97019f8021e..97019f8021e 100644
--- a/java/test/Ice/hold/Server.java
+++ b/java/test/src/main/java/test/Ice/hold/Server.java
diff --git a/java/test/Ice/hold/Test.ice b/java/test/src/main/java/test/Ice/hold/Test.ice
index c77f95e299f..c77f95e299f 100644
--- a/java/test/Ice/hold/Test.ice
+++ b/java/test/src/main/java/test/Ice/hold/Test.ice
diff --git a/java/test/src/main/java/test/Ice/hold/run.py b/java/test/src/main/java/test/Ice/hold/run.py
new file mode 100755
index 00000000000..d5fe04787c9
--- /dev/null
+++ b/java/test/src/main/java/test/Ice/hold/run.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+import os, sys
+
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
+    raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil
+
+TestUtil.clientServerTest()
diff --git a/java/test/Ice/info/AllTests.java b/java/test/src/main/java/test/Ice/info/AllTests.java
index 77d4e6332a6..77d4e6332a6 100644
--- a/java/test/Ice/info/AllTests.java
+++ b/java/test/src/main/java/test/Ice/info/AllTests.java
diff --git a/java/test/Ice/info/Client.java b/java/test/src/main/java/test/Ice/info/Client.java
index 2cd0d5b1f8b..2cd0d5b1f8b 100644
--- a/java/test/Ice/info/Client.java
+++ b/java/test/src/main/java/test/Ice/info/Client.java
diff --git a/java/test/Ice/info/Server.java b/java/test/src/main/java/test/Ice/info/Server.java
index ebb4046e721..ebb4046e721 100644
--- a/java/test/Ice/info/Server.java
+++ b/java/test/src/main/java/test/Ice/info/Server.java
diff --git a/java/test/Ice/info/Test.ice b/java/test/src/main/java/test/Ice/info/Test.ice
index 55bbc2ce48f..55bbc2ce48f 100644
--- a/java/test/Ice/info/Test.ice
+++ b/java/test/src/main/java/test/Ice/info/Test.ice
diff --git a/java/test/Ice/info/TestI.java b/java/test/src/main/java/test/Ice/info/TestI.java
index 316cf7e438f..316cf7e438f 100644
--- a/java/test/Ice/info/TestI.java
+++ b/java/test/src/main/java/test/Ice/info/TestI.java
diff --git a/java/test/src/main/java/test/Ice/info/run.py b/java/test/src/main/java/test/Ice/info/run.py
new file mode 100755
index 00000000000..d5fe04787c9
--- /dev/null
+++ b/java/test/src/main/java/test/Ice/info/run.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+import os, sys
+
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
+    raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil
+
+TestUtil.clientServerTest()
diff --git a/java/test/Ice/inheritance/AllTests.java b/java/test/src/main/java/test/Ice/inheritance/AllTests.java
index 5a53c6916a1..5a53c6916a1 100644
--- a/java/test/Ice/inheritance/AllTests.java
+++ b/java/test/src/main/java/test/Ice/inheritance/AllTests.java
diff --git a/java/test/Ice/inheritance/CAI.java b/java/test/src/main/java/test/Ice/inheritance/CAI.java
index b867eb6f836..b867eb6f836 100644
--- a/java/test/Ice/inheritance/CAI.java
+++ b/java/test/src/main/java/test/Ice/inheritance/CAI.java
diff --git a/java/test/Ice/inheritance/CBI.java b/java/test/src/main/java/test/Ice/inheritance/CBI.java
index 6f07ec9b167..6f07ec9b167 100644
--- a/java/test/Ice/inheritance/CBI.java
+++ b/java/test/src/main/java/test/Ice/inheritance/CBI.java
diff --git a/java/test/Ice/inheritance/CCI.java b/java/test/src/main/java/test/Ice/inheritance/CCI.java
index 1d88806b959..1d88806b959 100644
--- a/java/test/Ice/inheritance/CCI.java
+++ b/java/test/src/main/java/test/Ice/inheritance/CCI.java
diff --git a/java/test/Ice/inheritance/CDI.java b/java/test/src/main/java/test/Ice/inheritance/CDI.java
index a1ac62fdf14..a1ac62fdf14 100644
--- a/java/test/Ice/inheritance/CDI.java
+++ b/java/test/src/main/java/test/Ice/inheritance/CDI.java
diff --git a/java/test/Ice/inheritance/Client.java b/java/test/src/main/java/test/Ice/inheritance/Client.java
index 1fc5bdb3214..1fc5bdb3214 100644
--- a/java/test/Ice/inheritance/Client.java
+++ b/java/test/src/main/java/test/Ice/inheritance/Client.java
diff --git a/java/test/Ice/inheritance/Collocated.java b/java/test/src/main/java/test/Ice/inheritance/Collocated.java
index 3c92c35545c..3c92c35545c 100644
--- a/java/test/Ice/inheritance/Collocated.java
+++ b/java/test/src/main/java/test/Ice/inheritance/Collocated.java
diff --git a/java/test/Ice/inheritance/IAI.java b/java/test/src/main/java/test/Ice/inheritance/IAI.java
index 6f783f0bc58..6f783f0bc58 100644
--- a/java/test/Ice/inheritance/IAI.java
+++ b/java/test/src/main/java/test/Ice/inheritance/IAI.java
diff --git a/java/test/Ice/inheritance/IB1I.java b/java/test/src/main/java/test/Ice/inheritance/IB1I.java
index 0c1de6cfb99..0c1de6cfb99 100644
--- a/java/test/Ice/inheritance/IB1I.java
+++ b/java/test/src/main/java/test/Ice/inheritance/IB1I.java
diff --git a/java/test/Ice/inheritance/IB2I.java b/java/test/src/main/java/test/Ice/inheritance/IB2I.java
index 07fc2e53baa..07fc2e53baa 100644
--- a/java/test/Ice/inheritance/IB2I.java
+++ b/java/test/src/main/java/test/Ice/inheritance/IB2I.java
diff --git a/java/test/Ice/inheritance/ICI.java b/java/test/src/main/java/test/Ice/inheritance/ICI.java
index 4ff569dbf16..4ff569dbf16 100644
--- a/java/test/Ice/inheritance/ICI.java
+++ b/java/test/src/main/java/test/Ice/inheritance/ICI.java
diff --git a/java/test/Ice/inheritance/InitialI.java b/java/test/src/main/java/test/Ice/inheritance/InitialI.java
index 083314cf62d..083314cf62d 100644
--- a/java/test/Ice/inheritance/InitialI.java
+++ b/java/test/src/main/java/test/Ice/inheritance/InitialI.java
diff --git a/java/test/Ice/inheritance/Server.java b/java/test/src/main/java/test/Ice/inheritance/Server.java
index 7ff0278c2a6..7ff0278c2a6 100644
--- a/java/test/Ice/inheritance/Server.java
+++ b/java/test/src/main/java/test/Ice/inheritance/Server.java
diff --git a/java/test/Ice/inheritance/Test.ice b/java/test/src/main/java/test/Ice/inheritance/Test.ice
index 82d63b5078f..82d63b5078f 100644
--- a/java/test/Ice/inheritance/Test.ice
+++ b/java/test/src/main/java/test/Ice/inheritance/Test.ice
diff --git a/java/test/src/main/java/test/Ice/inheritance/run.py b/java/test/src/main/java/test/Ice/inheritance/run.py
new file mode 100755
index 00000000000..8bb456187d9
--- /dev/null
+++ b/java/test/src/main/java/test/Ice/inheritance/run.py
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+import os, sys
+
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
+    raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil
+
+TestUtil.clientServerTest()
+TestUtil.collocatedTest()
diff --git a/java/test/Ice/interceptor/AMDInterceptorI.java b/java/test/src/main/java/test/Ice/interceptor/AMDInterceptorI.java
index e9cc88a1ba5..e9cc88a1ba5 100644
--- a/java/test/Ice/interceptor/AMDInterceptorI.java
+++ b/java/test/src/main/java/test/Ice/interceptor/AMDInterceptorI.java
diff --git a/java/test/Ice/interceptor/Client.java b/java/test/src/main/java/test/Ice/interceptor/Client.java
index 12c913296b0..12c913296b0 100644
--- a/java/test/Ice/interceptor/Client.java
+++ b/java/test/src/main/java/test/Ice/interceptor/Client.java
diff --git a/java/test/Ice/interceptor/InterceptorI.java b/java/test/src/main/java/test/Ice/interceptor/InterceptorI.java
index 04458722e3a..04458722e3a 100644
--- a/java/test/Ice/interceptor/InterceptorI.java
+++ b/java/test/src/main/java/test/Ice/interceptor/InterceptorI.java
diff --git a/java/test/Ice/interceptor/MyObjectI.java b/java/test/src/main/java/test/Ice/interceptor/MyObjectI.java
index a2c10f04d38..a2c10f04d38 100644
--- a/java/test/Ice/interceptor/MyObjectI.java
+++ b/java/test/src/main/java/test/Ice/interceptor/MyObjectI.java
diff --git a/java/test/Ice/interceptor/MySystemException.java b/java/test/src/main/java/test/Ice/interceptor/MySystemException.java
index ee7bc5a626b..ee7bc5a626b 100644
--- a/java/test/Ice/interceptor/MySystemException.java
+++ b/java/test/src/main/java/test/Ice/interceptor/MySystemException.java
diff --git a/java/test/Ice/interceptor/Test.ice b/java/test/src/main/java/test/Ice/interceptor/Test.ice
index 04c460b8b5e..04c460b8b5e 100644
--- a/java/test/Ice/interceptor/Test.ice
+++ b/java/test/src/main/java/test/Ice/interceptor/Test.ice
diff --git a/java/test/Ice/interceptor/run.py b/java/test/src/main/java/test/Ice/interceptor/run.py
index 91b248967b1..04638dadfa6 100755
--- a/java/test/Ice/interceptor/run.py
+++ b/java/test/src/main/java/test/Ice/interceptor/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/interrupt/AllTests.java b/java/test/src/main/java/test/Ice/interrupt/AllTests.java
index dbc7c159ddd..dbc7c159ddd 100644
--- a/java/test/Ice/interrupt/AllTests.java
+++ b/java/test/src/main/java/test/Ice/interrupt/AllTests.java
diff --git a/java/test/Ice/interrupt/Client.java b/java/test/src/main/java/test/Ice/interrupt/Client.java
index edd6dfaa6ae..edd6dfaa6ae 100644
--- a/java/test/Ice/interrupt/Client.java
+++ b/java/test/src/main/java/test/Ice/interrupt/Client.java
diff --git a/java/test/Ice/interrupt/Collocated.java b/java/test/src/main/java/test/Ice/interrupt/Collocated.java
index 6e164020aee..6e164020aee 100644
--- a/java/test/Ice/interrupt/Collocated.java
+++ b/java/test/src/main/java/test/Ice/interrupt/Collocated.java
diff --git a/java/test/Ice/interrupt/Server.java b/java/test/src/main/java/test/Ice/interrupt/Server.java
index 9ec7a725d77..9ec7a725d77 100644
--- a/java/test/Ice/interrupt/Server.java
+++ b/java/test/src/main/java/test/Ice/interrupt/Server.java
diff --git a/java/test/Ice/interrupt/Test.ice b/java/test/src/main/java/test/Ice/interrupt/Test.ice
index 5ff03302d8e..5ff03302d8e 100644
--- a/java/test/Ice/interrupt/Test.ice
+++ b/java/test/src/main/java/test/Ice/interrupt/Test.ice
diff --git a/java/test/Ice/interrupt/TestControllerI.java b/java/test/src/main/java/test/Ice/interrupt/TestControllerI.java
index c3b9088393f..c3b9088393f 100644
--- a/java/test/Ice/interrupt/TestControllerI.java
+++ b/java/test/src/main/java/test/Ice/interrupt/TestControllerI.java
diff --git a/java/test/Ice/interrupt/TestI.java b/java/test/src/main/java/test/Ice/interrupt/TestI.java
index 35016d42489..35016d42489 100644
--- a/java/test/Ice/interrupt/TestI.java
+++ b/java/test/src/main/java/test/Ice/interrupt/TestI.java
diff --git a/java/test/src/main/java/test/Ice/interrupt/run.py b/java/test/src/main/java/test/Ice/interrupt/run.py
new file mode 100755
index 00000000000..a15d0a9c9e3
--- /dev/null
+++ b/java/test/src/main/java/test/Ice/interrupt/run.py
@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+import os, sys
+
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
+    raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil
+
+print("tests with regular server.")
+TestUtil.clientServerTest()
+
+print("tests with collocated server.")
+TestUtil.collocatedTest()
diff --git a/java/test/Ice/invoke/AllTests.java b/java/test/src/main/java/test/Ice/invoke/AllTests.java
index b22f4027b32..b22f4027b32 100644
--- a/java/test/Ice/invoke/AllTests.java
+++ b/java/test/src/main/java/test/Ice/invoke/AllTests.java
diff --git a/java/test/Ice/invoke/BlobjectAsyncI.java b/java/test/src/main/java/test/Ice/invoke/BlobjectAsyncI.java
index c7e0837b946..c7e0837b946 100644
--- a/java/test/Ice/invoke/BlobjectAsyncI.java
+++ b/java/test/src/main/java/test/Ice/invoke/BlobjectAsyncI.java
diff --git a/java/test/Ice/invoke/BlobjectI.java b/java/test/src/main/java/test/Ice/invoke/BlobjectI.java
index c676c38dc63..c676c38dc63 100644
--- a/java/test/Ice/invoke/BlobjectI.java
+++ b/java/test/src/main/java/test/Ice/invoke/BlobjectI.java
diff --git a/java/test/Ice/invoke/Client.java b/java/test/src/main/java/test/Ice/invoke/Client.java
index e589d32075c..e589d32075c 100644
--- a/java/test/Ice/invoke/Client.java
+++ b/java/test/src/main/java/test/Ice/invoke/Client.java
diff --git a/java/test/Ice/invoke/ServantLocatorI.java b/java/test/src/main/java/test/Ice/invoke/ServantLocatorI.java
index 9ed2262b995..9ed2262b995 100644
--- a/java/test/Ice/invoke/ServantLocatorI.java
+++ b/java/test/src/main/java/test/Ice/invoke/ServantLocatorI.java
diff --git a/java/test/Ice/invoke/Server.java b/java/test/src/main/java/test/Ice/invoke/Server.java
index a6f315d5cf9..a6f315d5cf9 100644
--- a/java/test/Ice/invoke/Server.java
+++ b/java/test/src/main/java/test/Ice/invoke/Server.java
diff --git a/java/test/Ice/invoke/Test.ice b/java/test/src/main/java/test/Ice/invoke/Test.ice
index 6aae90da746..6aae90da746 100644
--- a/java/test/Ice/invoke/Test.ice
+++ b/java/test/src/main/java/test/Ice/invoke/Test.ice
diff --git a/java/test/Ice/invoke/lambda/AllTests.java b/java/test/src/main/java/test/Ice/invoke/lambda/AllTests.java
index 5b7764615a3..5b7764615a3 100644
--- a/java/test/Ice/invoke/lambda/AllTests.java
+++ b/java/test/src/main/java/test/Ice/invoke/lambda/AllTests.java
diff --git a/java/test/Ice/invoke/run.py b/java/test/src/main/java/test/Ice/invoke/run.py
index 7ee3382b0a2..50be82e58ca 100755
--- a/java/test/Ice/invoke/run.py
+++ b/java/test/src/main/java/test/Ice/invoke/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/location/AllTests.java b/java/test/src/main/java/test/Ice/location/AllTests.java
index 636376a0253..636376a0253 100644
--- a/java/test/Ice/location/AllTests.java
+++ b/java/test/src/main/java/test/Ice/location/AllTests.java
diff --git a/java/test/Ice/location/Client.java b/java/test/src/main/java/test/Ice/location/Client.java
index 4fc8e67893b..4fc8e67893b 100644
--- a/java/test/Ice/location/Client.java
+++ b/java/test/src/main/java/test/Ice/location/Client.java
diff --git a/java/test/Ice/location/HelloI.java b/java/test/src/main/java/test/Ice/location/HelloI.java
index 5036d4cbc18..5036d4cbc18 100644
--- a/java/test/Ice/location/HelloI.java
+++ b/java/test/src/main/java/test/Ice/location/HelloI.java
diff --git a/java/test/Ice/location/Server.java b/java/test/src/main/java/test/Ice/location/Server.java
index 4b09338d2ee..4b09338d2ee 100644
--- a/java/test/Ice/location/Server.java
+++ b/java/test/src/main/java/test/Ice/location/Server.java
diff --git a/java/test/Ice/location/ServerLocator.java b/java/test/src/main/java/test/Ice/location/ServerLocator.java
index 0e27e888eb7..0e27e888eb7 100644
--- a/java/test/Ice/location/ServerLocator.java
+++ b/java/test/src/main/java/test/Ice/location/ServerLocator.java
diff --git a/java/test/Ice/location/ServerLocatorRegistry.java b/java/test/src/main/java/test/Ice/location/ServerLocatorRegistry.java
index 7a9fbc50ac8..7a9fbc50ac8 100644
--- a/java/test/Ice/location/ServerLocatorRegistry.java
+++ b/java/test/src/main/java/test/Ice/location/ServerLocatorRegistry.java
diff --git a/java/test/Ice/location/ServerManagerI.java b/java/test/src/main/java/test/Ice/location/ServerManagerI.java
index 2ac89074ad7..2ac89074ad7 100644
--- a/java/test/Ice/location/ServerManagerI.java
+++ b/java/test/src/main/java/test/Ice/location/ServerManagerI.java
diff --git a/java/test/Ice/location/Test.ice b/java/test/src/main/java/test/Ice/location/Test.ice
index f6d0dfd0a94..f6d0dfd0a94 100644
--- a/java/test/Ice/location/Test.ice
+++ b/java/test/src/main/java/test/Ice/location/Test.ice
diff --git a/java/test/Ice/location/TestI.java b/java/test/src/main/java/test/Ice/location/TestI.java
index de3c6213bd7..de3c6213bd7 100644
--- a/java/test/Ice/location/TestI.java
+++ b/java/test/src/main/java/test/Ice/location/TestI.java
diff --git a/java/test/src/main/java/test/Ice/location/run.py b/java/test/src/main/java/test/Ice/location/run.py
new file mode 100755
index 00000000000..d5fe04787c9
--- /dev/null
+++ b/java/test/src/main/java/test/Ice/location/run.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+import os, sys
+
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
+    raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil
+
+TestUtil.clientServerTest()
diff --git a/java/test/Ice/metrics/AMDMetricsI.java b/java/test/src/main/java/test/Ice/metrics/AMDMetricsI.java
index e557e728a4e..e557e728a4e 100644
--- a/java/test/Ice/metrics/AMDMetricsI.java
+++ b/java/test/src/main/java/test/Ice/metrics/AMDMetricsI.java
diff --git a/java/test/Ice/metrics/AMDServer.java b/java/test/src/main/java/test/Ice/metrics/AMDServer.java
index dc559764811..dc559764811 100644
--- a/java/test/Ice/metrics/AMDServer.java
+++ b/java/test/src/main/java/test/Ice/metrics/AMDServer.java
diff --git a/java/test/Ice/metrics/AllTests.java b/java/test/src/main/java/test/Ice/metrics/AllTests.java
index 48d1fdb8a80..48d1fdb8a80 100644
--- a/java/test/Ice/metrics/AllTests.java
+++ b/java/test/src/main/java/test/Ice/metrics/AllTests.java
diff --git a/java/test/Ice/metrics/ChildInvocationObserverI.java b/java/test/src/main/java/test/Ice/metrics/ChildInvocationObserverI.java
index da56f726250..da56f726250 100644
--- a/java/test/Ice/metrics/ChildInvocationObserverI.java
+++ b/java/test/src/main/java/test/Ice/metrics/ChildInvocationObserverI.java
diff --git a/java/test/Ice/metrics/Client.java b/java/test/src/main/java/test/Ice/metrics/Client.java
index 48acc9244b1..48acc9244b1 100644
--- a/java/test/Ice/metrics/Client.java
+++ b/java/test/src/main/java/test/Ice/metrics/Client.java
diff --git a/java/test/Ice/metrics/Collocated.java b/java/test/src/main/java/test/Ice/metrics/Collocated.java
index e1191a4de99..e1191a4de99 100644
--- a/java/test/Ice/metrics/Collocated.java
+++ b/java/test/src/main/java/test/Ice/metrics/Collocated.java
diff --git a/java/test/Ice/metrics/CollocatedObserverI.java b/java/test/src/main/java/test/Ice/metrics/CollocatedObserverI.java
index 607da015366..607da015366 100644
--- a/java/test/Ice/metrics/CollocatedObserverI.java
+++ b/java/test/src/main/java/test/Ice/metrics/CollocatedObserverI.java
diff --git a/java/test/Ice/metrics/CommunicatorObserverI.java b/java/test/src/main/java/test/Ice/metrics/CommunicatorObserverI.java
index 996d5a83b1a..996d5a83b1a 100644
--- a/java/test/Ice/metrics/CommunicatorObserverI.java
+++ b/java/test/src/main/java/test/Ice/metrics/CommunicatorObserverI.java
diff --git a/java/test/Ice/metrics/ConnectionObserverI.java b/java/test/src/main/java/test/Ice/metrics/ConnectionObserverI.java
index 395c31733e9..395c31733e9 100644
--- a/java/test/Ice/metrics/ConnectionObserverI.java
+++ b/java/test/src/main/java/test/Ice/metrics/ConnectionObserverI.java
diff --git a/java/test/Ice/metrics/ControllerI.java b/java/test/src/main/java/test/Ice/metrics/ControllerI.java
index 2f1434d523a..2f1434d523a 100644
--- a/java/test/Ice/metrics/ControllerI.java
+++ b/java/test/src/main/java/test/Ice/metrics/ControllerI.java
diff --git a/java/test/Ice/metrics/DispatchObserverI.java b/java/test/src/main/java/test/Ice/metrics/DispatchObserverI.java
index 43b0683696c..43b0683696c 100644
--- a/java/test/Ice/metrics/DispatchObserverI.java
+++ b/java/test/src/main/java/test/Ice/metrics/DispatchObserverI.java
diff --git a/java/test/Ice/metrics/InvocationObserverI.java b/java/test/src/main/java/test/Ice/metrics/InvocationObserverI.java
index cfb7e2c6547..cfb7e2c6547 100644
--- a/java/test/Ice/metrics/InvocationObserverI.java
+++ b/java/test/src/main/java/test/Ice/metrics/InvocationObserverI.java
diff --git a/java/test/Ice/metrics/MetricsI.java b/java/test/src/main/java/test/Ice/metrics/MetricsI.java
index 51f10fd2661..51f10fd2661 100644
--- a/java/test/Ice/metrics/MetricsI.java
+++ b/java/test/src/main/java/test/Ice/metrics/MetricsI.java
diff --git a/java/test/Ice/metrics/ObserverI.java b/java/test/src/main/java/test/Ice/metrics/ObserverI.java
index 1dadf4d63d8..1dadf4d63d8 100644
--- a/java/test/Ice/metrics/ObserverI.java
+++ b/java/test/src/main/java/test/Ice/metrics/ObserverI.java
diff --git a/java/test/Ice/metrics/RemoveObserverI.java b/java/test/src/main/java/test/Ice/metrics/RemoveObserverI.java
index 6a5ad4817db..6a5ad4817db 100644
--- a/java/test/Ice/metrics/RemoveObserverI.java
+++ b/java/test/src/main/java/test/Ice/metrics/RemoveObserverI.java
diff --git a/java/test/Ice/metrics/Server.java b/java/test/src/main/java/test/Ice/metrics/Server.java
index 70788ea876f..70788ea876f 100644
--- a/java/test/Ice/metrics/Server.java
+++ b/java/test/src/main/java/test/Ice/metrics/Server.java
diff --git a/java/test/Ice/metrics/Test.ice b/java/test/src/main/java/test/Ice/metrics/Test.ice
index 41930f8c10a..41930f8c10a 100644
--- a/java/test/Ice/metrics/Test.ice
+++ b/java/test/src/main/java/test/Ice/metrics/Test.ice
diff --git a/java/test/Ice/metrics/TestAMD.ice b/java/test/src/main/java/test/Ice/metrics/TestAMD.ice
index 0a9bf0209a9..0a9bf0209a9 100644
--- a/java/test/Ice/metrics/TestAMD.ice
+++ b/java/test/src/main/java/test/Ice/metrics/TestAMD.ice
diff --git a/java/test/Ice/metrics/ThreadObserverI.java b/java/test/src/main/java/test/Ice/metrics/ThreadObserverI.java
index af24dfd7df1..af24dfd7df1 100644
--- a/java/test/Ice/metrics/ThreadObserverI.java
+++ b/java/test/src/main/java/test/Ice/metrics/ThreadObserverI.java
diff --git a/java/test/Ice/metrics/run.py b/java/test/src/main/java/test/Ice/metrics/run.py
index 208d9fce41e..7254e6ab696 100755
--- a/java/test/Ice/metrics/run.py
+++ b/java/test/src/main/java/test/Ice/metrics/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/networkProxy/AllTests.java b/java/test/src/main/java/test/Ice/networkProxy/AllTests.java
index f0b53afd8c3..f0b53afd8c3 100644
--- a/java/test/Ice/networkProxy/AllTests.java
+++ b/java/test/src/main/java/test/Ice/networkProxy/AllTests.java
diff --git a/java/test/Ice/networkProxy/Client.java b/java/test/src/main/java/test/Ice/networkProxy/Client.java
index 411b276ac9a..411b276ac9a 100644
--- a/java/test/Ice/networkProxy/Client.java
+++ b/java/test/src/main/java/test/Ice/networkProxy/Client.java
diff --git a/java/test/Ice/networkProxy/Server.java b/java/test/src/main/java/test/Ice/networkProxy/Server.java
index fe6e7c04ea9..fe6e7c04ea9 100644
--- a/java/test/Ice/networkProxy/Server.java
+++ b/java/test/src/main/java/test/Ice/networkProxy/Server.java
diff --git a/java/test/Ice/networkProxy/Test.ice b/java/test/src/main/java/test/Ice/networkProxy/Test.ice
index 3e084d8a65e..3e084d8a65e 100644
--- a/java/test/Ice/networkProxy/Test.ice
+++ b/java/test/src/main/java/test/Ice/networkProxy/Test.ice
diff --git a/java/test/Ice/networkProxy/run.py b/java/test/src/main/java/test/Ice/networkProxy/run.py
index 0a9814c4a28..766bcb373f6 100755
--- a/java/test/Ice/networkProxy/run.py
+++ b/java/test/src/main/java/test/Ice/networkProxy/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/objects/AllTests.java b/java/test/src/main/java/test/Ice/objects/AllTests.java
index ab43e76c368..ab43e76c368 100644
--- a/java/test/Ice/objects/AllTests.java
+++ b/java/test/src/main/java/test/Ice/objects/AllTests.java
diff --git a/java/test/Ice/objects/BI.java b/java/test/src/main/java/test/Ice/objects/BI.java
index 09aebe13501..09aebe13501 100644
--- a/java/test/Ice/objects/BI.java
+++ b/java/test/src/main/java/test/Ice/objects/BI.java
diff --git a/java/test/Ice/objects/CI.java b/java/test/src/main/java/test/Ice/objects/CI.java
index f46501a241c..f46501a241c 100644
--- a/java/test/Ice/objects/CI.java
+++ b/java/test/src/main/java/test/Ice/objects/CI.java
diff --git a/java/test/Ice/objects/Client.java b/java/test/src/main/java/test/Ice/objects/Client.java
index 3d9f3803bc5..3d9f3803bc5 100644
--- a/java/test/Ice/objects/Client.java
+++ b/java/test/src/main/java/test/Ice/objects/Client.java
diff --git a/java/test/Ice/objects/Collocated.java b/java/test/src/main/java/test/Ice/objects/Collocated.java
index 06d1f4bf5fd..06d1f4bf5fd 100644
--- a/java/test/Ice/objects/Collocated.java
+++ b/java/test/src/main/java/test/Ice/objects/Collocated.java
diff --git a/java/test/Ice/objects/DI.java b/java/test/src/main/java/test/Ice/objects/DI.java
index 660efcd277c..660efcd277c 100644
--- a/java/test/Ice/objects/DI.java
+++ b/java/test/src/main/java/test/Ice/objects/DI.java
diff --git a/java/test/Ice/objects/EI.java b/java/test/src/main/java/test/Ice/objects/EI.java
index e4930e1644d..e4930e1644d 100644
--- a/java/test/Ice/objects/EI.java
+++ b/java/test/src/main/java/test/Ice/objects/EI.java
diff --git a/java/test/Ice/objects/FI.java b/java/test/src/main/java/test/Ice/objects/FI.java
index d51461c8031..d51461c8031 100644
--- a/java/test/Ice/objects/FI.java
+++ b/java/test/src/main/java/test/Ice/objects/FI.java
diff --git a/java/test/Ice/objects/HI.java b/java/test/src/main/java/test/Ice/objects/HI.java
index e41ec794c82..e41ec794c82 100644
--- a/java/test/Ice/objects/HI.java
+++ b/java/test/src/main/java/test/Ice/objects/HI.java
diff --git a/java/test/Ice/objects/II.java b/java/test/src/main/java/test/Ice/objects/II.java
index 8061d20e2cd..8061d20e2cd 100644
--- a/java/test/Ice/objects/II.java
+++ b/java/test/src/main/java/test/Ice/objects/II.java
diff --git a/java/test/Ice/objects/InitialI.java b/java/test/src/main/java/test/Ice/objects/InitialI.java
index eaa1be7785b..eaa1be7785b 100644
--- a/java/test/Ice/objects/InitialI.java
+++ b/java/test/src/main/java/test/Ice/objects/InitialI.java
diff --git a/java/test/Ice/objects/JI.java b/java/test/src/main/java/test/Ice/objects/JI.java
index ff82d0dac25..ff82d0dac25 100644
--- a/java/test/Ice/objects/JI.java
+++ b/java/test/src/main/java/test/Ice/objects/JI.java
diff --git a/java/test/Ice/objects/Server.java b/java/test/src/main/java/test/Ice/objects/Server.java
index d327e7d5b53..d327e7d5b53 100644
--- a/java/test/Ice/objects/Server.java
+++ b/java/test/src/main/java/test/Ice/objects/Server.java
diff --git a/java/test/Ice/objects/Test.ice b/java/test/src/main/java/test/Ice/objects/Test.ice
index d4644b11a64..d4644b11a64 100644
--- a/java/test/Ice/objects/Test.ice
+++ b/java/test/src/main/java/test/Ice/objects/Test.ice
diff --git a/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java b/java/test/src/main/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java
index f9b0e8deb7a..f9b0e8deb7a 100644
--- a/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java
+++ b/java/test/src/main/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java
diff --git a/java/test/Ice/objects/run.py b/java/test/src/main/java/test/Ice/objects/run.py
index f4d2befc202..89d67e015aa 100755
--- a/java/test/Ice/objects/run.py
+++ b/java/test/src/main/java/test/Ice/objects/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/operations/AMDMyDerivedClassI.java b/java/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java
index f577db345c1..f577db345c1 100644
--- a/java/test/Ice/operations/AMDMyDerivedClassI.java
+++ b/java/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java
diff --git a/java/test/Ice/operations/AMDServer.java b/java/test/src/main/java/test/Ice/operations/AMDServer.java
index 063af513e84..063af513e84 100644
--- a/java/test/Ice/operations/AMDServer.java
+++ b/java/test/src/main/java/test/Ice/operations/AMDServer.java
diff --git a/java/test/Ice/operations/AMDTieMyDerivedClassI.java b/java/test/src/main/java/test/Ice/operations/AMDTieMyDerivedClassI.java
index 8d2e26b48d1..8d2e26b48d1 100644
--- a/java/test/Ice/operations/AMDTieMyDerivedClassI.java
+++ b/java/test/src/main/java/test/Ice/operations/AMDTieMyDerivedClassI.java
diff --git a/java/test/Ice/operations/AMDTieServer.java b/java/test/src/main/java/test/Ice/operations/AMDTieServer.java
index af88539eb00..af88539eb00 100644
--- a/java/test/Ice/operations/AMDTieServer.java
+++ b/java/test/src/main/java/test/Ice/operations/AMDTieServer.java
diff --git a/java/test/Ice/operations/AllTests.java b/java/test/src/main/java/test/Ice/operations/AllTests.java
index b89c85f3745..b89c85f3745 100644
--- a/java/test/Ice/operations/AllTests.java
+++ b/java/test/src/main/java/test/Ice/operations/AllTests.java
diff --git a/java/test/Ice/operations/BatchOneways.java b/java/test/src/main/java/test/Ice/operations/BatchOneways.java
index fc20955e9d2..fc20955e9d2 100644
--- a/java/test/Ice/operations/BatchOneways.java
+++ b/java/test/src/main/java/test/Ice/operations/BatchOneways.java
diff --git a/java/test/Ice/operations/BatchOnewaysAMI.java b/java/test/src/main/java/test/Ice/operations/BatchOnewaysAMI.java
index f11df72b019..f11df72b019 100644
--- a/java/test/Ice/operations/BatchOnewaysAMI.java
+++ b/java/test/src/main/java/test/Ice/operations/BatchOnewaysAMI.java
diff --git a/java/test/Ice/operations/Client.java b/java/test/src/main/java/test/Ice/operations/Client.java
index 2c957a13e34..2c957a13e34 100644
--- a/java/test/Ice/operations/Client.java
+++ b/java/test/src/main/java/test/Ice/operations/Client.java
diff --git a/java/test/Ice/operations/Collocated.java b/java/test/src/main/java/test/Ice/operations/Collocated.java
index ecfab090c8c..ecfab090c8c 100644
--- a/java/test/Ice/operations/Collocated.java
+++ b/java/test/src/main/java/test/Ice/operations/Collocated.java
diff --git a/java/test/Ice/operations/MyDerivedClassI.java b/java/test/src/main/java/test/Ice/operations/MyDerivedClassI.java
index 5fddb73a3d5..5fddb73a3d5 100644
--- a/java/test/Ice/operations/MyDerivedClassI.java
+++ b/java/test/src/main/java/test/Ice/operations/MyDerivedClassI.java
diff --git a/java/test/Ice/operations/Oneways.java b/java/test/src/main/java/test/Ice/operations/Oneways.java
index ded8ee39b3d..ded8ee39b3d 100644
--- a/java/test/Ice/operations/Oneways.java
+++ b/java/test/src/main/java/test/Ice/operations/Oneways.java
diff --git a/java/test/Ice/operations/OnewaysAMI.java b/java/test/src/main/java/test/Ice/operations/OnewaysAMI.java
index dfaca37f114..dfaca37f114 100644
--- a/java/test/Ice/operations/OnewaysAMI.java
+++ b/java/test/src/main/java/test/Ice/operations/OnewaysAMI.java
diff --git a/java/test/Ice/operations/Server.java b/java/test/src/main/java/test/Ice/operations/Server.java
index 22dba1da02b..22dba1da02b 100644
--- a/java/test/Ice/operations/Server.java
+++ b/java/test/src/main/java/test/Ice/operations/Server.java
diff --git a/java/test/Ice/operations/Test.ice b/java/test/src/main/java/test/Ice/operations/Test.ice
index 38ab55f5909..38ab55f5909 100644
--- a/java/test/Ice/operations/Test.ice
+++ b/java/test/src/main/java/test/Ice/operations/Test.ice
diff --git a/java/test/Ice/operations/TestAMD.ice b/java/test/src/main/java/test/Ice/operations/TestAMD.ice
index edcb970b236..edcb970b236 100644
--- a/java/test/Ice/operations/TestAMD.ice
+++ b/java/test/src/main/java/test/Ice/operations/TestAMD.ice
diff --git a/java/test/Ice/operations/TieMyDerivedClassI.java b/java/test/src/main/java/test/Ice/operations/TieMyDerivedClassI.java
index cbd7a833f15..cbd7a833f15 100644
--- a/java/test/Ice/operations/TieMyDerivedClassI.java
+++ b/java/test/src/main/java/test/Ice/operations/TieMyDerivedClassI.java
diff --git a/java/test/Ice/operations/TieServer.java b/java/test/src/main/java/test/Ice/operations/TieServer.java
index 26bbdc7b7b5..26bbdc7b7b5 100644
--- a/java/test/Ice/operations/TieServer.java
+++ b/java/test/src/main/java/test/Ice/operations/TieServer.java
diff --git a/java/test/Ice/operations/Twoways.java b/java/test/src/main/java/test/Ice/operations/Twoways.java
index c148edddb0e..c148edddb0e 100644
--- a/java/test/Ice/operations/Twoways.java
+++ b/java/test/src/main/java/test/Ice/operations/Twoways.java
diff --git a/java/test/Ice/operations/TwowaysAMI.java b/java/test/src/main/java/test/Ice/operations/TwowaysAMI.java
index 70e1a6566a0..70e1a6566a0 100644
--- a/java/test/Ice/operations/TwowaysAMI.java
+++ b/java/test/src/main/java/test/Ice/operations/TwowaysAMI.java
diff --git a/java/test/Ice/operations/lambda/OnewaysLambdaAMI.java b/java/test/src/main/java/test/Ice/operations/lambda/OnewaysLambdaAMI.java
index d5885bb2b31..d5885bb2b31 100644
--- a/java/test/Ice/operations/lambda/OnewaysLambdaAMI.java
+++ b/java/test/src/main/java/test/Ice/operations/lambda/OnewaysLambdaAMI.java
diff --git a/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java b/java/test/src/main/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java
index 81f4dcb321e..81f4dcb321e 100644
--- a/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java
+++ b/java/test/src/main/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java
diff --git a/java/test/Ice/operations/run.py b/java/test/src/main/java/test/Ice/operations/run.py
index 763a077b77d..4a622e6a75e 100755
--- a/java/test/Ice/operations/run.py
+++ b/java/test/src/main/java/test/Ice/operations/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/optional/AMDInitialI.java b/java/test/src/main/java/test/Ice/optional/AMDInitialI.java
index d47104d792d..d47104d792d 100644
--- a/java/test/Ice/optional/AMDInitialI.java
+++ b/java/test/src/main/java/test/Ice/optional/AMDInitialI.java
diff --git a/java/test/Ice/optional/AMDServer.java b/java/test/src/main/java/test/Ice/optional/AMDServer.java
index b05e5b28f3c..b05e5b28f3c 100644
--- a/java/test/Ice/optional/AMDServer.java
+++ b/java/test/src/main/java/test/Ice/optional/AMDServer.java
diff --git a/java/test/Ice/optional/AllTests.java b/java/test/src/main/java/test/Ice/optional/AllTests.java
index 0665eec3252..0665eec3252 100644
--- a/java/test/Ice/optional/AllTests.java
+++ b/java/test/src/main/java/test/Ice/optional/AllTests.java
diff --git a/java/test/Ice/optional/Client.java b/java/test/src/main/java/test/Ice/optional/Client.java
index 22f05e262bc..22f05e262bc 100644
--- a/java/test/Ice/optional/Client.java
+++ b/java/test/src/main/java/test/Ice/optional/Client.java
diff --git a/java/test/Ice/optional/InitialI.java b/java/test/src/main/java/test/Ice/optional/InitialI.java
index 191575aa992..191575aa992 100644
--- a/java/test/Ice/optional/InitialI.java
+++ b/java/test/src/main/java/test/Ice/optional/InitialI.java
diff --git a/java/test/Ice/optional/SerializableClass.java b/java/test/src/main/java/test/Ice/optional/SerializableClass.java
index 1d29516c246..1d29516c246 100644
--- a/java/test/Ice/optional/SerializableClass.java
+++ b/java/test/src/main/java/test/Ice/optional/SerializableClass.java
diff --git a/java/test/Ice/optional/Server.java b/java/test/src/main/java/test/Ice/optional/Server.java
index 15446ac47b5..15446ac47b5 100644
--- a/java/test/Ice/optional/Server.java
+++ b/java/test/src/main/java/test/Ice/optional/Server.java
diff --git a/java/test/Ice/optional/Test.ice b/java/test/src/main/java/test/Ice/optional/Test.ice
index 96078ca538a..96078ca538a 100644
--- a/java/test/Ice/optional/Test.ice
+++ b/java/test/src/main/java/test/Ice/optional/Test.ice
diff --git a/java/test/Ice/optional/TestAMD.ice b/java/test/src/main/java/test/Ice/optional/TestAMD.ice
index 95a283116dd..95a283116dd 100644
--- a/java/test/Ice/optional/TestAMD.ice
+++ b/java/test/src/main/java/test/Ice/optional/TestAMD.ice
diff --git a/java/test/Ice/optional/lambda/AllTests.java b/java/test/src/main/java/test/Ice/optional/lambda/AllTests.java
index db9fce3f89d..db9fce3f89d 100644
--- a/java/test/Ice/optional/lambda/AllTests.java
+++ b/java/test/src/main/java/test/Ice/optional/lambda/AllTests.java
diff --git a/java/test/Ice/optional/run.py b/java/test/src/main/java/test/Ice/optional/run.py
index ab465630065..db4121d4784 100755
--- a/java/test/Ice/optional/run.py
+++ b/java/test/src/main/java/test/Ice/optional/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/packagemd/AllTests.java b/java/test/src/main/java/test/Ice/packagemd/AllTests.java
index 564bbebbded..564bbebbded 100644
--- a/java/test/Ice/packagemd/AllTests.java
+++ b/java/test/src/main/java/test/Ice/packagemd/AllTests.java
diff --git a/java/test/Ice/packagemd/Client.java b/java/test/src/main/java/test/Ice/packagemd/Client.java
index 8081a790e76..8081a790e76 100644
--- a/java/test/Ice/packagemd/Client.java
+++ b/java/test/src/main/java/test/Ice/packagemd/Client.java
diff --git a/java/test/Ice/packagemd/InitialI.java b/java/test/src/main/java/test/Ice/packagemd/InitialI.java
index 6d4d4fbaf96..6d4d4fbaf96 100644
--- a/java/test/Ice/packagemd/InitialI.java
+++ b/java/test/src/main/java/test/Ice/packagemd/InitialI.java
diff --git a/java/test/Ice/packagemd/NoPackage.ice b/java/test/src/main/java/test/Ice/packagemd/NoPackage.ice
index aa870ce5814..aa870ce5814 100644
--- a/java/test/Ice/packagemd/NoPackage.ice
+++ b/java/test/src/main/java/test/Ice/packagemd/NoPackage.ice
diff --git a/java/test/Ice/packagemd/Package.ice b/java/test/src/main/java/test/Ice/packagemd/Package.ice
index e962c55aea7..e962c55aea7 100644
--- a/java/test/Ice/packagemd/Package.ice
+++ b/java/test/src/main/java/test/Ice/packagemd/Package.ice
diff --git a/java/test/Ice/packagemd/Server.java b/java/test/src/main/java/test/Ice/packagemd/Server.java
index 61bbb0dd2c6..61bbb0dd2c6 100644
--- a/java/test/Ice/packagemd/Server.java
+++ b/java/test/src/main/java/test/Ice/packagemd/Server.java
diff --git a/java/test/Ice/packagemd/Test.ice b/java/test/src/main/java/test/Ice/packagemd/Test.ice
index c90179c6b11..c90179c6b11 100644
--- a/java/test/Ice/packagemd/Test.ice
+++ b/java/test/src/main/java/test/Ice/packagemd/Test.ice
diff --git a/java/test/src/main/java/test/Ice/packagemd/run.py b/java/test/src/main/java/test/Ice/packagemd/run.py
new file mode 100755
index 00000000000..d5fe04787c9
--- /dev/null
+++ b/java/test/src/main/java/test/Ice/packagemd/run.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+import os, sys
+
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
+    raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil
+
+TestUtil.clientServerTest()
diff --git a/java/test/Ice/plugin/Client.java b/java/test/src/main/java/test/Ice/plugin/Client.java
index 096f8d18a35..096f8d18a35 100644
--- a/java/test/Ice/plugin/Client.java
+++ b/java/test/src/main/java/test/Ice/plugin/Client.java
diff --git a/java/test/Ice/plugin/plugins/BasePlugin.java b/java/test/src/main/java/test/Ice/plugin/plugins/BasePlugin.java
index 9ca8dbf3830..9ca8dbf3830 100644
--- a/java/test/Ice/plugin/plugins/BasePlugin.java
+++ b/java/test/src/main/java/test/Ice/plugin/plugins/BasePlugin.java
diff --git a/java/test/Ice/plugin/plugins/BasePluginFail.java b/java/test/src/main/java/test/Ice/plugin/plugins/BasePluginFail.java
index 863214bf8ab..863214bf8ab 100644
--- a/java/test/Ice/plugin/plugins/BasePluginFail.java
+++ b/java/test/src/main/java/test/Ice/plugin/plugins/BasePluginFail.java
diff --git a/java/test/Ice/plugin/plugins/PluginFactory.java b/java/test/src/main/java/test/Ice/plugin/plugins/PluginFactory.java
index 02e8ad76d7e..02e8ad76d7e 100644
--- a/java/test/Ice/plugin/plugins/PluginFactory.java
+++ b/java/test/src/main/java/test/Ice/plugin/plugins/PluginFactory.java
diff --git a/java/test/Ice/plugin/plugins/PluginInitializeFailException.java b/java/test/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailException.java
index d5bc41ca5d0..d5bc41ca5d0 100644
--- a/java/test/Ice/plugin/plugins/PluginInitializeFailException.java
+++ b/java/test/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailException.java
diff --git a/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java b/java/test/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java
index a2f419ebecb..a2f419ebecb 100644
--- a/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java
+++ b/java/test/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java
diff --git a/java/test/Ice/plugin/plugins/PluginOneFactory.java b/java/test/src/main/java/test/Ice/plugin/plugins/PluginOneFactory.java
index b4895874772..b4895874772 100644
--- a/java/test/Ice/plugin/plugins/PluginOneFactory.java
+++ b/java/test/src/main/java/test/Ice/plugin/plugins/PluginOneFactory.java
diff --git a/java/test/Ice/plugin/plugins/PluginOneFailFactory.java b/java/test/src/main/java/test/Ice/plugin/plugins/PluginOneFailFactory.java
index 5fd118de41e..5fd118de41e 100644
--- a/java/test/Ice/plugin/plugins/PluginOneFailFactory.java
+++ b/java/test/src/main/java/test/Ice/plugin/plugins/PluginOneFailFactory.java
diff --git a/java/test/Ice/plugin/plugins/PluginThreeFactory.java b/java/test/src/main/java/test/Ice/plugin/plugins/PluginThreeFactory.java
index 6fa993b414f..6fa993b414f 100644
--- a/java/test/Ice/plugin/plugins/PluginThreeFactory.java
+++ b/java/test/src/main/java/test/Ice/plugin/plugins/PluginThreeFactory.java
diff --git a/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java b/java/test/src/main/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java
index bc5e4cc0be1..bc5e4cc0be1 100644
--- a/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java
+++ b/java/test/src/main/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java
diff --git a/java/test/Ice/plugin/plugins/PluginTwoFactory.java b/java/test/src/main/java/test/Ice/plugin/plugins/PluginTwoFactory.java
index ecab2ba5222..ecab2ba5222 100644
--- a/java/test/Ice/plugin/plugins/PluginTwoFactory.java
+++ b/java/test/src/main/java/test/Ice/plugin/plugins/PluginTwoFactory.java
diff --git a/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java b/java/test/src/main/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java
index 1b5ee8fb4af..1b5ee8fb4af 100644
--- a/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java
+++ b/java/test/src/main/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java
diff --git a/java/test/Ice/plugin/run.py b/java/test/src/main/java/test/Ice/plugin/run.py
index c886fc23c12..2b0bccd6c23 100755
--- a/java/test/Ice/plugin/run.py
+++ b/java/test/src/main/java/test/Ice/plugin/run.py
@@ -10,9 +10,8 @@
 
 import os, sys
 
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/properties/Client.java b/java/test/src/main/java/test/Ice/properties/Client.java
index 4b2571e185c..4b2571e185c 100644
--- a/java/test/Ice/properties/Client.java
+++ b/java/test/src/main/java/test/Ice/properties/Client.java
diff --git a/java/test/Ice/properties/config/.gitignore b/java/test/src/main/java/test/Ice/properties/config/.gitignore
index 143c64680f3..143c64680f3 100644
--- a/java/test/Ice/properties/config/.gitignore
+++ b/java/test/src/main/java/test/Ice/properties/config/.gitignore
diff --git a/java/test/Ice/properties/config/config.1 b/java/test/src/main/java/test/Ice/properties/config/config.1
index 2a20653e4c5..2a20653e4c5 100644
--- a/java/test/Ice/properties/config/config.1
+++ b/java/test/src/main/java/test/Ice/properties/config/config.1
diff --git a/java/test/Ice/properties/config/config.2 b/java/test/src/main/java/test/Ice/properties/config/config.2
index be276df6602..be276df6602 100644
--- a/java/test/Ice/properties/config/config.2
+++ b/java/test/src/main/java/test/Ice/properties/config/config.2
diff --git a/java/test/Ice/properties/config/config.3 b/java/test/src/main/java/test/Ice/properties/config/config.3
index 55c1e1123f6..55c1e1123f6 100644
--- a/java/test/Ice/properties/config/config.3
+++ b/java/test/src/main/java/test/Ice/properties/config/config.3
diff --git a/java/test/Ice/properties/config/escapes.cfg b/java/test/src/main/java/test/Ice/properties/config/escapes.cfg
index f438d2b59c8..f438d2b59c8 100644
--- a/java/test/Ice/properties/config/escapes.cfg
+++ b/java/test/src/main/java/test/Ice/properties/config/escapes.cfg
diff --git a/java/test/Ice/properties/run.py b/java/test/src/main/java/test/Ice/properties/run.py
index ba394336fdf..034d0abef9d 100755
--- a/java/test/Ice/properties/run.py
+++ b/java/test/src/main/java/test/Ice/properties/run.py
@@ -11,7 +11,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/proxy/AMDMyDerivedClassI.java b/java/test/src/main/java/test/Ice/proxy/AMDMyDerivedClassI.java
index 5cf41db2870..5cf41db2870 100644
--- a/java/test/Ice/proxy/AMDMyDerivedClassI.java
+++ b/java/test/src/main/java/test/Ice/proxy/AMDMyDerivedClassI.java
diff --git a/java/test/Ice/proxy/AMDServer.java b/java/test/src/main/java/test/Ice/proxy/AMDServer.java
index 3629cf905b0..3629cf905b0 100644
--- a/java/test/Ice/proxy/AMDServer.java
+++ b/java/test/src/main/java/test/Ice/proxy/AMDServer.java
diff --git a/java/test/Ice/proxy/AllTests.java b/java/test/src/main/java/test/Ice/proxy/AllTests.java
index 98e3c124fbb..98e3c124fbb 100644
--- a/java/test/Ice/proxy/AllTests.java
+++ b/java/test/src/main/java/test/Ice/proxy/AllTests.java
diff --git a/java/test/Ice/proxy/Client.java b/java/test/src/main/java/test/Ice/proxy/Client.java
index 1ad397216c9..1ad397216c9 100644
--- a/java/test/Ice/proxy/Client.java
+++ b/java/test/src/main/java/test/Ice/proxy/Client.java
diff --git a/java/test/Ice/proxy/Collocated.java b/java/test/src/main/java/test/Ice/proxy/Collocated.java
index 26e71003545..26e71003545 100644
--- a/java/test/Ice/proxy/Collocated.java
+++ b/java/test/src/main/java/test/Ice/proxy/Collocated.java
diff --git a/java/test/Ice/proxy/MyDerivedClassI.java b/java/test/src/main/java/test/Ice/proxy/MyDerivedClassI.java
index 35cc76794c0..35cc76794c0 100644
--- a/java/test/Ice/proxy/MyDerivedClassI.java
+++ b/java/test/src/main/java/test/Ice/proxy/MyDerivedClassI.java
diff --git a/java/test/Ice/proxy/Server.java b/java/test/src/main/java/test/Ice/proxy/Server.java
index ae09627cfe5..ae09627cfe5 100644
--- a/java/test/Ice/proxy/Server.java
+++ b/java/test/src/main/java/test/Ice/proxy/Server.java
diff --git a/java/test/Ice/proxy/Test.ice b/java/test/src/main/java/test/Ice/proxy/Test.ice
index be3393a11a6..be3393a11a6 100644
--- a/java/test/Ice/proxy/Test.ice
+++ b/java/test/src/main/java/test/Ice/proxy/Test.ice
diff --git a/java/test/Ice/proxy/TestAMD.ice b/java/test/src/main/java/test/Ice/proxy/TestAMD.ice
index c95dd99bd9a..c95dd99bd9a 100644
--- a/java/test/Ice/proxy/TestAMD.ice
+++ b/java/test/src/main/java/test/Ice/proxy/TestAMD.ice
diff --git a/java/test/Ice/proxy/run.py b/java/test/src/main/java/test/Ice/proxy/run.py
index 3fb660be2cb..c013796c45b 100755
--- a/java/test/Ice/proxy/run.py
+++ b/java/test/src/main/java/test/Ice/proxy/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/retry/AllTests.java b/java/test/src/main/java/test/Ice/retry/AllTests.java
index 2552f593dd0..2552f593dd0 100644
--- a/java/test/Ice/retry/AllTests.java
+++ b/java/test/src/main/java/test/Ice/retry/AllTests.java
diff --git a/java/test/Ice/retry/Client.java b/java/test/src/main/java/test/Ice/retry/Client.java
index f26a2b43eca..f26a2b43eca 100644
--- a/java/test/Ice/retry/Client.java
+++ b/java/test/src/main/java/test/Ice/retry/Client.java
diff --git a/java/test/Ice/retry/Collocated.java b/java/test/src/main/java/test/Ice/retry/Collocated.java
index 9a49ec6f991..9a49ec6f991 100644
--- a/java/test/Ice/retry/Collocated.java
+++ b/java/test/src/main/java/test/Ice/retry/Collocated.java
diff --git a/java/test/Ice/retry/Instrumentation.java b/java/test/src/main/java/test/Ice/retry/Instrumentation.java
index 609a8225ef2..609a8225ef2 100644
--- a/java/test/Ice/retry/Instrumentation.java
+++ b/java/test/src/main/java/test/Ice/retry/Instrumentation.java
diff --git a/java/test/Ice/retry/RetryI.java b/java/test/src/main/java/test/Ice/retry/RetryI.java
index f2afcc881dd..f2afcc881dd 100644
--- a/java/test/Ice/retry/RetryI.java
+++ b/java/test/src/main/java/test/Ice/retry/RetryI.java
diff --git a/java/test/Ice/retry/Server.java b/java/test/src/main/java/test/Ice/retry/Server.java
index 678839b36a5..678839b36a5 100644
--- a/java/test/Ice/retry/Server.java
+++ b/java/test/src/main/java/test/Ice/retry/Server.java
diff --git a/java/test/Ice/retry/SystemFailure.java b/java/test/src/main/java/test/Ice/retry/SystemFailure.java
index fc03b8e6f82..fc03b8e6f82 100644
--- a/java/test/Ice/retry/SystemFailure.java
+++ b/java/test/src/main/java/test/Ice/retry/SystemFailure.java
diff --git a/java/test/Ice/retry/Test.ice b/java/test/src/main/java/test/Ice/retry/Test.ice
index 0e1be095f41..0e1be095f41 100644
--- a/java/test/Ice/retry/Test.ice
+++ b/java/test/src/main/java/test/Ice/retry/Test.ice
diff --git a/java/test/src/main/java/test/Ice/retry/run.py b/java/test/src/main/java/test/Ice/retry/run.py
new file mode 100755
index 00000000000..6444a527f9a
--- /dev/null
+++ b/java/test/src/main/java/test/Ice/retry/run.py
@@ -0,0 +1,27 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+import os, sys
+
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
+    raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil
+
+print("tests with regular server.")
+TestUtil.clientServerTest()
+print("tests with collocated server.")
+TestUtil.collocatedTest()
diff --git a/java/test/Ice/seqMapping/AMDMyClassI.java b/java/test/src/main/java/test/Ice/seqMapping/AMDMyClassI.java
index 49ee338fc1d..49ee338fc1d 100644
--- a/java/test/Ice/seqMapping/AMDMyClassI.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/AMDMyClassI.java
diff --git a/java/test/Ice/seqMapping/AMDServer.java b/java/test/src/main/java/test/Ice/seqMapping/AMDServer.java
index 5c3e9bc5fc0..5c3e9bc5fc0 100644
--- a/java/test/Ice/seqMapping/AMDServer.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/AMDServer.java
diff --git a/java/test/Ice/seqMapping/AllTests.java b/java/test/src/main/java/test/Ice/seqMapping/AllTests.java
index 546de84ae74..546de84ae74 100644
--- a/java/test/Ice/seqMapping/AllTests.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/AllTests.java
diff --git a/java/test/Ice/seqMapping/Client.java b/java/test/src/main/java/test/Ice/seqMapping/Client.java
index 2124aefda4d..2124aefda4d 100644
--- a/java/test/Ice/seqMapping/Client.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/Client.java
diff --git a/java/test/Ice/seqMapping/Collocated.java b/java/test/src/main/java/test/Ice/seqMapping/Collocated.java
index bafcdce6b20..bafcdce6b20 100644
--- a/java/test/Ice/seqMapping/Collocated.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/Collocated.java
diff --git a/java/test/Ice/seqMapping/MyClassI.java b/java/test/src/main/java/test/Ice/seqMapping/MyClassI.java
index f0a2505be21..f0a2505be21 100644
--- a/java/test/Ice/seqMapping/MyClassI.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/MyClassI.java
diff --git a/java/test/Ice/seqMapping/Serialize/Large.java b/java/test/src/main/java/test/Ice/seqMapping/Serialize/Large.java
index 3b6e3edd327..3b6e3edd327 100644
--- a/java/test/Ice/seqMapping/Serialize/Large.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/Serialize/Large.java
diff --git a/java/test/Ice/seqMapping/Serialize/Small.java b/java/test/src/main/java/test/Ice/seqMapping/Serialize/Small.java
index 3503c5415b5..3503c5415b5 100644
--- a/java/test/Ice/seqMapping/Serialize/Small.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/Serialize/Small.java
diff --git a/java/test/Ice/seqMapping/Serialize/SmallHolder.java b/java/test/src/main/java/test/Ice/seqMapping/Serialize/SmallHolder.java
index f2f01a4805c..f2f01a4805c 100644
--- a/java/test/Ice/seqMapping/Serialize/SmallHolder.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/Serialize/SmallHolder.java
diff --git a/java/test/Ice/seqMapping/Serialize/Struct.java b/java/test/src/main/java/test/Ice/seqMapping/Serialize/Struct.java
index 30c80c752e6..30c80c752e6 100644
--- a/java/test/Ice/seqMapping/Serialize/Struct.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/Serialize/Struct.java
diff --git a/java/test/Ice/seqMapping/Serialize/StructHolder.java b/java/test/src/main/java/test/Ice/seqMapping/Serialize/StructHolder.java
index 9768382d0e7..9768382d0e7 100644
--- a/java/test/Ice/seqMapping/Serialize/StructHolder.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/Serialize/StructHolder.java
diff --git a/java/test/Ice/seqMapping/Server.java b/java/test/src/main/java/test/Ice/seqMapping/Server.java
index eea5e6536dd..eea5e6536dd 100644
--- a/java/test/Ice/seqMapping/Server.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/Server.java
diff --git a/java/test/Ice/seqMapping/Test.ice b/java/test/src/main/java/test/Ice/seqMapping/Test.ice
index 15dfffb884b..15dfffb884b 100644
--- a/java/test/Ice/seqMapping/Test.ice
+++ b/java/test/src/main/java/test/Ice/seqMapping/Test.ice
diff --git a/java/test/Ice/seqMapping/TestAMD.ice b/java/test/src/main/java/test/Ice/seqMapping/TestAMD.ice
index 28b3aa3c434..28b3aa3c434 100644
--- a/java/test/Ice/seqMapping/TestAMD.ice
+++ b/java/test/src/main/java/test/Ice/seqMapping/TestAMD.ice
diff --git a/java/test/Ice/seqMapping/Twoways.java b/java/test/src/main/java/test/Ice/seqMapping/Twoways.java
index a6f50f8a327..a6f50f8a327 100644
--- a/java/test/Ice/seqMapping/Twoways.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/Twoways.java
diff --git a/java/test/Ice/seqMapping/TwowaysAMI.java b/java/test/src/main/java/test/Ice/seqMapping/TwowaysAMI.java
index 575686dac1b..575686dac1b 100644
--- a/java/test/Ice/seqMapping/TwowaysAMI.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/TwowaysAMI.java
diff --git a/java/test/Ice/seqMapping/run.py b/java/test/src/main/java/test/Ice/seqMapping/run.py
index deebe811217..e3ca7f3e9c6 100755
--- a/java/test/Ice/seqMapping/run.py
+++ b/java/test/src/main/java/test/Ice/seqMapping/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/serialize/AllTests.java b/java/test/src/main/java/test/Ice/serialize/AllTests.java
index 212acc0893c..212acc0893c 100644
--- a/java/test/Ice/serialize/AllTests.java
+++ b/java/test/src/main/java/test/Ice/serialize/AllTests.java
diff --git a/java/test/Ice/serialize/Client.java b/java/test/src/main/java/test/Ice/serialize/Client.java
index ffa339ba2ca..ffa339ba2ca 100644
--- a/java/test/Ice/serialize/Client.java
+++ b/java/test/src/main/java/test/Ice/serialize/Client.java
diff --git a/java/test/Ice/serialize/InitialI.java b/java/test/src/main/java/test/Ice/serialize/InitialI.java
index 9fdd4e03c4c..9fdd4e03c4c 100644
--- a/java/test/Ice/serialize/InitialI.java
+++ b/java/test/src/main/java/test/Ice/serialize/InitialI.java
diff --git a/java/test/Ice/serialize/Server.java b/java/test/src/main/java/test/Ice/serialize/Server.java
index 19346017593..19346017593 100644
--- a/java/test/Ice/serialize/Server.java
+++ b/java/test/src/main/java/test/Ice/serialize/Server.java
diff --git a/java/test/Ice/serialize/Test.ice b/java/test/src/main/java/test/Ice/serialize/Test.ice
index 2d9a4030f63..2d9a4030f63 100644
--- a/java/test/Ice/serialize/Test.ice
+++ b/java/test/src/main/java/test/Ice/serialize/Test.ice
diff --git a/java/test/src/main/java/test/Ice/serialize/run.py b/java/test/src/main/java/test/Ice/serialize/run.py
new file mode 100755
index 00000000000..d5fe04787c9
--- /dev/null
+++ b/java/test/src/main/java/test/Ice/serialize/run.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+import os, sys
+
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
+    raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil
+
+TestUtil.clientServerTest()
diff --git a/java/test/Ice/servantLocator/AMDCookieI.java b/java/test/src/main/java/test/Ice/servantLocator/AMDCookieI.java
index 5f0d227ed38..5f0d227ed38 100644
--- a/java/test/Ice/servantLocator/AMDCookieI.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/AMDCookieI.java
diff --git a/java/test/Ice/servantLocator/AMDServantLocatorI.java b/java/test/src/main/java/test/Ice/servantLocator/AMDServantLocatorI.java
index 24b14d3ef39..24b14d3ef39 100644
--- a/java/test/Ice/servantLocator/AMDServantLocatorI.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/AMDServantLocatorI.java
diff --git a/java/test/Ice/servantLocator/AMDServer.java b/java/test/src/main/java/test/Ice/servantLocator/AMDServer.java
index 29f8754170a..29f8754170a 100644
--- a/java/test/Ice/servantLocator/AMDServer.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/AMDServer.java
diff --git a/java/test/Ice/servantLocator/AMDTestActivationI.java b/java/test/src/main/java/test/Ice/servantLocator/AMDTestActivationI.java
index 31ecfeab516..31ecfeab516 100644
--- a/java/test/Ice/servantLocator/AMDTestActivationI.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/AMDTestActivationI.java
diff --git a/java/test/Ice/servantLocator/AMDTestI.java b/java/test/src/main/java/test/Ice/servantLocator/AMDTestI.java
index 999b2871a89..999b2871a89 100644
--- a/java/test/Ice/servantLocator/AMDTestI.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/AMDTestI.java
diff --git a/java/test/Ice/servantLocator/AllTests.java b/java/test/src/main/java/test/Ice/servantLocator/AllTests.java
index 15273a5b687..15273a5b687 100644
--- a/java/test/Ice/servantLocator/AllTests.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/AllTests.java
diff --git a/java/test/Ice/servantLocator/Client.java b/java/test/src/main/java/test/Ice/servantLocator/Client.java
index c781cb5ac50..c781cb5ac50 100644
--- a/java/test/Ice/servantLocator/Client.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/Client.java
diff --git a/java/test/Ice/servantLocator/Collocated.java b/java/test/src/main/java/test/Ice/servantLocator/Collocated.java
index 612602d933d..612602d933d 100644
--- a/java/test/Ice/servantLocator/Collocated.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/Collocated.java
diff --git a/java/test/Ice/servantLocator/CookieI.java b/java/test/src/main/java/test/Ice/servantLocator/CookieI.java
index 52bab91e922..52bab91e922 100644
--- a/java/test/Ice/servantLocator/CookieI.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/CookieI.java
diff --git a/java/test/Ice/servantLocator/ServantLocatorI.java b/java/test/src/main/java/test/Ice/servantLocator/ServantLocatorI.java
index f3fa5388634..f3fa5388634 100644
--- a/java/test/Ice/servantLocator/ServantLocatorI.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/ServantLocatorI.java
diff --git a/java/test/Ice/servantLocator/Server.java b/java/test/src/main/java/test/Ice/servantLocator/Server.java
index bd3dfdc7288..bd3dfdc7288 100644
--- a/java/test/Ice/servantLocator/Server.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/Server.java
diff --git a/java/test/Ice/servantLocator/Test.ice b/java/test/src/main/java/test/Ice/servantLocator/Test.ice
index 1c12f4b8483..1c12f4b8483 100644
--- a/java/test/Ice/servantLocator/Test.ice
+++ b/java/test/src/main/java/test/Ice/servantLocator/Test.ice
diff --git a/java/test/Ice/servantLocator/TestAMD.ice b/java/test/src/main/java/test/Ice/servantLocator/TestAMD.ice
index 2a776edb658..2a776edb658 100644
--- a/java/test/Ice/servantLocator/TestAMD.ice
+++ b/java/test/src/main/java/test/Ice/servantLocator/TestAMD.ice
diff --git a/java/test/Ice/servantLocator/TestActivationI.java b/java/test/src/main/java/test/Ice/servantLocator/TestActivationI.java
index 3c1c6f209ad..3c1c6f209ad 100644
--- a/java/test/Ice/servantLocator/TestActivationI.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/TestActivationI.java
diff --git a/java/test/Ice/servantLocator/TestI.java b/java/test/src/main/java/test/Ice/servantLocator/TestI.java
index b0704d4f6a6..b0704d4f6a6 100644
--- a/java/test/Ice/servantLocator/TestI.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/TestI.java
diff --git a/java/test/Ice/servantLocator/run.py b/java/test/src/main/java/test/Ice/servantLocator/run.py
index 3176df2a38e..7944176bc4a 100755
--- a/java/test/Ice/servantLocator/run.py
+++ b/java/test/src/main/java/test/Ice/servantLocator/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/slicing/exceptions/AMDServer.java b/java/test/src/main/java/test/Ice/slicing/exceptions/AMDServer.java
index acca7cf53e8..acca7cf53e8 100644
--- a/java/test/Ice/slicing/exceptions/AMDServer.java
+++ b/java/test/src/main/java/test/Ice/slicing/exceptions/AMDServer.java
diff --git a/java/test/Ice/slicing/exceptions/AMDTestI.java b/java/test/src/main/java/test/Ice/slicing/exceptions/AMDTestI.java
index 07ca77f5dad..07ca77f5dad 100644
--- a/java/test/Ice/slicing/exceptions/AMDTestI.java
+++ b/java/test/src/main/java/test/Ice/slicing/exceptions/AMDTestI.java
diff --git a/java/test/Ice/slicing/exceptions/AllTests.java b/java/test/src/main/java/test/Ice/slicing/exceptions/AllTests.java
index cd159a9006b..cd159a9006b 100644
--- a/java/test/Ice/slicing/exceptions/AllTests.java
+++ b/java/test/src/main/java/test/Ice/slicing/exceptions/AllTests.java
diff --git a/java/test/Ice/slicing/exceptions/Client.java b/java/test/src/main/java/test/Ice/slicing/exceptions/Client.java
index bee392fe3b3..bee392fe3b3 100644
--- a/java/test/Ice/slicing/exceptions/Client.java
+++ b/java/test/src/main/java/test/Ice/slicing/exceptions/Client.java
diff --git a/java/test/Ice/slicing/exceptions/ClientPrivate.ice b/java/test/src/main/java/test/Ice/slicing/exceptions/ClientPrivate.ice
index 703399d8502..703399d8502 100644
--- a/java/test/Ice/slicing/exceptions/ClientPrivate.ice
+++ b/java/test/src/main/java/test/Ice/slicing/exceptions/ClientPrivate.ice
diff --git a/java/test/Ice/slicing/exceptions/Server.java b/java/test/src/main/java/test/Ice/slicing/exceptions/Server.java
index 0844dd92275..0844dd92275 100644
--- a/java/test/Ice/slicing/exceptions/Server.java
+++ b/java/test/src/main/java/test/Ice/slicing/exceptions/Server.java
diff --git a/java/test/Ice/slicing/exceptions/ServerPrivate.ice b/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivate.ice
index d12869fb451..d12869fb451 100644
--- a/java/test/Ice/slicing/exceptions/ServerPrivate.ice
+++ b/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivate.ice
diff --git a/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice b/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
index ff2ee33b93e..ff2ee33b93e 100644
--- a/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
+++ b/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
diff --git a/java/test/Ice/slicing/exceptions/TestI.java b/java/test/src/main/java/test/Ice/slicing/exceptions/TestI.java
index 9cedab3b4af..9cedab3b4af 100644
--- a/java/test/Ice/slicing/exceptions/TestI.java
+++ b/java/test/src/main/java/test/Ice/slicing/exceptions/TestI.java
diff --git a/java/test/Ice/slicing/exceptions/run.py b/java/test/src/main/java/test/Ice/slicing/exceptions/run.py
index 91d398b0071..e4130c0b4e6 100755
--- a/java/test/Ice/slicing/exceptions/run.py
+++ b/java/test/src/main/java/test/Ice/slicing/exceptions/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/slicing/objects/AMDServer.java b/java/test/src/main/java/test/Ice/slicing/objects/AMDServer.java
index c905976b193..c905976b193 100644
--- a/java/test/Ice/slicing/objects/AMDServer.java
+++ b/java/test/src/main/java/test/Ice/slicing/objects/AMDServer.java
diff --git a/java/test/Ice/slicing/objects/AMDTestI.java b/java/test/src/main/java/test/Ice/slicing/objects/AMDTestI.java
index f1c9e814a9b..f1c9e814a9b 100644
--- a/java/test/Ice/slicing/objects/AMDTestI.java
+++ b/java/test/src/main/java/test/Ice/slicing/objects/AMDTestI.java
diff --git a/java/test/Ice/slicing/objects/AllTests.java b/java/test/src/main/java/test/Ice/slicing/objects/AllTests.java
index be43330eae1..be43330eae1 100644
--- a/java/test/Ice/slicing/objects/AllTests.java
+++ b/java/test/src/main/java/test/Ice/slicing/objects/AllTests.java
diff --git a/java/test/Ice/slicing/objects/Client.java b/java/test/src/main/java/test/Ice/slicing/objects/Client.java
index e725c725339..e725c725339 100644
--- a/java/test/Ice/slicing/objects/Client.java
+++ b/java/test/src/main/java/test/Ice/slicing/objects/Client.java
diff --git a/java/test/Ice/slicing/objects/ClientPrivate.ice b/java/test/src/main/java/test/Ice/slicing/objects/ClientPrivate.ice
index 716147695ae..716147695ae 100644
--- a/java/test/Ice/slicing/objects/ClientPrivate.ice
+++ b/java/test/src/main/java/test/Ice/slicing/objects/ClientPrivate.ice
diff --git a/java/test/Ice/slicing/objects/Server.java b/java/test/src/main/java/test/Ice/slicing/objects/Server.java
index fded6895de1..fded6895de1 100644
--- a/java/test/Ice/slicing/objects/Server.java
+++ b/java/test/src/main/java/test/Ice/slicing/objects/Server.java
diff --git a/java/test/Ice/slicing/objects/ServerPrivate.ice b/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivate.ice
index f880521b7b1..f880521b7b1 100644
--- a/java/test/Ice/slicing/objects/ServerPrivate.ice
+++ b/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivate.ice
diff --git a/java/test/Ice/slicing/objects/ServerPrivateAMD.ice b/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivateAMD.ice
index abf0fc4ee64..abf0fc4ee64 100644
--- a/java/test/Ice/slicing/objects/ServerPrivateAMD.ice
+++ b/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivateAMD.ice
diff --git a/java/test/Ice/slicing/objects/TestI.java b/java/test/src/main/java/test/Ice/slicing/objects/TestI.java
index aa199bfdcbe..aa199bfdcbe 100644
--- a/java/test/Ice/slicing/objects/TestI.java
+++ b/java/test/src/main/java/test/Ice/slicing/objects/TestI.java
diff --git a/java/test/Ice/slicing/objects/run.py b/java/test/src/main/java/test/Ice/slicing/objects/run.py
index ceb32b83e11..cabf77e2817 100755
--- a/java/test/Ice/slicing/objects/run.py
+++ b/java/test/src/main/java/test/Ice/slicing/objects/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/stream/Client.java b/java/test/src/main/java/test/Ice/stream/Client.java
index 5d88f303e5d..5d88f303e5d 100644
--- a/java/test/Ice/stream/Client.java
+++ b/java/test/src/main/java/test/Ice/stream/Client.java
diff --git a/java/test/Ice/stream/Serialize/Small.java b/java/test/src/main/java/test/Ice/stream/Serialize/Small.java
index 572d3ba10cf..572d3ba10cf 100644
--- a/java/test/Ice/stream/Serialize/Small.java
+++ b/java/test/src/main/java/test/Ice/stream/Serialize/Small.java
diff --git a/java/test/Ice/stream/Test.ice b/java/test/src/main/java/test/Ice/stream/Test.ice
index 5be23454461..5be23454461 100644
--- a/java/test/Ice/stream/Test.ice
+++ b/java/test/src/main/java/test/Ice/stream/Test.ice
diff --git a/java/test/Ice/stream/run.py b/java/test/src/main/java/test/Ice/stream/run.py
index 08e9e18a321..b071a5d9733 100755
--- a/java/test/Ice/stream/run.py
+++ b/java/test/src/main/java/test/Ice/stream/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/threadPoolPriority/Client.java b/java/test/src/main/java/test/Ice/threadPoolPriority/Client.java
index 86dd9468d47..86dd9468d47 100644
--- a/java/test/Ice/threadPoolPriority/Client.java
+++ b/java/test/src/main/java/test/Ice/threadPoolPriority/Client.java
diff --git a/java/test/Ice/threadPoolPriority/PriorityI.java b/java/test/src/main/java/test/Ice/threadPoolPriority/PriorityI.java
index 18579e7713a..18579e7713a 100644
--- a/java/test/Ice/threadPoolPriority/PriorityI.java
+++ b/java/test/src/main/java/test/Ice/threadPoolPriority/PriorityI.java
diff --git a/java/test/Ice/threadPoolPriority/Server.java b/java/test/src/main/java/test/Ice/threadPoolPriority/Server.java
index a1bdc6a0a31..a1bdc6a0a31 100644
--- a/java/test/Ice/threadPoolPriority/Server.java
+++ b/java/test/src/main/java/test/Ice/threadPoolPriority/Server.java
diff --git a/java/test/Ice/threadPoolPriority/Test.ice b/java/test/src/main/java/test/Ice/threadPoolPriority/Test.ice
index d69a2fac75a..d69a2fac75a 100644
--- a/java/test/Ice/threadPoolPriority/Test.ice
+++ b/java/test/src/main/java/test/Ice/threadPoolPriority/Test.ice
diff --git a/java/test/Ice/interrupt/run.py b/java/test/src/main/java/test/Ice/threadPoolPriority/run.py
index 012b74ea130..46e1ee20e8d 100755
--- a/java/test/Ice/interrupt/run.py
+++ b/java/test/src/main/java/test/Ice/threadPoolPriority/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
@@ -22,6 +23,3 @@ import TestUtil
 
 print("tests with regular server.")
 TestUtil.clientServerTest()
-
-print("tests with collocated server.")
-TestUtil.collocatedTest()
\ No newline at end of file
diff --git a/java/test/Ice/throughput/Client.java b/java/test/src/main/java/test/Ice/throughput/Client.java
index b508b11bc96..b508b11bc96 100644
--- a/java/test/Ice/throughput/Client.java
+++ b/java/test/src/main/java/test/Ice/throughput/Client.java
diff --git a/java/test/Ice/throughput/Server.java b/java/test/src/main/java/test/Ice/throughput/Server.java
index 95737f3dc10..95737f3dc10 100644
--- a/java/test/Ice/throughput/Server.java
+++ b/java/test/src/main/java/test/Ice/throughput/Server.java
diff --git a/java/test/Ice/throughput/Throughput.ice b/java/test/src/main/java/test/Ice/throughput/Throughput.ice
index d1ebb567ec7..d1ebb567ec7 100644
--- a/java/test/Ice/throughput/Throughput.ice
+++ b/java/test/src/main/java/test/Ice/throughput/Throughput.ice
diff --git a/java/test/Ice/throughput/ThroughputI.java b/java/test/src/main/java/test/Ice/throughput/ThroughputI.java
index 53253549102..53253549102 100644
--- a/java/test/Ice/throughput/ThroughputI.java
+++ b/java/test/src/main/java/test/Ice/throughput/ThroughputI.java
diff --git a/java/test/Ice/timeout/AllTests.java b/java/test/src/main/java/test/Ice/timeout/AllTests.java
index 7f0239f32c5..7f0239f32c5 100644
--- a/java/test/Ice/timeout/AllTests.java
+++ b/java/test/src/main/java/test/Ice/timeout/AllTests.java
diff --git a/java/test/Ice/timeout/Client.java b/java/test/src/main/java/test/Ice/timeout/Client.java
index 7476eb5c0e8..7476eb5c0e8 100644
--- a/java/test/Ice/timeout/Client.java
+++ b/java/test/src/main/java/test/Ice/timeout/Client.java
diff --git a/java/test/Ice/timeout/Server.java b/java/test/src/main/java/test/Ice/timeout/Server.java
index b4006770863..b4006770863 100644
--- a/java/test/Ice/timeout/Server.java
+++ b/java/test/src/main/java/test/Ice/timeout/Server.java
diff --git a/java/test/Ice/timeout/Test.ice b/java/test/src/main/java/test/Ice/timeout/Test.ice
index 69ca37fb5c5..69ca37fb5c5 100644
--- a/java/test/Ice/timeout/Test.ice
+++ b/java/test/src/main/java/test/Ice/timeout/Test.ice
diff --git a/java/test/Ice/timeout/TimeoutI.java b/java/test/src/main/java/test/Ice/timeout/TimeoutI.java
index 61b8f7702c2..61b8f7702c2 100644
--- a/java/test/Ice/timeout/TimeoutI.java
+++ b/java/test/src/main/java/test/Ice/timeout/TimeoutI.java
diff --git a/java/test/src/main/java/test/Ice/timeout/run.py b/java/test/src/main/java/test/Ice/timeout/run.py
new file mode 100755
index 00000000000..d5fe04787c9
--- /dev/null
+++ b/java/test/src/main/java/test/Ice/timeout/run.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+import os, sys
+
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
+    raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil
+
+TestUtil.clientServerTest()
diff --git a/java/test/Ice/timeout/timeout.jar b/java/test/src/main/java/test/Ice/timeout/timeout.jar
index 81d74d85812..81d74d85812 100644
--- a/java/test/Ice/timeout/timeout.jar
+++ b/java/test/src/main/java/test/Ice/timeout/timeout.jar
diff --git a/java/test/Ice/udp/AllTests.java b/java/test/src/main/java/test/Ice/udp/AllTests.java
index 82dc1224d46..82dc1224d46 100644
--- a/java/test/Ice/udp/AllTests.java
+++ b/java/test/src/main/java/test/Ice/udp/AllTests.java
diff --git a/java/test/Ice/udp/Client.java b/java/test/src/main/java/test/Ice/udp/Client.java
index afd4927a470..afd4927a470 100644
--- a/java/test/Ice/udp/Client.java
+++ b/java/test/src/main/java/test/Ice/udp/Client.java
diff --git a/java/test/Ice/udp/Server.java b/java/test/src/main/java/test/Ice/udp/Server.java
index 05cfc43cbc8..05cfc43cbc8 100644
--- a/java/test/Ice/udp/Server.java
+++ b/java/test/src/main/java/test/Ice/udp/Server.java
diff --git a/java/test/Ice/udp/Test.ice b/java/test/src/main/java/test/Ice/udp/Test.ice
index be7a3269229..be7a3269229 100644
--- a/java/test/Ice/udp/Test.ice
+++ b/java/test/src/main/java/test/Ice/udp/Test.ice
diff --git a/java/test/Ice/udp/TestIntfI.java b/java/test/src/main/java/test/Ice/udp/TestIntfI.java
index d4aba78a2c3..d4aba78a2c3 100644
--- a/java/test/Ice/udp/TestIntfI.java
+++ b/java/test/src/main/java/test/Ice/udp/TestIntfI.java
diff --git a/java/test/Ice/udp/run.py b/java/test/src/main/java/test/Ice/udp/run.py
index cffeb7f24c9..efbd3b862cb 100755
--- a/java/test/Ice/udp/run.py
+++ b/java/test/src/main/java/test/Ice/udp/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/IceBox/admin/AllTests.java b/java/test/src/main/java/test/IceBox/admin/AllTests.java
index 4063486d1da..4063486d1da 100644
--- a/java/test/IceBox/admin/AllTests.java
+++ b/java/test/src/main/java/test/IceBox/admin/AllTests.java
diff --git a/java/test/IceBox/admin/Client.java b/java/test/src/main/java/test/IceBox/admin/Client.java
index 80664c2edd0..80664c2edd0 100644
--- a/java/test/IceBox/admin/Client.java
+++ b/java/test/src/main/java/test/IceBox/admin/Client.java
diff --git a/java/test/IceBox/admin/Test.ice b/java/test/src/main/java/test/IceBox/admin/Test.ice
index 88ab72b5322..88ab72b5322 100644
--- a/java/test/IceBox/admin/Test.ice
+++ b/java/test/src/main/java/test/IceBox/admin/Test.ice
diff --git a/java/test/IceBox/admin/TestFacetI.java b/java/test/src/main/java/test/IceBox/admin/TestFacetI.java
index 642ee400d20..642ee400d20 100644
--- a/java/test/IceBox/admin/TestFacetI.java
+++ b/java/test/src/main/java/test/IceBox/admin/TestFacetI.java
diff --git a/java/test/IceBox/admin/TestServiceI.java b/java/test/src/main/java/test/IceBox/admin/TestServiceI.java
index 7497771d248..7497771d248 100644
--- a/java/test/IceBox/admin/TestServiceI.java
+++ b/java/test/src/main/java/test/IceBox/admin/TestServiceI.java
diff --git a/java/test/IceBox/admin/config.icebox b/java/test/src/main/java/test/IceBox/admin/config.icebox
index 34d0b233419..34d0b233419 100644
--- a/java/test/IceBox/admin/config.icebox
+++ b/java/test/src/main/java/test/IceBox/admin/config.icebox
diff --git a/java/test/IceBox/admin/config.service b/java/test/src/main/java/test/IceBox/admin/config.service
index 23c6f841859..23c6f841859 100644
--- a/java/test/IceBox/admin/config.service
+++ b/java/test/src/main/java/test/IceBox/admin/config.service
diff --git a/java/test/IceBox/admin/run.py b/java/test/src/main/java/test/IceBox/admin/run.py
index 3d88326f500..f84c3203acd 100755
--- a/java/test/IceBox/admin/run.py
+++ b/java/test/src/main/java/test/IceBox/admin/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/IceBox/configuration/AllTests.java b/java/test/src/main/java/test/IceBox/configuration/AllTests.java
index 68f5dd65dc6..68f5dd65dc6 100644
--- a/java/test/IceBox/configuration/AllTests.java
+++ b/java/test/src/main/java/test/IceBox/configuration/AllTests.java
diff --git a/java/test/IceBox/configuration/Client.java b/java/test/src/main/java/test/IceBox/configuration/Client.java
index 39785e9de8a..39785e9de8a 100644
--- a/java/test/IceBox/configuration/Client.java
+++ b/java/test/src/main/java/test/IceBox/configuration/Client.java
diff --git a/java/test/IceBox/configuration/Test.ice b/java/test/src/main/java/test/IceBox/configuration/Test.ice
index 757de8ea164..757de8ea164 100644
--- a/java/test/IceBox/configuration/Test.ice
+++ b/java/test/src/main/java/test/IceBox/configuration/Test.ice
diff --git a/java/test/IceBox/configuration/TestI.java b/java/test/src/main/java/test/IceBox/configuration/TestI.java
index abe96b912f8..abe96b912f8 100644
--- a/java/test/IceBox/configuration/TestI.java
+++ b/java/test/src/main/java/test/IceBox/configuration/TestI.java
diff --git a/java/test/IceBox/configuration/TestServiceI.java b/java/test/src/main/java/test/IceBox/configuration/TestServiceI.java
index 037d5465968..037d5465968 100644
--- a/java/test/IceBox/configuration/TestServiceI.java
+++ b/java/test/src/main/java/test/IceBox/configuration/TestServiceI.java
diff --git a/java/test/IceBox/configuration/config.icebox b/java/test/src/main/java/test/IceBox/configuration/config.icebox
index 1dd4b90957c..1dd4b90957c 100644
--- a/java/test/IceBox/configuration/config.icebox
+++ b/java/test/src/main/java/test/IceBox/configuration/config.icebox
diff --git a/java/test/IceBox/configuration/config.icebox2 b/java/test/src/main/java/test/IceBox/configuration/config.icebox2
index 2866764f19f..2866764f19f 100644
--- a/java/test/IceBox/configuration/config.icebox2
+++ b/java/test/src/main/java/test/IceBox/configuration/config.icebox2
diff --git a/java/test/IceBox/configuration/config.service1 b/java/test/src/main/java/test/IceBox/configuration/config.service1
index 6028e615ff5..6028e615ff5 100644
--- a/java/test/IceBox/configuration/config.service1
+++ b/java/test/src/main/java/test/IceBox/configuration/config.service1
diff --git a/java/test/IceBox/configuration/config.service1-2 b/java/test/src/main/java/test/IceBox/configuration/config.service1-2
index c173914db2a..c173914db2a 100644
--- a/java/test/IceBox/configuration/config.service1-2
+++ b/java/test/src/main/java/test/IceBox/configuration/config.service1-2
diff --git a/java/test/IceBox/configuration/config.service2 b/java/test/src/main/java/test/IceBox/configuration/config.service2
index 78e08aadba6..78e08aadba6 100644
--- a/java/test/IceBox/configuration/config.service2
+++ b/java/test/src/main/java/test/IceBox/configuration/config.service2
diff --git a/java/test/IceBox/configuration/config.service2-2 b/java/test/src/main/java/test/IceBox/configuration/config.service2-2
index 36c8d0812cb..36c8d0812cb 100644
--- a/java/test/IceBox/configuration/config.service2-2
+++ b/java/test/src/main/java/test/IceBox/configuration/config.service2-2
diff --git a/java/test/IceBox/configuration/config.service3 b/java/test/src/main/java/test/IceBox/configuration/config.service3
index c93ed144701..c93ed144701 100644
--- a/java/test/IceBox/configuration/config.service3
+++ b/java/test/src/main/java/test/IceBox/configuration/config.service3
diff --git a/java/test/IceBox/configuration/config.service4 b/java/test/src/main/java/test/IceBox/configuration/config.service4
index 182fb3a7289..182fb3a7289 100644
--- a/java/test/IceBox/configuration/config.service4
+++ b/java/test/src/main/java/test/IceBox/configuration/config.service4
diff --git a/java/test/IceBox/configuration/run.py b/java/test/src/main/java/test/IceBox/configuration/run.py
index 45c300b3b16..32ce304919c 100755
--- a/java/test/IceBox/configuration/run.py
+++ b/java/test/src/main/java/test/IceBox/configuration/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/IceDiscovery/simple/AllTests.java b/java/test/src/main/java/test/IceDiscovery/simple/AllTests.java
index 97546028b59..97546028b59 100644
--- a/java/test/IceDiscovery/simple/AllTests.java
+++ b/java/test/src/main/java/test/IceDiscovery/simple/AllTests.java
diff --git a/java/test/IceDiscovery/simple/Client.java b/java/test/src/main/java/test/IceDiscovery/simple/Client.java
index 7b93371328e..7b93371328e 100644
--- a/java/test/IceDiscovery/simple/Client.java
+++ b/java/test/src/main/java/test/IceDiscovery/simple/Client.java
diff --git a/java/test/IceDiscovery/simple/ControllerI.java b/java/test/src/main/java/test/IceDiscovery/simple/ControllerI.java
index 188b1c7182d..188b1c7182d 100644
--- a/java/test/IceDiscovery/simple/ControllerI.java
+++ b/java/test/src/main/java/test/IceDiscovery/simple/ControllerI.java
diff --git a/java/test/IceDiscovery/simple/Server.java b/java/test/src/main/java/test/IceDiscovery/simple/Server.java
index 7bc444355f4..7bc444355f4 100644
--- a/java/test/IceDiscovery/simple/Server.java
+++ b/java/test/src/main/java/test/IceDiscovery/simple/Server.java
diff --git a/java/test/IceDiscovery/simple/Test.ice b/java/test/src/main/java/test/IceDiscovery/simple/Test.ice
index 03d59e513a7..03d59e513a7 100644
--- a/java/test/IceDiscovery/simple/Test.ice
+++ b/java/test/src/main/java/test/IceDiscovery/simple/Test.ice
diff --git a/java/test/IceDiscovery/simple/TestIntfI.java b/java/test/src/main/java/test/IceDiscovery/simple/TestIntfI.java
index 339bc281081..339bc281081 100644
--- a/java/test/IceDiscovery/simple/TestIntfI.java
+++ b/java/test/src/main/java/test/IceDiscovery/simple/TestIntfI.java
diff --git a/java/test/IceDiscovery/simple/run.py b/java/test/src/main/java/test/IceDiscovery/simple/run.py
index d1581a0663c..2f14ff0442f 100755
--- a/java/test/IceDiscovery/simple/run.py
+++ b/java/test/src/main/java/test/IceDiscovery/simple/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/IceGrid/simple/.gitignore b/java/test/src/main/java/test/IceGrid/simple/.gitignore
index 1a5104f3c93..1a5104f3c93 100644
--- a/java/test/IceGrid/simple/.gitignore
+++ b/java/test/src/main/java/test/IceGrid/simple/.gitignore
diff --git a/java/test/IceGrid/simple/AllTests.java b/java/test/src/main/java/test/IceGrid/simple/AllTests.java
index b6aba8b8594..b6aba8b8594 100644
--- a/java/test/IceGrid/simple/AllTests.java
+++ b/java/test/src/main/java/test/IceGrid/simple/AllTests.java
diff --git a/java/test/IceGrid/simple/Client.java b/java/test/src/main/java/test/IceGrid/simple/Client.java
index 0da92bbeffe..0da92bbeffe 100644
--- a/java/test/IceGrid/simple/Client.java
+++ b/java/test/src/main/java/test/IceGrid/simple/Client.java
diff --git a/java/test/IceGrid/simple/Server.java b/java/test/src/main/java/test/IceGrid/simple/Server.java
index 1b349a70773..1b349a70773 100644
--- a/java/test/IceGrid/simple/Server.java
+++ b/java/test/src/main/java/test/IceGrid/simple/Server.java
diff --git a/java/test/IceGrid/simple/Test.ice b/java/test/src/main/java/test/IceGrid/simple/Test.ice
index 645988ffff1..645988ffff1 100644
--- a/java/test/IceGrid/simple/Test.ice
+++ b/java/test/src/main/java/test/IceGrid/simple/Test.ice
diff --git a/java/test/IceGrid/simple/TestI.java b/java/test/src/main/java/test/IceGrid/simple/TestI.java
index 82ba95b7aad..82ba95b7aad 100644
--- a/java/test/IceGrid/simple/TestI.java
+++ b/java/test/src/main/java/test/IceGrid/simple/TestI.java
diff --git a/java/test/Freeze/complex/db/.gitignore b/java/test/src/main/java/test/IceGrid/simple/db/.gitignore
index 39af5887579..39af5887579 100644
--- a/java/test/Freeze/complex/db/.gitignore
+++ b/java/test/src/main/java/test/IceGrid/simple/db/.gitignore
diff --git a/java/test/IceGrid/simple/run.py b/java/test/src/main/java/test/IceGrid/simple/run.py
index d31cdaaea77..1dea25f18d6 100755
--- a/java/test/IceGrid/simple/run.py
+++ b/java/test/src/main/java/test/IceGrid/simple/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/IceGrid/simple/simple_server.xml b/java/test/src/main/java/test/IceGrid/simple/simple_server.xml
index 1548b0e482d..1548b0e482d 100644
--- a/java/test/IceGrid/simple/simple_server.xml
+++ b/java/test/src/main/java/test/IceGrid/simple/simple_server.xml
diff --git a/java/test/IceSSL/certs/c_dsa_ca1.jks b/java/test/src/main/java/test/IceSSL/certs/c_dsa_ca1.jks
index fd0b5d6e56d..fd0b5d6e56d 100644
--- a/java/test/IceSSL/certs/c_dsa_ca1.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/c_dsa_ca1.jks
diff --git a/java/test/IceSSL/certs/c_rsa_ca1.jks b/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca1.jks
index ee0b1afc7b2..ee0b1afc7b2 100644
--- a/java/test/IceSSL/certs/c_rsa_ca1.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca1.jks
diff --git a/java/test/IceSSL/certs/c_rsa_ca1_exp.jks b/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca1_exp.jks
index fdac5c1508a..fdac5c1508a 100644
--- a/java/test/IceSSL/certs/c_rsa_ca1_exp.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca1_exp.jks
diff --git a/java/test/IceSSL/certs/c_rsa_ca2.jks b/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca2.jks
index 56f0b25815c..56f0b25815c 100644
--- a/java/test/IceSSL/certs/c_rsa_ca2.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca2.jks
diff --git a/java/test/IceSSL/certs/cacert1.jks b/java/test/src/main/java/test/IceSSL/certs/cacert1.jks
index d17718e981f..d17718e981f 100644
--- a/java/test/IceSSL/certs/cacert1.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/cacert1.jks
diff --git a/java/test/IceSSL/certs/cacert2.jks b/java/test/src/main/java/test/IceSSL/certs/cacert2.jks
index 0a22dfe4696..0a22dfe4696 100644
--- a/java/test/IceSSL/certs/cacert2.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/cacert2.jks
diff --git a/java/test/IceSSL/certs/cacerts.jks b/java/test/src/main/java/test/IceSSL/certs/cacerts.jks
index b45456de292..b45456de292 100644
--- a/java/test/IceSSL/certs/cacerts.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/cacerts.jks
diff --git a/java/test/IceSSL/certs/makecerts.py b/java/test/src/main/java/test/IceSSL/certs/makecerts.py
index 3aea85737c8..3aea85737c8 100755..100644
--- a/java/test/IceSSL/certs/makecerts.py
+++ b/java/test/src/main/java/test/IceSSL/certs/makecerts.py
diff --git a/java/test/IceSSL/certs/s_cacert2.jks b/java/test/src/main/java/test/IceSSL/certs/s_cacert2.jks
index 7d55050b1a5..7d55050b1a5 100644
--- a/java/test/IceSSL/certs/s_cacert2.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/s_cacert2.jks
diff --git a/java/test/IceSSL/certs/s_dsa_ca1.jks b/java/test/src/main/java/test/IceSSL/certs/s_dsa_ca1.jks
index c2e9fb20e71..c2e9fb20e71 100644
--- a/java/test/IceSSL/certs/s_dsa_ca1.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/s_dsa_ca1.jks
diff --git a/java/test/IceSSL/certs/s_rsa_ca1.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1.jks
index f7c85ae50d5..f7c85ae50d5 100644
--- a/java/test/IceSSL/certs/s_rsa_ca1.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1.jks
diff --git a/java/test/IceSSL/certs/s_rsa_ca1_cn1.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn1.jks
index 0bc38875428..0bc38875428 100644
--- a/java/test/IceSSL/certs/s_rsa_ca1_cn1.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn1.jks
diff --git a/java/test/IceSSL/certs/s_rsa_ca1_cn2.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn2.jks
index 1f734a49687..1f734a49687 100644
--- a/java/test/IceSSL/certs/s_rsa_ca1_cn2.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn2.jks
diff --git a/java/test/IceSSL/certs/s_rsa_ca1_exp.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_exp.jks
index ca6a874a0b5..ca6a874a0b5 100644
--- a/java/test/IceSSL/certs/s_rsa_ca1_exp.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_exp.jks
diff --git a/java/test/IceSSL/certs/s_rsa_ca2.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca2.jks
index e2403e84e53..e2403e84e53 100644
--- a/java/test/IceSSL/certs/s_rsa_ca2.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca2.jks
diff --git a/java/test/IceSSL/certs/s_rsa_dsa_ca1.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_dsa_ca1.jks
index 4b7f7ff0a5e..4b7f7ff0a5e 100644
--- a/java/test/IceSSL/certs/s_rsa_dsa_ca1.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/s_rsa_dsa_ca1.jks
diff --git a/java/test/IceSSL/certs/seed.dat b/java/test/src/main/java/test/IceSSL/certs/seed.dat
index ba313c59460..ba313c59460 100644
--- a/java/test/IceSSL/certs/seed.dat
+++ b/java/test/src/main/java/test/IceSSL/certs/seed.dat
diff --git a/java/test/IceSSL/configuration/AllTests.java b/java/test/src/main/java/test/IceSSL/configuration/AllTests.java
index 1e955c8c1f5..1e955c8c1f5 100644
--- a/java/test/IceSSL/configuration/AllTests.java
+++ b/java/test/src/main/java/test/IceSSL/configuration/AllTests.java
diff --git a/java/test/IceSSL/configuration/CertificateVerifierI.java b/java/test/src/main/java/test/IceSSL/configuration/CertificateVerifierI.java
index 03ae75ad659..03ae75ad659 100644
--- a/java/test/IceSSL/configuration/CertificateVerifierI.java
+++ b/java/test/src/main/java/test/IceSSL/configuration/CertificateVerifierI.java
diff --git a/java/test/IceSSL/configuration/Client.java b/java/test/src/main/java/test/IceSSL/configuration/Client.java
index 36ecfde860d..36ecfde860d 100644
--- a/java/test/IceSSL/configuration/Client.java
+++ b/java/test/src/main/java/test/IceSSL/configuration/Client.java
diff --git a/java/test/IceSSL/configuration/PasswordCallbackI.java b/java/test/src/main/java/test/IceSSL/configuration/PasswordCallbackI.java
index b7493caaffc..b7493caaffc 100644
--- a/java/test/IceSSL/configuration/PasswordCallbackI.java
+++ b/java/test/src/main/java/test/IceSSL/configuration/PasswordCallbackI.java
diff --git a/java/test/IceSSL/configuration/Server.java b/java/test/src/main/java/test/IceSSL/configuration/Server.java
index 9438f73d419..9438f73d419 100644
--- a/java/test/IceSSL/configuration/Server.java
+++ b/java/test/src/main/java/test/IceSSL/configuration/Server.java
diff --git a/java/test/IceSSL/configuration/ServerFactoryI.java b/java/test/src/main/java/test/IceSSL/configuration/ServerFactoryI.java
index 34271e03f89..34271e03f89 100644
--- a/java/test/IceSSL/configuration/ServerFactoryI.java
+++ b/java/test/src/main/java/test/IceSSL/configuration/ServerFactoryI.java
diff --git a/java/test/IceSSL/configuration/ServerI.java b/java/test/src/main/java/test/IceSSL/configuration/ServerI.java
index ca3e2835e23..ca3e2835e23 100644
--- a/java/test/IceSSL/configuration/ServerI.java
+++ b/java/test/src/main/java/test/IceSSL/configuration/ServerI.java
diff --git a/java/test/IceSSL/configuration/Test.ice b/java/test/src/main/java/test/IceSSL/configuration/Test.ice
index b884e914104..b884e914104 100644
--- a/java/test/IceSSL/configuration/Test.ice
+++ b/java/test/src/main/java/test/IceSSL/configuration/Test.ice
diff --git a/java/test/IceSSL/configuration/run.py b/java/test/src/main/java/test/IceSSL/configuration/run.py
index d812806ea22..791f566f4b2 100755
--- a/java/test/IceSSL/configuration/run.py
+++ b/java/test/src/main/java/test/IceSSL/configuration/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/IceUtil/fileLock/.gitignore b/java/test/src/main/java/test/IceUtil/fileLock/.gitignore
index 3c97cdc2906..3c97cdc2906 100644
--- a/java/test/IceUtil/fileLock/.gitignore
+++ b/java/test/src/main/java/test/IceUtil/fileLock/.gitignore
diff --git a/java/test/IceUtil/fileLock/Client.java b/java/test/src/main/java/test/IceUtil/fileLock/Client.java
index ce67ad3fe50..ce67ad3fe50 100644
--- a/java/test/IceUtil/fileLock/Client.java
+++ b/java/test/src/main/java/test/IceUtil/fileLock/Client.java
diff --git a/java/test/IceUtil/fileLock/ClientFail.java b/java/test/src/main/java/test/IceUtil/fileLock/ClientFail.java
index c96dc7c9b57..c96dc7c9b57 100644
--- a/java/test/IceUtil/fileLock/ClientFail.java
+++ b/java/test/src/main/java/test/IceUtil/fileLock/ClientFail.java
diff --git a/java/test/IceUtil/fileLock/run.py b/java/test/src/main/java/test/IceUtil/fileLock/run.py
index 3f5b6dbea86..26ab933f034 100755
--- a/java/test/IceUtil/fileLock/run.py
+++ b/java/test/src/main/java/test/IceUtil/fileLock/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/IceUtil/inputUtil/Client.java b/java/test/src/main/java/test/IceUtil/inputUtil/Client.java
index 5d29a45452c..5d29a45452c 100644
--- a/java/test/IceUtil/inputUtil/Client.java
+++ b/java/test/src/main/java/test/IceUtil/inputUtil/Client.java
diff --git a/java/test/IceUtil/inputUtil/run.py b/java/test/src/main/java/test/IceUtil/inputUtil/run.py
index ff92c5757a1..cb15b614259 100755
--- a/java/test/IceUtil/inputUtil/run.py
+++ b/java/test/src/main/java/test/IceUtil/inputUtil/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Slice/generation/.gitignore b/java/test/src/main/java/test/Slice/generation/.gitignore
index 90b07e9d451..90b07e9d451 100644
--- a/java/test/Slice/generation/.gitignore
+++ b/java/test/src/main/java/test/Slice/generation/.gitignore
diff --git a/java/test/Slice/generation/File1.ice b/java/test/src/main/java/test/Slice/generation/File1.ice
index c92e0a00b2d..c92e0a00b2d 100644
--- a/java/test/Slice/generation/File1.ice
+++ b/java/test/src/main/java/test/Slice/generation/File1.ice
diff --git a/java/test/Slice/generation/File2.ice b/java/test/src/main/java/test/Slice/generation/File2.ice
index 2d6f7a498f7..2d6f7a498f7 100644
--- a/java/test/Slice/generation/File2.ice
+++ b/java/test/src/main/java/test/Slice/generation/File2.ice
diff --git a/java/test/Slice/generation/list-generated.out b/java/test/src/main/java/test/Slice/generation/list-generated.out
index cbacf36a41c..cbacf36a41c 100644
--- a/java/test/Slice/generation/list-generated.out
+++ b/java/test/src/main/java/test/Slice/generation/list-generated.out
diff --git a/java/test/Slice/generation/run.py b/java/test/src/main/java/test/Slice/generation/run.py
index 248350f9438..72f21335e28 100755
--- a/java/test/Slice/generation/run.py
+++ b/java/test/src/main/java/test/Slice/generation/run.py
@@ -10,7 +10,8 @@
 
 import os, sys, re
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Slice/keyword/Client.java b/java/test/src/main/java/test/Slice/keyword/Client.java
index df96ebc985f..df96ebc985f 100644
--- a/java/test/Slice/keyword/Client.java
+++ b/java/test/src/main/java/test/Slice/keyword/Client.java
diff --git a/java/test/Slice/keyword/Key.ice b/java/test/src/main/java/test/Slice/keyword/Key.ice
index f2002f43ccc..f2002f43ccc 100644
--- a/java/test/Slice/keyword/Key.ice
+++ b/java/test/src/main/java/test/Slice/keyword/Key.ice
diff --git a/java/test/Slice/keyword/run.py b/java/test/src/main/java/test/Slice/keyword/run.py
index 4f211e2bdd8..1b7865a118d 100755
--- a/java/test/Slice/keyword/run.py
+++ b/java/test/src/main/java/test/Slice/keyword/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Slice/macros/Client.java b/java/test/src/main/java/test/Slice/macros/Client.java
index 4c4fa0e7b0a..4c4fa0e7b0a 100644
--- a/java/test/Slice/macros/Client.java
+++ b/java/test/src/main/java/test/Slice/macros/Client.java
diff --git a/java/test/Slice/macros/Test.ice b/java/test/src/main/java/test/Slice/macros/Test.ice
index 2a791540afa..2a791540afa 100644
--- a/java/test/Slice/macros/Test.ice
+++ b/java/test/src/main/java/test/Slice/macros/Test.ice
diff --git a/java/test/Slice/macros/run.py b/java/test/src/main/java/test/Slice/macros/run.py
index 11e187b79d2..4b62a2b9c3a 100755
--- a/java/test/Slice/macros/run.py
+++ b/java/test/src/main/java/test/Slice/macros/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Slice/structure/Client.java b/java/test/src/main/java/test/Slice/structure/Client.java
index 74f2239ae2e..74f2239ae2e 100644
--- a/java/test/Slice/structure/Client.java
+++ b/java/test/src/main/java/test/Slice/structure/Client.java
diff --git a/java/test/Slice/structure/Test.ice b/java/test/src/main/java/test/Slice/structure/Test.ice
index 5cda671b732..5cda671b732 100644
--- a/java/test/Slice/structure/Test.ice
+++ b/java/test/src/main/java/test/Slice/structure/Test.ice
diff --git a/java/test/Slice/structure/run.py b/java/test/src/main/java/test/Slice/structure/run.py
index a3d93af454d..c48b8cf432c 100755
--- a/java/test/Slice/structure/run.py
+++ b/java/test/src/main/java/test/Slice/structure/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Util/Application.java b/java/test/src/main/java/test/Util/Application.java
index 07c7d28b54e..07c7d28b54e 100644
--- a/java/test/Util/Application.java
+++ b/java/test/src/main/java/test/Util/Application.java
diff --git a/java/test/test.iml b/java/test/test.iml
index 857ab40bfe4..975e1a9afea 100644
--- a/java/test/test.iml
+++ b/java/test/test.iml
@@ -5,7 +5,6 @@
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
@@ -15,16 +14,20 @@
       <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/src/main/java/test/Ice/ami/lambda" />
+      <excludeFolder url="file://$MODULE_DIR$/src/main/java/test/Ice/invoke/lambda" />
+      <excludeFolder url="file://$MODULE_DIR$/src/main/java/test/Ice/operations/lambda" />
+      <excludeFolder url="file://$MODULE_DIR$/src/main/java/test/Ice/optional/lambda" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
-    <orderEntry type="module" module-name="src_Freeze" exported="" />
-    <orderEntry type="module" module-name="src_IceDiscovery" exported="" />
-    <orderEntry type="module" module-name="src_IceBox" exported="" />
-    <orderEntry type="module" module-name="src_Glacier2" exported="" />
-    <orderEntry type="module" module-name="src_IceStorm" exported="" />
-    <orderEntry type="module" module-name="src_IceGrid" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
+    <orderEntry type="module" module-name="Freeze" exported="" />
+    <orderEntry type="module" module-name="IceDiscovery" exported="" />
+    <orderEntry type="module" module-name="IceBox" exported="" />
+    <orderEntry type="module" module-name="Glacier2" exported="" />
+    <orderEntry type="module" module-name="IceStorm" exported="" />
+    <orderEntry type="module" module-name="IceGrid" exported="" />
   </component>
 </module>