diff --git a/.travis.yml b/.travis.yml
index c9863ab49fe..a2a3d22da35 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,6 +48,7 @@ cache:
 before_install:
   - wget -qO ecm-ccm-elassandra.zip https://github.com/strapdata/ecm/archive/ccm-elassandra.zip
   - unzip ecm-ccm-elassandra.zip && cd ecm-ccm-elassandra && sudo ./setup.py install
+  - pip install --upgrade pip
   - pip3 install sphinx~=1.8.5 sphinx_rtd_theme
   - sudo fallocate -l 4G /swapfile
   - sudo chmod 600 /swapfile
diff --git a/build.gradle b/build.gradle
index 24484b40f3c..a779fe4c659 100644
--- a/build.gradle
+++ b/build.gradle
@@ -636,6 +636,10 @@ allprojects {
 }
 
 allprojects {
+    tasks.withType(JavaCompile).configureEach {
+        options.fork = true
+    }
+
   task checkPart1
   task checkPart2 
   tasks.matching { it.name == "check" }.all { check ->
@@ -659,4 +663,3 @@ gradle.projectsEvaluated {
 tasks.getByName('clean').dependsOn('cassandra-realclean')
 
 
-