diff --git a/bin/internal/engine.version b/bin/internal/engine.version
index 6c3c7fadbc..9face4a3ec 100644
--- a/bin/internal/engine.version
+++ b/bin/internal/engine.version
@@ -1 +1 @@
-4c79e423dc6f89f98d8ceb263a5ca78e2f2da996
+58cdd53f9083412fa7da893f53c1ca1c93500532
diff --git a/packages/flutter_tools/test/integration/expression_evaluation_test.dart b/packages/flutter_tools/test/integration/expression_evaluation_test.dart
index 2ecddfc39c..e594f2ac3d 100644
--- a/packages/flutter_tools/test/integration/expression_evaluation_test.dart
+++ b/packages/flutter_tools/test/integration/expression_evaluation_test.dart
@@ -33,13 +33,13 @@ void main() {
 
     Future<VMIsolate> breakInBuildMethod(FlutterTestDriver flutter) async {
       return _flutter.breakAt(
-          Uri.parse('package:test/main.dart'),
+          Uri.file(_project.buildMethodBreakpointFile),
           _project.buildMethodBreakpointLine);
     }
 
     Future<VMIsolate> breakInTopLevelFunction(FlutterTestDriver flutter) async {
       return _flutter.breakAt(
-          Uri.parse('package:test/main.dart'),
+          Uri.file(_project.topLevelFunctionBreakpointFile),
           _project.topLevelFunctionBreakpointLine);
     }
 
diff --git a/packages/flutter_tools/test/integration/hot_reload_test.dart b/packages/flutter_tools/test/integration/hot_reload_test.dart
index 86c0125bad..3abe5c3803 100644
--- a/packages/flutter_tools/test/integration/hot_reload_test.dart
+++ b/packages/flutter_tools/test/integration/hot_reload_test.dart
@@ -41,7 +41,7 @@ void main() {
     test('reload hits breakpoints after reload', () async {
       await _flutter.run(withDebugger: true);
       final VMIsolate isolate = await _flutter.breakAt(
-          Uri.parse('package:test/main.dart'),
+          Uri.file(_project.breakpointFile),
           _project.breakpointLine);
       expect(isolate.pauseEvent, isInstanceOf<VMPauseBreakpointEvent>());
     });