diff --git a/dalvik/build.gradle.kts b/dalvik/build.gradle.kts
index f74a6a27b6..50f40d0f31 100644
--- a/dalvik/build.gradle.kts
+++ b/dalvik/build.gradle.kts
@@ -196,7 +196,7 @@ tasks.named<Test>("test") {
     // Disable the task for JDK 21 for now.  We have test failures due to a required r8 upgrade
     // that introduces some new behaviors we don't expect
     // See https://github.com/wala/WALA/issues/1349
-    enabled = false
+    // enabled = false
   }
   maxHeapSize = "800M"
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9281c1e7e6..5766673be4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ ktfmt = "0.44"
 spotless = "6.23.3"
 
 [libraries]
-android-tools = "com.android.tools:r8:8.2.38"
+android-tools = "com.android.tools:r8:8.2.39"
 ant = "org.apache.ant:ant:1.10.14"
 assertj-core = "org.assertj:assertj-core:3.24.2"
 commons-cli = "commons-cli:commons-cli:1.5.0"