diff --git a/requestfactory/build.xml b/requestfactory/build.xml
index 8c41c14..5139e8c 100755
--- a/requestfactory/build.xml
+++ b/requestfactory/build.xml
@@ -85,7 +85,7 @@
   -->
   <target name="test" depends="requestfactory-test+src" description="Run RequestFactoryJreSuite">
     <java failonerror="true" fork="true"
-      classname="com.google.web.bindery.requestfactory.RequestFactoryJreSuite">
+      classname="com.google.web.bindery.requestfactory.vm.RequestFactoryJreSuite">
       <jvmarg value="-Xss8m" />
       <classpath>
         <fileset dir="${gwt.tools.lib}" includes="tomcat/servlet-api-2.5.jar" />
diff --git a/user/src/com/google/web/bindery/requestfactory/RequestFactory.gwt.xml b/user/src/com/google/web/bindery/requestfactory/RequestFactory.gwt.xml
index 6c888c7..279acc4 100644
--- a/user/src/com/google/web/bindery/requestfactory/RequestFactory.gwt.xml
+++ b/user/src/com/google/web/bindery/requestfactory/RequestFactory.gwt.xml
@@ -22,9 +22,9 @@
   <inherits name='com.google.gwt.http.HTTP'/>
   <inherits name='com.google.gwt.logging.LoggingDisabled'/>
 
-  <source path="client"/>
+  <source path="gwt/client"/>
+  <source path="gwt/ui/client"/>
   <source path="shared"/>
-  <source path="ui/client"/>
   <super-source path="super" />
   <generate-with
     class="com.google.web.bindery.requestfactory.gwt.rebind.RequestFactoryEditorDriverGenerator">