diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineCatchHandlerWithLibraryTypeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineCatchHandlerWithLibraryTypeTest.java
index 5874af4..e5635d0 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineCatchHandlerWithLibraryTypeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineCatchHandlerWithLibraryTypeTest.java
@@ -93,11 +93,6 @@
         || parameters.getApiLevel().getLevel() < EXCEPTIONS.get(exception);
   }
 
-  private boolean compileTargetHasVerificationBug() {
-    // A CF target could target any API in the end.
-    return parameters.isCfRuntime() || parameters.getApiLevel().isLessThan(AndroidApiLevel.L);
-  }
-
   @Test
   public void test() throws Exception {
     testForR8(parameters.getBackend())
@@ -131,7 +126,7 @@
     boolean mainHasInlinedCatchHandler =
         Streams.stream(classSubject.mainMethod().iterateTryCatches())
             .anyMatch(tryCatch -> tryCatch.isCatching(exception));
-    if (compileTargetHasVerificationBug() && compilationTargetIsMissingExceptionType()) {
+    if (compilationTargetIsMissingExceptionType()) {
       assertFalse(mainHasInlinedCatchHandler);
     } else {
       assertTrue(mainHasInlinedCatchHandler);
