diff --git a/README.md b/README.md
index 3da8c296..73dda1d6 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 Some Android plugin versions have issues with Gradle's build cache feature. When applied to an Android project this plugin applies workarounds for these issues based on the Android plugin and Gradle versions.
 
 * Supported Gradle versions: 4.1+
-* Supported Android versions: 3.0.0, 3.0.1, 3.1.0-beta3, 3.2.0-alpha01
+* Supported Android versions: 3.0.0, 3.0.1, 3.1.0-beta4, 3.2.0-alpha01
 
 **Note:** With Android 3.1.x and 3.2.x the cache-fix plugin is only required if you are using Android's data binding feature.
 
diff --git a/build.gradle b/build.gradle
index 7880308a..9e5eb89c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,10 +22,10 @@ version = ["git", "describe", "--match", "[0-9]*", "--dirty"].execute().text.tri
 
 // Maps supported Android plugin versions to the versions of Gradle that support it
 def supportedVersions = [
-    "3.2.0-alpha01": ["4.5", "4.5.1"],
-    "3.1.0-beta3": ["4.4", "4.4.1", "4.5", "4.5.1"],
-    "3.0.0": ["4.1", "4.2", "4.2.1", "4.3", "4.3.1", "4.4", "4.4.1", "4.5", "4.5.1"],
-    "3.0.1": ["4.1", "4.2", "4.2.1", "4.3", "4.3.1", "4.4", "4.4.1", "4.5", "4.5.1"],
+    "3.2.0-alpha01": ["4.5.1"],
+    "3.1.0-beta4": ["4.4.1", "4.5.1"],
+    "3.0.0": ["4.1", "4.2.1", "4.3.1", "4.4.1", "4.5.1"],
+    "3.0.1": ["4.1", "4.2.1", "4.3.1", "4.4.1", "4.5.1"],
 ]
 
 repositories {
diff --git a/src/test/groovy/org/gradle/android/PluginApplicationTest.groovy b/src/test/groovy/org/gradle/android/PluginApplicationTest.groovy
index 6511cd7e..dc0aff19 100644
--- a/src/test/groovy/org/gradle/android/PluginApplicationTest.groovy
+++ b/src/test/groovy/org/gradle/android/PluginApplicationTest.groovy
@@ -46,8 +46,8 @@ class PluginApplicationTest extends AbstractTest {
         false | false       | "3.0.0"
         false | true        | "3.0.1"
         false | false       | "3.0.1"
-        false | true        | "3.1.0-beta3"
-        true  | false       | "3.1.0-beta3"
+        false | true        | "3.1.0-beta4"
+        true  | false       | "3.1.0-beta4"
         false | true        | "3.2.0-alpha01"
         true  | false       | "3.2.0-alpha01"
         description = warns ? "warn" : "not warn"
diff --git a/src/test/groovy/org/gradle/android/WorkaroundTest.groovy b/src/test/groovy/org/gradle/android/WorkaroundTest.groovy
index 4cdda670..01d73ed0 100644
--- a/src/test/groovy/org/gradle/android/WorkaroundTest.groovy
+++ b/src/test/groovy/org/gradle/android/WorkaroundTest.groovy
@@ -26,6 +26,7 @@ class WorkaroundTest extends Specification {
         "3.1.0-beta1"   | ["DataBindingDependencyArtifacts"]
         "3.1.0-beta2"   | ["DataBindingDependencyArtifacts"]
         "3.1.0-beta3"   | ["DataBindingDependencyArtifacts"]
+        "3.1.0-beta4"   | ["DataBindingDependencyArtifacts"]
         "3.2.0-alpha01" | ["DataBindingDependencyArtifacts"]
     }
 }