diff --git a/user/src/com/google/gwt/user/tools/templates/_eclipse-test/_moduleShortName_Suite-dev.launchsrc b/user/src/com/google/gwt/user/tools/templates/_eclipse-test/_moduleShortName_Suite-dev.launchsrc
index ea34352..e791f18 100644
--- a/user/src/com/google/gwt/user/tools/templates/_eclipse-test/_moduleShortName_Suite-dev.launchsrc
+++ b/user/src/com/google/gwt/user/tools/templates/_eclipse-test/_moduleShortName_Suite-dev.launchsrc
@@ -12,6 +12,6 @@
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;@gwtCodeServerPath&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@moduleShortName"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dgwt.args=&quot;-logLevel WARN -war www-test&quot;"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dgwt.args=&quot;-devMode -logLevel WARN -war www-test&quot;"/>
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
 </launchConfiguration>
diff --git a/user/src/com/google/gwt/user/tools/templates/_eclipse-test/_moduleShortName_Suite-prod.launchsrc b/user/src/com/google/gwt/user/tools/templates/_eclipse-test/_moduleShortName_Suite-prod.launchsrc
index 0e1c71a..ea34352 100644
--- a/user/src/com/google/gwt/user/tools/templates/_eclipse-test/_moduleShortName_Suite-prod.launchsrc
+++ b/user/src/com/google/gwt/user/tools/templates/_eclipse-test/_moduleShortName_Suite-prod.launchsrc
@@ -12,6 +12,6 @@
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;@gwtCodeServerPath&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@moduleShortName"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dgwt.args=&quot;-prod -logLevel WARN -war www-test&quot;"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dgwt.args=&quot;-logLevel WARN -war www-test&quot;"/>
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
 </launchConfiguration>
diff --git a/user/src/com/google/gwt/user/tools/templates/ant/build.xmlsrc b/user/src/com/google/gwt/user/tools/templates/ant/build.xmlsrc
index 0b20bc1..a0a76ed 100644
--- a/user/src/com/google/gwt/user/tools/templates/ant/build.xmlsrc
+++ b/user/src/com/google/gwt/user/tools/templates/ant/build.xmlsrc
@@ -81,7 +81,7 @@
   <target name="test.dev" depends="javac.tests" description="Run development mode tests">
     <mkdir dir="reports/htmlunit.dev" />
     <junit fork="yes" printsummary="yes" haltonfailure="yes" maxmemory="256m">
-      <sysproperty key="gwt.args" value="-logLevel WARN -war www-test" />
+      <sysproperty key="gwt.args" value="-devMode -logLevel WARN -war www-test" />
       <sysproperty key="java.awt.headless" value="true" />
       <classpath>
         <pathelement location="@srcFolder" />
@@ -104,7 +104,7 @@
   <target name="test.prod" depends="javac.tests" description="Run production mode tests">
     <mkdir dir="reports/htmlunit.prod" />
     <junit fork="yes" printsummary="yes" haltonfailure="yes" maxmemory="256m">
-      <sysproperty key="gwt.args" value="-prod -logLevel WARN -war www-test" />
+      <sysproperty key="gwt.args" value="-logLevel WARN -war www-test" />
       <sysproperty key="java.awt.headless" value="true" />
       <classpath>
         <pathelement location="@srcFolder" />