diff --git a/.travis.yml b/.travis.yml
index 02195d586e..f0f8e5742c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,3 +24,5 @@ cache:
   directories:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
+env:
+  - GRADLE_OPTS="-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index c1ac6d22cc..1d3591c8a4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,7 +15,4 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-
-org.gradle.daemon=true
-org.gradle.jvmargs=-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m
\ No newline at end of file
+# org.gradle.parallel=true
\ No newline at end of file