diff --git a/.travis.yml b/.travis.yml
index f8a719e11..3e2690f51 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,6 @@ env:
   global:
     # COMPONENT_GOOGLE_REPO
     - secure: "OQ/wkORxY2qv4CmAdMxyW4ihRt5GRyxKxQRZpsdjMbwIKf3DlY6vBoNIEQ46sRRLAKOzkQ3LirodbWRCBlDN9WFw4XRsLTveqqtslMGeLf04peazXMIa6rJ22BCDGEmnzRNx6r3JRb9wEK1plNv4u4G9DgQ7ShzbwdZ8A5grlg8="
-    - GRADLE_OPTS: "-Dorg.gradle.parallel=false -Dkotlin.incremental=false -Dkotlin.compiler.execution.strategy=in-process"
 
 addons:
   apt:
@@ -50,6 +49,7 @@ before_install:
 
 install:
   - ./travis/scripts/fetch_private_files.sh
+  - cat ./travis/configs/gradle.properties > ./gradle.properties
 
 before_script:
   # Validate if patches work
diff --git a/travis/configs/gradle.properties b/travis/configs/gradle.properties
new file mode 100644
index 000000000..a502a6709
--- /dev/null
+++ b/travis/configs/gradle.properties
@@ -0,0 +1,22 @@
+#
+#         Twidere - Twitter client for Android
+#
+# Copyright 2012-2017 Mariotaku Lee <mariotaku.lee@gmail.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Travis has 4g memory for container-based instances, 7.5g for VM-based instances
+org.gradle.jvmargs=-Xmx3.5g
+org.gradle.parallel=false
+kotlin.incremental=false
+kotlin.compiler.execution.strategy=in-process
\ No newline at end of file