diff --git a/frontend_server/lib/server.dart b/frontend_server/lib/server.dart
index 63bd25b13..87e148b52 100644
--- a/frontend_server/lib/server.dart
+++ b/frontend_server/lib/server.dart
@@ -158,7 +158,7 @@ class _FrontendCompiler implements CompilerInterface {
     final IOSink sink = new File(_kernelBinaryFilename).openWrite();
     final BinaryPrinter printer = printerFactory.newBinaryPrinter(sink);
     printer.writeProgramFile(deltaProgram.newProgram);
-    _outputStream.writeln("$boundaryKey");
+    _outputStream.writeln("$boundaryKey $_kernelBinaryFilename");
     await sink.close();
     return null;
   }
diff --git a/frontend_server/test/server_test.dart b/frontend_server/test/server_test.dart
index 3a6b9b2db..40b188282 100644
--- a/frontend_server/test/server_test.dart
+++ b/frontend_server/test/server_test.dart
@@ -222,7 +222,7 @@ Future<int> main() async {
               boundaryKey = s.substring(RESULT_OUTPUT_SPACE.length);
             }
           } else {
-            if (s == boundaryKey) {
+            if (s.startsWith(boundaryKey)) {
               boundaryKey = null;
               receivedResult.sendPort.send(true);
             }