diff --git a/modules/analysis/common/src/test/org/apache/lucene/collation/CollationTestBase.java b/lucene/src/test-framework/org/apache/lucene/analysis/CollationTestBase.java
similarity index 99%
rename from modules/analysis/common/src/test/org/apache/lucene/collation/CollationTestBase.java
rename to lucene/src/test-framework/org/apache/lucene/analysis/CollationTestBase.java
index 1c7084e7226..d0cd139f330 100644
--- a/modules/analysis/common/src/test/org/apache/lucene/collation/CollationTestBase.java
+++ b/lucene/src/test-framework/org/apache/lucene/analysis/CollationTestBase.java
@@ -1,4 +1,4 @@
-package org.apache.lucene.collation;
+package org.apache.lucene.analysis;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/modules/analysis/common/src/test/org/apache/lucene/collation/TestCollationKeyAnalyzer.java b/modules/analysis/common/src/test/org/apache/lucene/collation/TestCollationKeyAnalyzer.java
index bff441c148d..e3a0a29f061 100644
--- a/modules/analysis/common/src/test/org/apache/lucene/collation/TestCollationKeyAnalyzer.java
+++ b/modules/analysis/common/src/test/org/apache/lucene/collation/TestCollationKeyAnalyzer.java
@@ -19,6 +19,7 @@ package org.apache.lucene.collation;
 
 
 import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.CollationTestBase;
 import org.apache.lucene.index.codecs.CodecProvider;
 import org.apache.lucene.util.BytesRef;
 
diff --git a/modules/analysis/common/src/test/org/apache/lucene/collation/TestCollationKeyFilter.java b/modules/analysis/common/src/test/org/apache/lucene/collation/TestCollationKeyFilter.java
index c500df8022c..348cb307913 100644
--- a/modules/analysis/common/src/test/org/apache/lucene/collation/TestCollationKeyFilter.java
+++ b/modules/analysis/common/src/test/org/apache/lucene/collation/TestCollationKeyFilter.java
@@ -18,6 +18,7 @@ package org.apache.lucene.collation;
  */
 
 
+import org.apache.lucene.analysis.CollationTestBase;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.core.KeywordTokenizer;
diff --git a/modules/analysis/icu/build.xml b/modules/analysis/icu/build.xml
index 9ca66c83fd5..b3a313aa4a5 100644
--- a/modules/analysis/icu/build.xml
+++ b/modules/analysis/icu/build.xml
@@ -43,16 +43,6 @@
     <path refid="base.classpath"/>
   </path>
 
-  <path id="test.classpath">
-  	<pathelement path="${analyzers-common.jar}"/>
-    <path refid="classpath"/>
-    <pathelement location="../../../lucene/build/classes/test-framework/"/>
-    <pathelement location="../../../lucene/build/classes/test/"/>
-  	<pathelement location="../build/common/classes/test/"/>
-    <path refid="junit-path"/>
-    <pathelement location="${build.dir}/classes/java"/>
-  </path>
-
   <target name="compile-core" depends="jar-analyzers-common, common.compile-core" />
 
   <property name="gennorm2.src.dir" value="src/data/utr30"/>
diff --git a/modules/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyAnalyzer.java b/modules/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyAnalyzer.java
index dc6a3e80300..305ee2706c9 100644
--- a/modules/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyAnalyzer.java
+++ b/modules/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyAnalyzer.java
@@ -21,6 +21,7 @@ package org.apache.lucene.collation;
 import com.ibm.icu.text.Collator;
 
 import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.CollationTestBase;
 import org.apache.lucene.index.codecs.CodecProvider;
 import org.apache.lucene.util.BytesRef;
 
diff --git a/modules/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilter.java b/modules/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilter.java
index d05d80a451b..68b0ec92c0b 100644
--- a/modules/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilter.java
+++ b/modules/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilter.java
@@ -19,6 +19,8 @@ package org.apache.lucene.collation;
 
 
 import com.ibm.icu.text.Collator;
+
+import org.apache.lucene.analysis.CollationTestBase;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.core.KeywordTokenizer;