diff --git a/packages/flutter_tools/test/integration/flutter_run.dart b/packages/flutter_tools/test/integration/flutter_run_test.dart
similarity index 85%
rename from packages/flutter_tools/test/integration/flutter_run.dart
rename to packages/flutter_tools/test/integration/flutter_run_test.dart
index f8b8d0e9d8b..8374eebe9ab 100644
--- a/packages/flutter_tools/test/integration/flutter_run.dart
+++ b/packages/flutter_tools/test/integration/flutter_run_test.dart
@@ -38,7 +38,10 @@ void main() {
 
       expect(_proc.stdout, isNot(contains('flutter has exited unexpectedly')));
       expect(_proc.stderr, isNot(contains('flutter has exited unexpectedly')));
-      expect(_proc.stderr, contains('Unable to locate a development'));
+      if (!_proc.stderr.toString().contains('Unable to locate a development')
+        && !_proc.stdout.toString().contains('No devices found with name or id matching')) {
+          fail("'flutter run -d invalid-device-id' did not produce the expected error");
+        }
     });
   }, timeout: const Timeout.factor(6));
 }