diff --git a/build.gradle.kts b/build.gradle.kts
index 7160ca59539..bdd570682b1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -183,7 +183,7 @@ extra["versions.jflex"] = "1.7.0"
 extra["versions.markdown"] = "0.1.25"
 extra["versions.trove4j"] = "1.0.20181211"
 extra["versions.completion-ranking-kotlin"] = "0.1.3"
-extra["versions.r8"] = "2.1.75"
+extra["versions.r8"] = "2.1.96"
 val immutablesVersion = "0.3.1"
 extra["versions.kotlinx-collections-immutable"] = immutablesVersion
 extra["versions.kotlinx-collections-immutable-jvm"] = immutablesVersion
diff --git a/compiler/testData/codegen/box/classes/quotedClassName.kt b/compiler/testData/codegen/box/classes/quotedClassName.kt
index ca81c973a2e..2d0a14d88e8 100644
--- a/compiler/testData/codegen/box/classes/quotedClassName.kt
+++ b/compiler/testData/codegen/box/classes/quotedClassName.kt
@@ -5,7 +5,7 @@
 // IGNORE_BACKEND: JS
 
 // Exclamation marks are not valid in names in the dex file format.
-// Therefore, do not attemp to dex this file as it will fail.
+// Therefore, do not attempt to dex this file as it will fail.
 // See: https://source.android.com/devices/tech/dalvik/dex-format#simplename
 // IGNORE_DEXING
 // IGNORE_BACKEND: ANDROID
@@ -16,4 +16,4 @@ class `A!u00A0`() {
 
 fun box(): String {
     return `A!u00A0`().ok
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/codegen/box/localClasses/nameWithWhitespace.kt b/compiler/testData/codegen/box/localClasses/nameWithWhitespace.kt
index c9de3c01073..7671ff17215 100644
--- a/compiler/testData/codegen/box/localClasses/nameWithWhitespace.kt
+++ b/compiler/testData/codegen/box/localClasses/nameWithWhitespace.kt
@@ -6,11 +6,9 @@
 
 // Names with spaces are not valid according to the dex specification
 // before DEX version 040. Therefore, do not attempt to dex the resulting
-// class file. When D8 is updated to the most recent version, we can increase
-// the min android api level during dexing to allow these spaces.
+// class file with a min api below 30.
 //
 // See: https://source.android.com/devices/tech/dalvik/dex-format#simplename
-// IGNORE_DEXING
 // IGNORE_BACKEND: ANDROID
 
 fun `method with spaces`(): String {
diff --git a/compiler/testData/codegen/box/reflection/genericSignature/samWrappedLambdaVsReference.kt b/compiler/testData/codegen/box/reflection/genericSignature/samWrappedLambdaVsReference.kt
index ad85ca78f24..a89030a4d27 100644
--- a/compiler/testData/codegen/box/reflection/genericSignature/samWrappedLambdaVsReference.kt
+++ b/compiler/testData/codegen/box/reflection/genericSignature/samWrappedLambdaVsReference.kt
@@ -2,8 +2,6 @@
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FULL_JDK
-// IGNORE_DEXING
-// ^ https://issuetracker.google.com/issues/182339153
 
 // FILE: Java.java
 
diff --git a/compiler/testData/codegen/box/valueClasses/jvmInline.kt b/compiler/testData/codegen/box/valueClasses/jvmInline.kt
index dbe7ca8d057..1ef4eef033d 100644
--- a/compiler/testData/codegen/box/valueClasses/jvmInline.kt
+++ b/compiler/testData/codegen/box/valueClasses/jvmInline.kt
@@ -1,6 +1,5 @@
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
-// IGNORE_DEXING
 // IGNORE_BACKEND: WASM
 // IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: ANDROID
@@ -1005,4 +1004,4 @@ fun box(): String {
         test()
     }
     return "OK"
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/codegen/boxInline/anonymousObject/sam/kt22304.kt b/compiler/testData/codegen/boxInline/anonymousObject/sam/kt22304.kt
index afb41bb0a06..84b94ee69ad 100644
--- a/compiler/testData/codegen/boxInline/anonymousObject/sam/kt22304.kt
+++ b/compiler/testData/codegen/boxInline/anonymousObject/sam/kt22304.kt
@@ -1,7 +1,5 @@
 // FULL_JDK
 // TARGET_BACKEND: JVM
-// IGNORE_DEXING
-//  ^ 2.1.75 fails with AssertionError (2.0.88 doesn't). TODO: investigate in more detail.
 // FILE: 1.kt
 
 package test
diff --git a/compiler/testData/codegen/bytecodeListing/jvmRecordStructure.kt b/compiler/testData/codegen/bytecodeListing/jvmRecordStructure.kt
index af49a7918b3..fa9bee935bf 100644
--- a/compiler/testData/codegen/bytecodeListing/jvmRecordStructure.kt
+++ b/compiler/testData/codegen/bytecodeListing/jvmRecordStructure.kt
@@ -4,6 +4,8 @@
 // ENABLE_JVM_PREVIEW
 // WITH_RUNTIME
 // JDK_15
+
+// D8 does not yet desugar java records.
 // IGNORE_DEXING
 
 interface KI<T> {
diff --git a/compiler/testData/codegen/bytecodeText/mangling/parenthesesNoSanitize.kt b/compiler/testData/codegen/bytecodeText/mangling/parenthesesNoSanitize.kt
index 757c699fa16..f80661992d0 100644
--- a/compiler/testData/codegen/bytecodeText/mangling/parenthesesNoSanitize.kt
+++ b/compiler/testData/codegen/bytecodeText/mangling/parenthesesNoSanitize.kt
@@ -1,3 +1,6 @@
+// Parenthesis are not valid in names in the dex file format.
+// Therefore, do not attempt to dex this file as it will fail.
+// See: https://source.android.com/devices/tech/dalvik/dex-format#simplename
 // IGNORE_DEXING
 class `(X)` {
     fun `(Y)`() {}
diff --git a/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/D8Checker.java b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/D8Checker.java
index f9818c8daa7..2f15191e94c 100644
--- a/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/D8Checker.java
+++ b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/D8Checker.java
@@ -65,7 +65,7 @@ public class D8Checker {
     private static void runD8(Consumer<D8Command.Builder> addInput) {
         ProgramConsumer ignoreOutputConsumer = new DexIndexedConsumer.ForwardingConsumer(null);
         D8Command.Builder builder = D8Command.builder(new TestDiagnosticsHandler())
-                .setMinApiLevel(28)
+                .setMinApiLevel(30)
                 .setMode(CompilationMode.DEBUG)
                 .setProgramConsumer(ignoreOutputConsumer);
         addInput.accept(builder);