diff --git a/build.gradle b/build.gradle
index 73a0ed86cb..18efbba171 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,7 +44,7 @@ subprojects { proj ->
 
   tasks.withType(JavaCompile) {
     if (!System.env.'CI') {
-      options.incremental = true
+      options.incremental = !rootProject.hasProperty('release')
     }
   }
 
diff --git a/guava/src/test/java/com/google/common/cache/CacheEvictionTest.java b/guava/src/test/java/com/google/common/cache/CacheEvictionTest.java
index af8f89fa04..063b3c447b 100644
--- a/guava/src/test/java/com/google/common/cache/CacheEvictionTest.java
+++ b/guava/src/test/java/com/google/common/cache/CacheEvictionTest.java
@@ -119,7 +119,8 @@ public void testEviction_maxWeight_zero() {
     LoadingCache<Integer, Integer> cache = CaffeinatedGuava.build(Caffeine.newBuilder()
         .maximumWeight(0)
         .weigher(evensOnly)
-        .removalListener(removalListener),
+        .removalListener(removalListener)
+        .executor(MoreExecutors.directExecutor()),
         loader);
 
     // 1 won't be cached