diff --git a/build.gradle b/build.gradle
index 07166569..90903743 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,7 +56,7 @@ dependencies {
     compileOnly "com.android.tools.build:gradle:3.5.0"
 
     compile 'com.google.guava:guava:27.0.1-jre'
-    compile 'com.google.gradle:osdetector-gradle-plugin:1.6.2'
+    compile 'com.google.gradle:osdetector-gradle-plugin:1.7.0'
     compile 'commons-lang:commons-lang:2.6'
 
     testCompile 'junit:junit:4.12'
diff --git a/src/test/groovy/com/google/protobuf/gradle/ProtobufAndroidPluginTest.groovy b/src/test/groovy/com/google/protobuf/gradle/ProtobufAndroidPluginTest.groovy
index d4e31bf2..348111a0 100644
--- a/src/test/groovy/com/google/protobuf/gradle/ProtobufAndroidPluginTest.groovy
+++ b/src/test/groovy/com/google/protobuf/gradle/ProtobufAndroidPluginTest.groovy
@@ -15,8 +15,8 @@ import spock.lang.Unroll
  */
 @CompileDynamic
 class ProtobufAndroidPluginTest extends Specification {
-  private static final List<String> GRADLE_VERSION = ["5.6", "6.5-milestone-1"]
-  private static final List<String> ANDROID_PLUGIN_VERSION = ["3.5.0", "4.1.0-alpha10"]
+  private static final List<String> GRADLE_VERSION = ["5.6", "6.5", "6.8"]
+  private static final List<String> ANDROID_PLUGIN_VERSION = ["3.5.0", "4.1.0", "4.2.0-alpha10"]
 
   @Unroll
   void "testProjectAndroid should be successfully executed [android #agpVersion, gradle #gradleVersion]"() {
@@ -70,8 +70,7 @@ class ProtobufAndroidPluginTest extends Specification {
             mainProjectDir,
             gradleVersion,
             "testProjectAndroid:assembleDebug",
-            "-Dorg.gradle.unsafe.instant-execution=true",
-            "-Dorg.gradle.unsafe.instant-execution.fail-on-problems=false"
+            "-Dorg.gradle.unsafe.configuration-cache=true"
     )
     when: "build is invoked"
     BuildResult result = runner.build()
@@ -86,7 +85,7 @@ class ProtobufAndroidPluginTest extends Specification {
     result = runner.build()
 
     then: "it reuses the task graph"
-    result.output.contains("Reusing instant execution cache")
+    result.output.contains("Reusing configuration cache")
 
     and: "it is up to date"
     result.task(":testProjectAndroid:assembleDebug").outcome == TaskOutcome.UP_TO_DATE
@@ -96,8 +95,7 @@ class ProtobufAndroidPluginTest extends Specification {
             mainProjectDir,
             gradleVersion,
             "testProjectAndroid:clean",
-            "-Dorg.gradle.unsafe.instant-execution=true",
-            "-Dorg.gradle.unsafe.instant-execution.fail-on-problems=false"
+            "-Dorg.gradle.unsafe.configuration-cache=true"
     )
     result = runner.build()
 
diff --git a/src/test/groovy/com/google/protobuf/gradle/ProtobufJavaPluginTest.groovy b/src/test/groovy/com/google/protobuf/gradle/ProtobufJavaPluginTest.groovy
index 0ce9b0e7..71f6b1ed 100644
--- a/src/test/groovy/com/google/protobuf/gradle/ProtobufJavaPluginTest.groovy
+++ b/src/test/groovy/com/google/protobuf/gradle/ProtobufJavaPluginTest.groovy
@@ -93,8 +93,7 @@ class ProtobufJavaPluginTest extends Specification {
       .withProjectDir(projectDir)
       .withArguments(
           'build', '--stacktrace',
-          '--configuration-cache',
-          '--configuration-cache-problems=warn'
+          '--configuration-cache'
       )
       .withPluginClasspath()
       .withGradleVersion(gradleVersion)