diff --git a/java/client/test/com/thoughtworks/selenium/BaseSuite.java b/java/client/test/com/thoughtworks/selenium/BaseSuite.java
index 6c979d539c896..bbe97c684244c 100644
--- a/java/client/test/com/thoughtworks/selenium/BaseSuite.java
+++ b/java/client/test/com/thoughtworks/selenium/BaseSuite.java
@@ -16,6 +16,8 @@
 
 package com.thoughtworks.selenium;
 
+import com.thoughtworks.selenium.testing.SeleniumTestEnvironment;
+
 import java.util.logging.Logger;
 
 import org.junit.ClassRule;
@@ -24,7 +26,6 @@
 import org.junit.rules.TestRule;
 import org.openqa.selenium.environment.GlobalTestEnvironment;
 import org.openqa.selenium.environment.TestEnvironment;
-import org.openqa.selenium.v1.SeleniumTestEnvironment;
 
 public class BaseSuite {
   
diff --git a/java/client/test/com/thoughtworks/selenium/InternalSelenseTestBase.java b/java/client/test/com/thoughtworks/selenium/InternalSelenseTestBase.java
index 9c36269405b29..7d2ff98496bcd 100644
--- a/java/client/test/com/thoughtworks/selenium/InternalSelenseTestBase.java
+++ b/java/client/test/com/thoughtworks/selenium/InternalSelenseTestBase.java
@@ -28,6 +28,7 @@
 import com.google.common.io.Files;
 import com.google.common.io.Resources;
 
+import com.thoughtworks.selenium.testing.SeleniumTestEnvironment;
 import com.thoughtworks.selenium.webdriven.WebDriverBackedSelenium;
 
 import org.junit.After;
@@ -51,7 +52,6 @@
 import org.openqa.selenium.testing.InProject;
 import org.openqa.selenium.testing.drivers.Browser;
 import org.openqa.selenium.testing.drivers.WebDriverBuilder;
-import org.openqa.selenium.v1.SeleniumTestEnvironment;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/java/client/test/com/thoughtworks/selenium/SessionExtensionJsTest.java b/java/client/test/com/thoughtworks/selenium/SessionExtensionJsTest.java
index e767313188952..7a71b939170d6 100644
--- a/java/client/test/com/thoughtworks/selenium/SessionExtensionJsTest.java
+++ b/java/client/test/com/thoughtworks/selenium/SessionExtensionJsTest.java
@@ -21,13 +21,13 @@
 import com.thoughtworks.selenium.DefaultSelenium;
 import com.thoughtworks.selenium.Selenium;
 import com.thoughtworks.selenium.SeleniumException;
+import com.thoughtworks.selenium.testing.SeleniumTestEnvironment;
 
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openqa.selenium.v1.SeleniumTestEnvironment;
 
 import java.net.MalformedURLException;
 import java.net.URL;
diff --git a/java/client/test/com/thoughtworks/selenium/StartTest.java b/java/client/test/com/thoughtworks/selenium/StartTest.java
index b40a6e907629e..eef4ad458b71a 100644
--- a/java/client/test/com/thoughtworks/selenium/StartTest.java
+++ b/java/client/test/com/thoughtworks/selenium/StartTest.java
@@ -19,6 +19,8 @@
 
 import static org.junit.Assert.assertEquals;
 
+import com.thoughtworks.selenium.testing.SeleniumTestEnvironment;
+
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -27,7 +29,6 @@
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.RemoteWebDriver;
-import org.openqa.selenium.v1.SeleniumTestEnvironment;
 
 import java.net.MalformedURLException;
 import java.net.URL;
diff --git a/java/client/test/org/openqa/selenium/v1/CachedContentServlet.java b/java/client/test/com/thoughtworks/selenium/testing/CachedContentServlet.java
similarity index 96%
rename from java/client/test/org/openqa/selenium/v1/CachedContentServlet.java
rename to java/client/test/com/thoughtworks/selenium/testing/CachedContentServlet.java
index bf8134ca49037..b06f87ef70cde 100644
--- a/java/client/test/org/openqa/selenium/v1/CachedContentServlet.java
+++ b/java/client/test/com/thoughtworks/selenium/testing/CachedContentServlet.java
@@ -1,4 +1,4 @@
-package org.openqa.selenium.v1;
+package com.thoughtworks.selenium.testing;
 
 import org.seleniumhq.jetty7.http.HttpFields;
 
diff --git a/java/client/test/org/openqa/selenium/v1/SeleniumAppServer.java b/java/client/test/com/thoughtworks/selenium/testing/SeleniumAppServer.java
similarity index 97%
rename from java/client/test/org/openqa/selenium/v1/SeleniumAppServer.java
rename to java/client/test/com/thoughtworks/selenium/testing/SeleniumAppServer.java
index 4e8551748547c..9e098bf8d7ff3 100644
--- a/java/client/test/org/openqa/selenium/v1/SeleniumAppServer.java
+++ b/java/client/test/com/thoughtworks/selenium/testing/SeleniumAppServer.java
@@ -14,7 +14,7 @@
 limitations under the License.
  */
 
-package org.openqa.selenium.v1;
+package com.thoughtworks.selenium.testing;
 
 import java.io.File;
 
diff --git a/java/client/test/org/openqa/selenium/v1/SeleniumTestEnvironment.java b/java/client/test/com/thoughtworks/selenium/testing/SeleniumTestEnvironment.java
similarity index 98%
rename from java/client/test/org/openqa/selenium/v1/SeleniumTestEnvironment.java
rename to java/client/test/com/thoughtworks/selenium/testing/SeleniumTestEnvironment.java
index 84e6f0af447b5..68b084e729237 100644
--- a/java/client/test/org/openqa/selenium/v1/SeleniumTestEnvironment.java
+++ b/java/client/test/com/thoughtworks/selenium/testing/SeleniumTestEnvironment.java
@@ -14,7 +14,7 @@
 limitations under the License.
  */
 
-package org.openqa.selenium.v1;
+package com.thoughtworks.selenium.testing;
 
 import com.google.common.collect.Lists;
 
diff --git a/java/client/test/org/openqa/selenium/v1/build.desc b/java/client/test/com/thoughtworks/selenium/testing/build.desc
similarity index 100%
rename from java/client/test/org/openqa/selenium/v1/build.desc
rename to java/client/test/com/thoughtworks/selenium/testing/build.desc