diff --git a/src/test/java/com/android/tools/r8/debug/FinallyBlockTest.java b/src/test/java/com/android/tools/r8/debug/FinallyBlockTest.java
index 2d8119f..05bff95 100644
--- a/src/test/java/com/android/tools/r8/debug/FinallyBlockTest.java
+++ b/src/test/java/com/android/tools/r8/debug/FinallyBlockTest.java
@@ -80,7 +80,9 @@
         checkLine(FILE, 11), // throw without catch
         stepOver(),
         checkLine(FILE, 18), // finally
-        stepOver(),
+        // Don't single step here as some Java compilers generate line entry 19 and some don't.
+        breakpoint(CLASS, "callFinallyBlock", 26),
+        run(),
         checkLine(FILE, 26), // catch in callFinallyBlock
         run());
   }