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 a765768..cc54727 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
@@ -37,7 +37,7 @@
   </target>
 
   <target name="gwtc" depends="javac" description="GWT compile to JavaScript (production mode)">
-    <java failonerror="true" fork="true" classname="@compileClass">
+    <java failonerror="true" fork="true" classname="@compileClass" maxmemory="256m">
       <classpath>
         <pathelement location="@srcFolder"/>
         <path refid="project.class.path"/>
@@ -51,7 +51,7 @@
   </target>
 
   <target name="devmode" depends="javac" description="Run development mode (pass -Dgwt.args=-nosuperDevMode to fallback to classic DevMode)">
-    <java failonerror="true" fork="true" classname="@shellClass">
+    <java failonerror="true" fork="true" classname="@shellClass" maxmemory="1g">
       <classpath>
         <pathelement location="@srcFolder"/>
         <path refid="project.class.path"/>
@@ -80,7 +80,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">
+    <junit fork="yes" printsummary="yes" haltonfailure="yes" maxmemory="256m">
       <sysproperty key="gwt.args" value="-logLevel WARN -war www-test" />
       <sysproperty key="java.awt.headless" value="true" />
       <classpath>
@@ -103,7 +103,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">
+    <junit fork="yes" printsummary="yes" haltonfailure="yes" maxmemory="256m">
       <sysproperty key="gwt.args" value="-prod -logLevel WARN -war www-test" />
       <sysproperty key="java.awt.headless" value="true" />
       <classpath>
diff --git a/user/src/com/google/gwt/user/tools/templates/eclipse/_moduleShortName_.launchsrc b/user/src/com/google/gwt/user/tools/templates/eclipse/_moduleShortName_.launchsrc
index 5d4a804..125b5f0 100644
--- a/user/src/com/google/gwt/user/tools/templates/eclipse/_moduleShortName_.launchsrc
+++ b/user/src/com/google/gwt/user/tools/templates/eclipse/_moduleShortName_.launchsrc
@@ -11,4 +11,5 @@
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-war @warFolder -startupUrl @startupUrl @moduleName"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@moduleShortName"/>
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1g"/>
 </launchConfiguration>