diff --git a/.travis.yml b/.travis.yml
index 31d571fde4..ec1632958e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: android
 jdk: oraclejdk8
 env:
   matrix:
-    - ANDROID_TARGET=android-28 ANDROID_ABI=x86 org.gradle.jvmargs=-Xmx2g -XX:-OmitStackTraceInFastThrow
+    - ANDROID_TARGET=android-28 ANDROID_ABI=x86 org.gradle.jvmargs=-XX:-OmitStackTraceInFastThrow
 android:
   components:
   - platform-tools
diff --git a/app/build.gradle b/app/build.gradle
index 4facf2fa78..d5487c62c2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -195,8 +195,15 @@ android {
     }
 
     testOptions {
-        unitTests.returnDefaultValues = true
-        unitTests.includeAndroidResources = true
+        unitTests {
+            returnDefaultValues = true
+            includeAndroidResources = true
+
+            all {
+                maxParallelForks = 10
+                forkEvery = 20
+            }
+        }
     }
 
     useLibrary "org.apache.http.legacy"