diff --git a/dev/bots/test.dart b/dev/bots/test.dart
index 7ec56902225..ecec0fc38d2 100644
--- a/dev/bots/test.dart
+++ b/dev/bots/test.dart
@@ -604,7 +604,6 @@ Future<void> _runFrameworkTests() async {
     await _runFlutterTest(path.join(flutterRoot, 'packages', 'fuchsia_remote_debug_protocol'), tableData: bigqueryApi?.tabledata);
     await _runFlutterTest(path.join(flutterRoot, 'dev', 'integration_tests', 'non_nullable'),
       options: <String>['--enable-experiment=non-nullable'],
-      skip: true, // TODO(jonahwilliams): re-enable after https://github.com/flutter/flutter/issues/55872
     );
     await _runFlutterTest(
       path.join(flutterRoot, 'dev', 'tracing_tests'),
diff --git a/packages/flutter_tools/lib/src/test/flutter_platform.dart b/packages/flutter_tools/lib/src/test/flutter_platform.dart
index a4304956010..7ed351e4e0c 100644
--- a/packages/flutter_tools/lib/src/test/flutter_platform.dart
+++ b/packages/flutter_tools/lib/src/test/flutter_platform.dart
@@ -213,7 +213,7 @@ void catchIsolateErrors() {
 
 void main() {
   print('$_kStartTimeoutTimerMessage');
-  String serverPort = Platform.environment['SERVER_PORT'];
+  String serverPort = Platform.environment['SERVER_PORT'] ?? '';
   String server = Uri.decodeComponent('$encodedWebsocketUrl:\$serverPort');
   StreamChannel<dynamic> channel = serializeSuite(() {
     catchIsolateErrors();