diff --git a/.sbtopts b/.sbtopts
new file mode 100644
index 0000000000000000000000000000000000000000..86d71f9de9c2af6ea589a7940dccc666e8d76031
--- /dev/null
+++ b/.sbtopts
@@ -0,0 +1,2 @@
+-J-Xss64M
+-J-Xms1024M
diff --git a/build.sbt b/build.sbt
index 239628b2c4556522ff2b77522de68df3c3074636..b82ddddc4a417ae7fd69f2e07f896de24bd739ed 100644
--- a/build.sbt
+++ b/build.sbt
@@ -70,7 +70,7 @@ script := {
                     |
                     |SCALACLASSPATH="$paths"
                     |
-                    |java -Xmx2G -Xms512M -classpath $${SCALACLASSPATH} -Dscala.usejavacp=false scala.tools.nsc.MainGenericRunner -classpath $${SCALACLASSPATH} leon.Main $$@ 2>&1 | tee -i last.log
+                    |java -Xmx2G -Xms512M -Xss64M -classpath $${SCALACLASSPATH} -Dscala.usejavacp=false scala.tools.nsc.MainGenericRunner -classpath $${SCALACLASSPATH} leon.Main $$@ 2>&1 | tee -i last.log
                     |""".stripMargin)
     f.setExecutable(true)
   } catch {
@@ -100,9 +100,9 @@ Keys.fork in run := true
 lazy val testSettings = Seq(
     //Keys.fork := true,
     logBuffered := true,
-    parallelExecution := true,
+    parallelExecution := true
     //testForkedParallel := true,
-    javaOptions ++= Seq("-Xss16M", "-Xmx4G")
+    //javaOptions ++= Seq("-Xss64M", "-Xmx4G")
 )
 
 // Unit Tests