diff --git a/circle.yml b/circle.yml
index 4e1520c5a..5a5a129ea 100644
--- a/circle.yml
+++ b/circle.yml
@@ -3,7 +3,8 @@ general:
     - app/build/outputs/apk
 machine:
   environment:
-    GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
+    GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx1536m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError"'
+    _JAVA_OPTIONS: "-Xms256m -Xmx1280m -XX:MaxPermSize=350m"
   java:
     version: oraclejdk8
 dependencies:
@@ -18,5 +19,5 @@ dependencies:
 
 test:
   override:
-    - ./gradlew assembleDebug -Pandroid.threadPoolSize=1 -Dorg.gradle.parallel=false -Dorg.gradle.jvmargs="-Xms512m -Xmx1024m" -Dorg.gradle.daemon=false -PdisablePreDex:
-        timeout: 1800
+    - ./gradlew assembleDebug -PdisablePreDex:
+        timeout: 1800
\ No newline at end of file