diff --git a/tests/org.eclipse.jst.server.geronimo.core.tests/.classpath b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/.classpath
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.core.tests/.classpath
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/.classpath
diff --git a/tests/org.eclipse.jst.server.geronimo.core.tests/.cvsignore b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/.cvsignore
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.core.tests/.cvsignore
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/.cvsignore
diff --git a/tests/org.eclipse.jst.server.geronimo.core.tests/.gitignore b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/.gitignore
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.core.tests/.gitignore
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/.gitignore
diff --git a/tests/org.eclipse.jst.server.geronimo.core.tests/.project b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/.project
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.core.tests/.project
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/.project
diff --git a/tests/org.eclipse.jst.server.geronimo.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.core.tests/.settings/org.eclipse.jdt.core.prefs
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/org.eclipse.jst.server.geronimo.core.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.core.tests/.settings/org.eclipse.jdt.ui.prefs
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/tests/org.eclipse.jst.server.geronimo.core.tests/META-INF/MANIFEST.MF b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.core.tests/META-INF/MANIFEST.MF
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/META-INF/MANIFEST.MF
diff --git a/tests/org.eclipse.jst.server.geronimo.core.tests/about.html b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/about.html
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.core.tests/about.html
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/about.html
diff --git a/tests/org.eclipse.jst.server.geronimo.core.tests/build.properties b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/build.properties
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.core.tests/build.properties
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/build.properties
diff --git a/tests/org.eclipse.jst.server.geronimo.core.tests/pom.xml b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/pom.xml
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.core.tests/pom.xml
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/pom.xml
diff --git a/tests/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/AllTests.java b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/AllTests.java
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/AllTests.java
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/AllTests.java
diff --git a/tests/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/ExistenceTest.java b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/ExistenceTest.java
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/ExistenceTest.java
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/ExistenceTest.java
diff --git a/tests/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/OrderedTestSuite.java b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/OrderedTestSuite.java
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/OrderedTestSuite.java
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/OrderedTestSuite.java
diff --git a/tests/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/TestsPlugin.java b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/TestsPlugin.java
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/TestsPlugin.java
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/TestsPlugin.java
diff --git a/tests/org.eclipse.jst.server.geronimo.core.tests/test.xml b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/test.xml
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.core.tests/test.xml
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.core.tests/test.xml
diff --git a/tests/org.eclipse.jst.server.geronimo.ui.tests/.classpath b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/.classpath
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.ui.tests/.classpath
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/.classpath
diff --git a/tests/org.eclipse.jst.server.geronimo.ui.tests/.cvsignore b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/.cvsignore
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.ui.tests/.cvsignore
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/.cvsignore
diff --git a/tests/org.eclipse.jst.server.geronimo.ui.tests/.gitignore b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/.gitignore
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.ui.tests/.gitignore
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/.gitignore
diff --git a/tests/org.eclipse.jst.server.geronimo.ui.tests/.project b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/.project
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.ui.tests/.project
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/.project
diff --git a/tests/org.eclipse.jst.server.geronimo.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.ui.tests/.settings/org.eclipse.jdt.core.prefs
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/org.eclipse.jst.server.geronimo.ui.tests/META-INF/MANIFEST.MF b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.ui.tests/META-INF/MANIFEST.MF
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/META-INF/MANIFEST.MF
diff --git a/tests/org.eclipse.jst.server.geronimo.ui.tests/about.html b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/about.html
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.ui.tests/about.html
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/about.html
diff --git a/tests/org.eclipse.jst.server.geronimo.ui.tests/build.properties b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/build.properties
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.ui.tests/build.properties
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/build.properties
diff --git a/tests/org.eclipse.jst.server.geronimo.ui.tests/pom.xml b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/pom.xml
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.ui.tests/pom.xml
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/pom.xml
diff --git a/tests/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/AllTests.java b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/AllTests.java
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/AllTests.java
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/AllTests.java
diff --git a/tests/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/ExistenceTest.java b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/ExistenceTest.java
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/ExistenceTest.java
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/ExistenceTest.java
diff --git a/tests/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/OrderedTestSuite.java b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/OrderedTestSuite.java
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/OrderedTestSuite.java
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/OrderedTestSuite.java
diff --git a/tests/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/TestsPlugin.java b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/TestsPlugin.java
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/TestsPlugin.java
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/TestsPlugin.java
diff --git a/tests/org.eclipse.jst.server.geronimo.ui.tests/test.xml b/tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/test.xml
similarity index 100%
rename from tests/org.eclipse.jst.server.geronimo.ui.tests/test.xml
rename to tests/DEPRECATED/org.eclipse.jst.server.geronimo.ui.tests/test.xml