diff --git a/dev-tools/eclipse/dot.classpath b/dev-tools/eclipse/dot.classpath
index 2b60809df0d..d1327838022 100644
--- a/dev-tools/eclipse/dot.classpath
+++ b/dev-tools/eclipse/dot.classpath
@@ -104,7 +104,7 @@
 	<classpathentry kind="lib" path="solr/lib/commons-httpclient-3.1.jar"/>
 	<classpathentry kind="lib" path="solr/lib/commons-io-1.4.jar"/>
 	<classpathentry kind="lib" path="solr/lib/commons-lang-2.4.jar"/>
-	<classpathentry kind="lib" path="solr/lib/easymock.jar"/>
+	<classpathentry kind="lib" path="solr/lib/easymock-2.2.jar"/>
 	<classpathentry kind="lib" path="solr/lib/geronimo-stax-api_1.0_spec-1.0.1.jar"/>
 	<classpathentry kind="lib" path="solr/lib/guava-r05.jar"/>
 	<classpathentry kind="lib" path="solr/lib/jcl-over-slf4j-1.6.1.jar"/>
diff --git a/solr/LICENSE.txt b/solr/LICENSE.txt
index d4623a64bad..c8048f3e371 100644
--- a/solr/LICENSE.txt
+++ b/solr/LICENSE.txt
@@ -534,7 +534,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ==========================================================================
-The following license applies to easymock.jar
+The following license applies to easymock-2.2.jar
 --------------------------------------------------------------------------
 EasyMock 2 License (MIT License)
 Copyright (c) 2001-2007 OFFIS, Tammo Freese.
diff --git a/solr/build.xml b/solr/build.xml
index 162cbbeafd5..936c0d722dc 100644
--- a/solr/build.xml
+++ b/solr/build.xml
@@ -607,7 +607,7 @@
          manifest="${dest}/META-INF/MANIFEST.MF">
        <lib dir="${lib}">
          <exclude name="servlet-api*.jar" />
-         <exclude name="easymock.jar" />
+         <exclude name="easymock-*.jar" />
          <exclude name="junit-*.jar" />
          <exclude name="*.txt" />
          <exclude name="*.template" />
diff --git a/solr/lib/easymock.jar b/solr/lib/easymock-2.2.jar
similarity index 100%
rename from solr/lib/easymock.jar
rename to solr/lib/easymock-2.2.jar