diff --git a/eclipse/user/.classpath b/eclipse/user/.classpath
index 39d4509..18f1839 100644
--- a/eclipse/user/.classpath
+++ b/eclipse/user/.classpath
@@ -28,8 +28,9 @@
 	<classpathentry kind="var" path="GWT_TOOLS/lib/w3c/sac/sac-1.3.jar"/>
 	<classpathentry kind="var" path="GWT_TOOLS/lib/w3c/flute/flute-1.3-gg1.jar"/>
 	<classpathentry kind="var" path="GWT_TOOLS/lib/cglib/cglib-2.2.jar"/>
-	<classpathentry kind="var" path="GWT_TOOLS/lib/easymock/easymock.jar"/>
-	<classpathentry kind="var" path="GWT_TOOLS/lib/easymock/easymockclassextension.jar"/>
+	<classpathentry kind="var" path="GWT_TOOLS/lib/objenesis/objenesis-1.2.jar"/>
+  <classpathentry kind="var" path="GWT_TOOLS/lib/easymock/easymock-3.0.jar"/>
+  <classpathentry kind="var" path="GWT_TOOLS/lib/easymock/easymockclassextension-3.0.jar"/>
 	<classpathentry kind="var" path="GWT_TOOLS/lib/objectweb/asm-3.1.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/gwt-dev"/>
 	<classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-r5940/htmlunit-r5940.jar" sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-r5940/htmlunit-r5940-sources.jar"/>
diff --git a/user/build.xml b/user/build.xml
index 6c40ce0..d877276 100755
--- a/user/build.xml
+++ b/user/build.xml
@@ -58,8 +58,9 @@
     <pathelement location="test_i18n_${gwt.i18n.test.InnerClassChar}" />
     <pathelement location="${gwt.tools.lib}/apache/log4j/log4j-1.2.16.jar" />
     <pathelement location="${gwt.tools.lib}/cglib/cglib-2.2.jar"/>
-    <pathelement location="${gwt.tools.lib}/easymock/easymock.jar"/>
-    <pathelement location="${gwt.tools.lib}/easymock/easymockclassextension.jar"/>
+    <pathelement location="${gwt.tools.lib}/objenesis/objenesis-1.2.jar"/>
+    <pathelement location="${gwt.tools.lib}/easymock/easymock-3.0.jar"/>
+    <pathelement location="${gwt.tools.lib}/easymock/easymockclassextension-3.0.jar"/>
     <pathelement location="${gwt.tools.lib}/objectweb/asm-3.1.jar"/>
     <pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar" />
     <pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA-sources.jar" />