diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index 3a87f6881a..7e7be92c89 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -305,7 +305,7 @@ jobs:
         uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http;commands:command_2"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http;commands:command_1"
           restore-keys: |
             os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http
             os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
@@ -335,7 +335,7 @@ jobs:
       - job_005
       - job_006
   job_008:
-    name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/http; `dart test --test-randomize-ordering-seed=random --platform chrome`"
+    name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/http; `dart test --test-randomize-ordering-seed=random --platform chrome -c dart2js,dart2wasm`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
@@ -360,8 +360,8 @@ jobs:
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: pkgs/http
-      - name: "pkgs/http; dart test --test-randomize-ordering-seed=random --platform chrome"
-        run: "dart test --test-randomize-ordering-seed=random --platform chrome"
+      - name: "pkgs/http; dart test --test-randomize-ordering-seed=random --platform chrome -c dart2js,dart2wasm"
+        run: "dart test --test-randomize-ordering-seed=random --platform chrome -c dart2js,dart2wasm"
         if: "always() && steps.pkgs_http_pub_upgrade.conclusion == 'success'"
         working-directory: pkgs/http
     needs:
@@ -409,6 +409,43 @@ jobs:
       - job_005
       - job_006
   job_010:
+    name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/http; `dart test --test-randomize-ordering-seed=random -p node`"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache Pub hosted dependencies
+        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7
+        with:
+          path: "~/.pub-cache/hosted"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http;commands:test_4"
+          restore-keys: |
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
+            os:ubuntu-latest;pub-cache-hosted
+            os:ubuntu-latest
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@65eb853c7ba17dde3be364c3d2858773e7144260
+        with:
+          sdk: "3.4.0"
+      - id: checkout
+        name: Checkout repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+      - id: pkgs_http_pub_upgrade
+        name: pkgs/http; dart pub upgrade
+        run: dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: pkgs/http
+      - name: "pkgs/http; dart test --test-randomize-ordering-seed=random -p node"
+        run: "dart test --test-randomize-ordering-seed=random -p node"
+        if: "always() && steps.pkgs_http_pub_upgrade.conclusion == 'success'"
+        working-directory: pkgs/http
+    needs:
+      - job_001
+      - job_002
+      - job_003
+      - job_004
+      - job_005
+      - job_006
+  job_011:
     name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/http; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --test-randomize-ordering-seed=random --platform firefox`"
     runs-on: ubuntu-latest
     steps:
@@ -416,7 +453,7 @@ jobs:
         uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http;commands:command_1"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http;commands:command_2"
           restore-keys: |
             os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http
             os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
@@ -445,7 +482,7 @@ jobs:
       - job_004
       - job_005
       - job_006
-  job_011:
+  job_012:
     name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/http_profile; `dart test --platform vm`"
     runs-on: ubuntu-latest
     steps:
@@ -482,8 +519,8 @@ jobs:
       - job_004
       - job_005
       - job_006
-  job_012:
-    name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/web_socket; `dart test --test-randomize-ordering-seed=random -p chrome -c dart2js`"
+  job_013:
+    name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/web_socket; `dart test --test-randomize-ordering-seed=random -p chrome -c dart2js,dart2wasm`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
@@ -508,8 +545,8 @@ jobs:
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: pkgs/web_socket
-      - name: "pkgs/web_socket; dart test --test-randomize-ordering-seed=random -p chrome -c dart2js"
-        run: "dart test --test-randomize-ordering-seed=random -p chrome -c dart2js"
+      - name: "pkgs/web_socket; dart test --test-randomize-ordering-seed=random -p chrome -c dart2js,dart2wasm"
+        run: "dart test --test-randomize-ordering-seed=random -p chrome -c dart2js,dart2wasm"
         if: "always() && steps.pkgs_web_socket_pub_upgrade.conclusion == 'success'"
         working-directory: pkgs/web_socket
     needs:
@@ -519,7 +556,7 @@ jobs:
       - job_004
       - job_005
       - job_006
-  job_013:
+  job_014:
     name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/web_socket; `dart test --test-randomize-ordering-seed=random -p vm`"
     runs-on: ubuntu-latest
     steps:
@@ -556,7 +593,7 @@ jobs:
       - job_004
       - job_005
       - job_006
-  job_014:
+  job_015:
     name: "unit_test; linux; Dart dev; PKG: pkgs/http; `dart run --define=no_default_http_client=true test/no_default_http_client_test.dart`"
     runs-on: ubuntu-latest
     steps:
@@ -564,7 +601,7 @@ jobs:
         uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http;commands:command_2"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http;commands:command_1"
           restore-keys: |
             os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
@@ -593,8 +630,8 @@ jobs:
       - job_004
       - job_005
       - job_006
-  job_015:
-    name: "unit_test; linux; Dart dev; PKG: pkgs/http; `dart test --test-randomize-ordering-seed=random --platform chrome`"
+  job_016:
+    name: "unit_test; linux; Dart dev; PKG: pkgs/http; `dart test --test-randomize-ordering-seed=random --platform chrome -c dart2js,dart2wasm`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
@@ -619,8 +656,8 @@ jobs:
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: pkgs/http
-      - name: "pkgs/http; dart test --test-randomize-ordering-seed=random --platform chrome"
-        run: "dart test --test-randomize-ordering-seed=random --platform chrome"
+      - name: "pkgs/http; dart test --test-randomize-ordering-seed=random --platform chrome -c dart2js,dart2wasm"
+        run: "dart test --test-randomize-ordering-seed=random --platform chrome -c dart2js,dart2wasm"
         if: "always() && steps.pkgs_http_pub_upgrade.conclusion == 'success'"
         working-directory: pkgs/http
     needs:
@@ -630,7 +667,7 @@ jobs:
       - job_004
       - job_005
       - job_006
-  job_016:
+  job_017:
     name: "unit_test; linux; Dart dev; PKG: pkgs/http; `dart test --test-randomize-ordering-seed=random --platform vm`"
     runs-on: ubuntu-latest
     steps:
@@ -667,8 +704,8 @@ jobs:
       - job_004
       - job_005
       - job_006
-  job_017:
-    name: "unit_test; linux; Dart dev; PKG: pkgs/http; `dart test --test-randomize-ordering-seed=random -p chrome -c dart2wasm`"
+  job_018:
+    name: "unit_test; linux; Dart dev; PKG: pkgs/http; `dart test --test-randomize-ordering-seed=random -p node`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
@@ -693,8 +730,8 @@ jobs:
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: pkgs/http
-      - name: "pkgs/http; dart test --test-randomize-ordering-seed=random -p chrome -c dart2wasm"
-        run: "dart test --test-randomize-ordering-seed=random -p chrome -c dart2wasm"
+      - name: "pkgs/http; dart test --test-randomize-ordering-seed=random -p node"
+        run: "dart test --test-randomize-ordering-seed=random -p node"
         if: "always() && steps.pkgs_http_pub_upgrade.conclusion == 'success'"
         working-directory: pkgs/http
     needs:
@@ -704,7 +741,7 @@ jobs:
       - job_004
       - job_005
       - job_006
-  job_018:
+  job_019:
     name: "unit_test; linux; Dart dev; PKG: pkgs/http; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --test-randomize-ordering-seed=random --platform firefox`"
     runs-on: ubuntu-latest
     steps:
@@ -712,7 +749,7 @@ jobs:
         uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http;commands:command_1"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http;commands:command_2"
           restore-keys: |
             os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
@@ -741,7 +778,7 @@ jobs:
       - job_004
       - job_005
       - job_006
-  job_019:
+  job_020:
     name: "unit_test; linux; Dart dev; PKG: pkgs/http_profile; `dart test --platform vm`"
     runs-on: ubuntu-latest
     steps:
@@ -778,8 +815,8 @@ jobs:
       - job_004
       - job_005
       - job_006
-  job_020:
-    name: "unit_test; linux; Dart dev; PKG: pkgs/web_socket; `dart test --test-randomize-ordering-seed=random -p chrome -c dart2js`"
+  job_021:
+    name: "unit_test; linux; Dart dev; PKG: pkgs/web_socket; `dart test --test-randomize-ordering-seed=random -p chrome -c dart2js,dart2wasm`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
@@ -804,8 +841,8 @@ jobs:
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: pkgs/web_socket
-      - name: "pkgs/web_socket; dart test --test-randomize-ordering-seed=random -p chrome -c dart2js"
-        run: "dart test --test-randomize-ordering-seed=random -p chrome -c dart2js"
+      - name: "pkgs/web_socket; dart test --test-randomize-ordering-seed=random -p chrome -c dart2js,dart2wasm"
+        run: "dart test --test-randomize-ordering-seed=random -p chrome -c dart2js,dart2wasm"
         if: "always() && steps.pkgs_web_socket_pub_upgrade.conclusion == 'success'"
         working-directory: pkgs/web_socket
     needs:
@@ -815,7 +852,7 @@ jobs:
       - job_004
       - job_005
       - job_006
-  job_021:
+  job_022:
     name: "unit_test; linux; Dart dev; PKG: pkgs/web_socket; `dart test --test-randomize-ordering-seed=random -p vm`"
     runs-on: ubuntu-latest
     steps:
@@ -852,7 +889,7 @@ jobs:
       - job_004
       - job_005
       - job_006
-  job_022:
+  job_023:
     name: "unit_test; linux; Flutter stable; PKG: pkgs/flutter_http_example; `flutter test --platform chrome`"
     runs-on: ubuntu-latest
     steps:
@@ -889,7 +926,7 @@ jobs:
       - job_004
       - job_005
       - job_006
-  job_023:
+  job_024:
     name: "unit_test; linux; Flutter stable; PKG: pkgs/flutter_http_example; `flutter test`"
     runs-on: ubuntu-latest
     steps:
@@ -926,7 +963,7 @@ jobs:
       - job_004
       - job_005
       - job_006
-  job_024:
+  job_025:
     name: "unit_test; macos; Flutter stable; PKG: pkgs/flutter_http_example; `flutter test`"
     runs-on: macos-latest
     steps:
@@ -963,7 +1000,7 @@ jobs:
       - job_004
       - job_005
       - job_006
-  job_025:
+  job_026:
     name: "unit_test; windows; Flutter stable; PKG: pkgs/flutter_http_example; `flutter test`"
     runs-on: windows-latest
     steps:
diff --git a/pkgs/cupertino_http/ios_test/pubspec.yaml b/pkgs/cupertino_http/ios_test/pubspec.yaml
index 79a9139be4..7b4a6cc210 100644
--- a/pkgs/cupertino_http/ios_test/pubspec.yaml
+++ b/pkgs/cupertino_http/ios_test/pubspec.yaml
@@ -18,6 +18,7 @@ dev_dependencies:
   crypto: ^3.0.3
   cupertino_http:
     path: ../
+  dart_flutter_team_lints: ^3.0.0
   flutter_test:
     sdk: flutter
   http_client_conformance_tests:
diff --git a/pkgs/http/mono_pkg.yaml b/pkgs/http/mono_pkg.yaml
index ad3edd4f55..99d6ef5ab9 100644
--- a/pkgs/http/mono_pkg.yaml
+++ b/pkgs/http/mono_pkg.yaml
@@ -10,18 +10,9 @@ stages:
     - dev
 - unit_test:
   - test: --test-randomize-ordering-seed=random --platform vm
-    os:
-    - linux
-  - test: --test-randomize-ordering-seed=random --platform chrome
-    os:
-    - linux
+  - test: --test-randomize-ordering-seed=random --platform chrome -c dart2js,dart2wasm
+  - test: --test-randomize-ordering-seed=random -p node
+  - command: dart run --define=no_default_http_client=true test/no_default_http_client_test.dart
   # Firefox needs an X server to run.
   - command: xvfb-run -s "-screen 0 1024x768x24"
       dart test --test-randomize-ordering-seed=random --platform firefox
-    os:
-    - linux
-  - command: dart run --define=no_default_http_client=true test/no_default_http_client_test.dart
-    os:
-    - linux
-  - test: --test-randomize-ordering-seed=random -p chrome -c dart2wasm
-    sdk: dev
diff --git a/pkgs/http/pubspec.yaml b/pkgs/http/pubspec.yaml
index b140067b54..b3e756211c 100644
--- a/pkgs/http/pubspec.yaml
+++ b/pkgs/http/pubspec.yaml
@@ -22,6 +22,5 @@ dev_dependencies:
   fake_async: ^1.2.0
   http_client_conformance_tests:
     path: ../http_client_conformance_tests/
-  shelf: ^1.1.0
   stream_channel: ^2.1.1
   test: ^1.21.2
diff --git a/pkgs/web_socket/mono_pkg.yaml b/pkgs/web_socket/mono_pkg.yaml
index 13baee341e..67dd57d23c 100644
--- a/pkgs/web_socket/mono_pkg.yaml
+++ b/pkgs/web_socket/mono_pkg.yaml
@@ -10,8 +10,4 @@ stages:
     - dev
 - unit_test:
   - test: --test-randomize-ordering-seed=random -p vm
-    os:
-    - linux
-  - test: --test-randomize-ordering-seed=random -p chrome -c dart2js
-    os:
-    - linux
+  - test: --test-randomize-ordering-seed=random -p chrome -c dart2js,dart2wasm
diff --git a/pkgs/web_socket_conformance_tests/lib/src/close_local_server.dart b/pkgs/web_socket_conformance_tests/lib/src/close_local_server.dart
index 8991de3cc8..8f1e6b9a46 100644
--- a/pkgs/web_socket_conformance_tests/lib/src/close_local_server.dart
+++ b/pkgs/web_socket_conformance_tests/lib/src/close_local_server.dart
@@ -26,7 +26,7 @@ void hybridMain(StreamChannel<Object?> channel) async {
       });
     });
 
-  channel.sink.add(server.port);
+  channel.sink.add(server.port.toString());
   await channel
       .stream.first; // Any writes indicates that the server should exit.
   unawaited(server.close());
diff --git a/pkgs/web_socket_conformance_tests/lib/src/close_local_tests.dart b/pkgs/web_socket_conformance_tests/lib/src/close_local_tests.dart
index cbaf8272bb..e4e0474744 100644
--- a/pkgs/web_socket_conformance_tests/lib/src/close_local_tests.dart
+++ b/pkgs/web_socket_conformance_tests/lib/src/close_local_tests.dart
@@ -10,10 +10,10 @@ import 'package:test/test.dart';
 import 'package:web_socket/web_socket.dart';
 
 import 'close_local_server_vm.dart'
-    if (dart.library.html) 'close_local_server_web.dart';
+    if (dart.library.js_interop) 'close_local_server_web.dart';
 
 import 'continuously_writing_server_vm.dart'
-    if (dart.library.html) 'continuously_writing_server_web.dart'
+    if (dart.library.js_interop) 'continuously_writing_server_web.dart'
     as writing_server;
 import 'utils.dart';
 
@@ -90,7 +90,7 @@ void testCloseLocal(
       addTearDown(() => closeWebSocket(channel));
 
       await channel.close();
-      final closeCode = await httpServerQueue.next as int?;
+      final closeCode = (await httpServerQueue.next as num?)?.toInt();
       final closeReason = await httpServerQueue.next as String?;
 
       expect(closeCode, 1005);
@@ -103,7 +103,7 @@ void testCloseLocal(
       addTearDown(() => closeWebSocket(channel));
 
       await channel.close(1000);
-      final closeCode = await httpServerQueue.next as int?;
+      final closeCode = (await httpServerQueue.next as num?)?.toInt();
       final closeReason = await httpServerQueue.next as String?;
 
       expect(closeCode, 1000);
@@ -116,7 +116,7 @@ void testCloseLocal(
       addTearDown(() => closeWebSocket(channel));
 
       await channel.close(3000);
-      final closeCode = await httpServerQueue.next as int?;
+      final closeCode = (await httpServerQueue.next as num?)?.toInt();
       final closeReason = await httpServerQueue.next as String?;
 
       expect(closeCode, 3000);
@@ -129,7 +129,7 @@ void testCloseLocal(
       addTearDown(() => closeWebSocket(channel));
 
       await channel.close(4999);
-      final closeCode = await httpServerQueue.next as int?;
+      final closeCode = (await httpServerQueue.next as num?)?.toInt();
       final closeReason = await httpServerQueue.next as String?;
 
       expect(closeCode, 4999);
@@ -142,7 +142,7 @@ void testCloseLocal(
       addTearDown(() => closeWebSocket(channel));
 
       await channel.close(3000, 'Client initiated closure');
-      final closeCode = await httpServerQueue.next as int?;
+      final closeCode = (await httpServerQueue.next as num?)?.toInt();
       final closeReason = await httpServerQueue.next as String?;
 
       expect(closeCode, 3000);
diff --git a/pkgs/web_socket_conformance_tests/lib/src/close_remote_server.dart b/pkgs/web_socket_conformance_tests/lib/src/close_remote_server.dart
index 86e7067f75..7503d12a5a 100644
--- a/pkgs/web_socket_conformance_tests/lib/src/close_remote_server.dart
+++ b/pkgs/web_socket_conformance_tests/lib/src/close_remote_server.dart
@@ -54,7 +54,7 @@ void hybridMain(StreamChannel<Object?> channel) async {
       });
     });
 
-  channel.sink.add(server.port);
+  channel.sink.add(server.port.toString());
   await channel
       .stream.first; // Any writes indicates that the server should exit.
   unawaited(server.close());
diff --git a/pkgs/web_socket_conformance_tests/lib/src/close_remote_tests.dart b/pkgs/web_socket_conformance_tests/lib/src/close_remote_tests.dart
index 0171e30139..da6c4578b4 100644
--- a/pkgs/web_socket_conformance_tests/lib/src/close_remote_tests.dart
+++ b/pkgs/web_socket_conformance_tests/lib/src/close_remote_tests.dart
@@ -10,7 +10,7 @@ import 'package:test/test.dart';
 import 'package:web_socket/web_socket.dart';
 
 import 'close_remote_server_vm.dart'
-    if (dart.library.html) 'close_remote_server_web.dart';
+    if (dart.library.js_interop) 'close_remote_server_web.dart';
 import 'utils.dart';
 
 /// Tests that the [WebSocket] can correctly receive Close frames from the peer.
diff --git a/pkgs/web_socket_conformance_tests/lib/src/continuously_writing_server.dart b/pkgs/web_socket_conformance_tests/lib/src/continuously_writing_server.dart
index a082d96238..8361ff8d4c 100644
--- a/pkgs/web_socket_conformance_tests/lib/src/continuously_writing_server.dart
+++ b/pkgs/web_socket_conformance_tests/lib/src/continuously_writing_server.dart
@@ -18,7 +18,7 @@ void hybridMain(StreamChannel<Object?> channel) async {
       }
     });
 
-  channel.sink.add(server.port);
+  channel.sink.add(server.port.toString());
   await channel
       .stream.first; // Any writes indicates that the server should exit.
   unawaited(server.close());
diff --git a/pkgs/web_socket_conformance_tests/lib/src/disconnect_after_upgrade_server.dart b/pkgs/web_socket_conformance_tests/lib/src/disconnect_after_upgrade_server.dart
index 965521c439..f5948feef2 100644
--- a/pkgs/web_socket_conformance_tests/lib/src/disconnect_after_upgrade_server.dart
+++ b/pkgs/web_socket_conformance_tests/lib/src/disconnect_after_upgrade_server.dart
@@ -28,7 +28,7 @@ void hybridMain(StreamChannel<Object?> channel) async {
       socket.destroy();
     });
 
-  channel.sink.add(server.port);
+  channel.sink.add(server.port.toString());
 
   await channel
       .stream.first; // Any writes indicates that the server should exit.
diff --git a/pkgs/web_socket_conformance_tests/lib/src/disconnect_after_upgrade_tests.dart b/pkgs/web_socket_conformance_tests/lib/src/disconnect_after_upgrade_tests.dart
index 52970aaa39..5560191e2f 100644
--- a/pkgs/web_socket_conformance_tests/lib/src/disconnect_after_upgrade_tests.dart
+++ b/pkgs/web_socket_conformance_tests/lib/src/disconnect_after_upgrade_tests.dart
@@ -8,7 +8,7 @@ import 'package:test/test.dart';
 import 'package:web_socket/web_socket.dart';
 
 import 'disconnect_after_upgrade_server_vm.dart'
-    if (dart.library.html) 'disconnect_after_upgrade_server_web.dart';
+    if (dart.library.js_interop) 'disconnect_after_upgrade_server_web.dart';
 import 'utils.dart';
 
 /// Tests that the [WebSocket] generates a correct [CloseReceived] event if
diff --git a/pkgs/web_socket_conformance_tests/lib/src/echo_server.dart b/pkgs/web_socket_conformance_tests/lib/src/echo_server.dart
index 6728507a35..a899adab35 100644
--- a/pkgs/web_socket_conformance_tests/lib/src/echo_server.dart
+++ b/pkgs/web_socket_conformance_tests/lib/src/echo_server.dart
@@ -15,7 +15,7 @@ void hybridMain(StreamChannel<Object?> channel) async {
     ..transform(WebSocketTransformer())
         .listen((WebSocket webSocket) => webSocket.listen(webSocket.add));
 
-  channel.sink.add(server.port);
+  channel.sink.add(server.port.toString());
   await channel
       .stream.first; // Any writes indicates that the server should exit.
   unawaited(server.close());
diff --git a/pkgs/web_socket_conformance_tests/lib/src/no_upgrade_server.dart b/pkgs/web_socket_conformance_tests/lib/src/no_upgrade_server.dart
index dec194186f..7a615cfe86 100644
--- a/pkgs/web_socket_conformance_tests/lib/src/no_upgrade_server.dart
+++ b/pkgs/web_socket_conformance_tests/lib/src/no_upgrade_server.dart
@@ -14,7 +14,7 @@ void hybridMain(StreamChannel<Object?> channel) async {
       request.response.statusCode = 200;
       await request.response.close();
     });
-  channel.sink.add(server.port);
+  channel.sink.add(server.port.toString());
 
   await channel
       .stream.first; // Any writes indicates that the server should exit.
diff --git a/pkgs/web_socket_conformance_tests/lib/src/no_upgrade_tests.dart b/pkgs/web_socket_conformance_tests/lib/src/no_upgrade_tests.dart
index c06955c70d..0d454b5130 100644
--- a/pkgs/web_socket_conformance_tests/lib/src/no_upgrade_tests.dart
+++ b/pkgs/web_socket_conformance_tests/lib/src/no_upgrade_tests.dart
@@ -8,7 +8,7 @@ import 'package:test/test.dart';
 import 'package:web_socket/web_socket.dart';
 
 import 'no_upgrade_server_vm.dart'
-    if (dart.library.html) 'no_upgrade_server_web.dart';
+    if (dart.library.js_interop) 'no_upgrade_server_web.dart';
 
 /// Tests that the [WebSocket] generates the correct exception if the peer
 /// closes the HTTP connection before WebSocket upgrade.
diff --git a/pkgs/web_socket_conformance_tests/lib/src/payload_transfer_tests.dart b/pkgs/web_socket_conformance_tests/lib/src/payload_transfer_tests.dart
index eaebeaed20..c3140127e6 100644
--- a/pkgs/web_socket_conformance_tests/lib/src/payload_transfer_tests.dart
+++ b/pkgs/web_socket_conformance_tests/lib/src/payload_transfer_tests.dart
@@ -9,7 +9,8 @@ import 'package:stream_channel/stream_channel.dart';
 import 'package:test/test.dart';
 import 'package:web_socket/web_socket.dart';
 
-import 'echo_server_vm.dart' if (dart.library.html) 'echo_server_web.dart';
+import 'echo_server_vm.dart'
+    if (dart.library.js_interop) 'echo_server_web.dart';
 import 'utils.dart';
 
 /// Tests that the [WebSocket] can correctly transmit and receive text
diff --git a/pkgs/web_socket_conformance_tests/lib/src/peer_protocol_errors_server.dart b/pkgs/web_socket_conformance_tests/lib/src/peer_protocol_errors_server.dart
index a40fc1fc54..0f3f0bd8cf 100644
--- a/pkgs/web_socket_conformance_tests/lib/src/peer_protocol_errors_server.dart
+++ b/pkgs/web_socket_conformance_tests/lib/src/peer_protocol_errors_server.dart
@@ -37,7 +37,7 @@ void hybridMain(StreamChannel<Object?> channel) async {
       throw e as Exception;
     }
   });
-  channel.sink.add(server.port);
+  channel.sink.add(server.port.toString());
 
   await channel
       .stream.first; // Any writes indicates that the server should exit.
diff --git a/pkgs/web_socket_conformance_tests/lib/src/peer_protocol_errors_tests.dart b/pkgs/web_socket_conformance_tests/lib/src/peer_protocol_errors_tests.dart
index 52d2ec6bce..faa01fdf65 100644
--- a/pkgs/web_socket_conformance_tests/lib/src/peer_protocol_errors_tests.dart
+++ b/pkgs/web_socket_conformance_tests/lib/src/peer_protocol_errors_tests.dart
@@ -8,7 +8,7 @@ import 'package:test/test.dart';
 import 'package:web_socket/web_socket.dart';
 
 import 'peer_protocol_errors_server_vm.dart'
-    if (dart.library.html) 'peer_protocol_errors_server_web.dart';
+    if (dart.library.js_interop) 'peer_protocol_errors_server_web.dart';
 import 'utils.dart';
 
 /// Tests that the [WebSocket] can correctly handle incorrect WebSocket frames.
diff --git a/pkgs/web_socket_conformance_tests/lib/src/protocol_server.dart b/pkgs/web_socket_conformance_tests/lib/src/protocol_server.dart
index c0df5b6ea4..ebb50785a1 100644
--- a/pkgs/web_socket_conformance_tests/lib/src/protocol_server.dart
+++ b/pkgs/web_socket_conformance_tests/lib/src/protocol_server.dart
@@ -39,7 +39,7 @@ void hybridMain(StreamChannel<Object?> channel) async {
       });
     });
 
-  channel.sink.add(server.port);
+  channel.sink.add(server.port.toString());
 
   await channel
       .stream.first; // Any writes indicates that the server should exit.
diff --git a/pkgs/web_socket_conformance_tests/lib/src/protocol_tests.dart b/pkgs/web_socket_conformance_tests/lib/src/protocol_tests.dart
index 3289507410..281ff2dae5 100644
--- a/pkgs/web_socket_conformance_tests/lib/src/protocol_tests.dart
+++ b/pkgs/web_socket_conformance_tests/lib/src/protocol_tests.dart
@@ -8,7 +8,7 @@ import 'package:test/test.dart';
 import 'package:web_socket/web_socket.dart';
 
 import 'protocol_server_vm.dart'
-    if (dart.library.html) 'protocol_server_web.dart';
+    if (dart.library.js_interop) 'protocol_server_web.dart';
 import 'utils.dart';
 
 /// Tests that the [WebSocket] can correctly negotiate a subprotocol with the
diff --git a/tool/ci.sh b/tool/ci.sh
index a200e66543..227567af20 100755
--- a/tool/ci.sh
+++ b/tool/ci.sh
@@ -76,13 +76,13 @@ for PKG in ${PKGS}; do
         flutter test || EXIT_CODE=$?
         ;;
       command_1)
-        echo 'xvfb-run -s "-screen 0 1024x768x24" dart test --test-randomize-ordering-seed=random --platform firefox'
-        xvfb-run -s "-screen 0 1024x768x24" dart test --test-randomize-ordering-seed=random --platform firefox || EXIT_CODE=$?
-        ;;
-      command_2)
         echo 'dart run --define=no_default_http_client=true test/no_default_http_client_test.dart'
         dart run --define=no_default_http_client=true test/no_default_http_client_test.dart || EXIT_CODE=$?
         ;;
+      command_2)
+        echo 'xvfb-run -s "-screen 0 1024x768x24" dart test --test-randomize-ordering-seed=random --platform firefox'
+        xvfb-run -s "-screen 0 1024x768x24" dart test --test-randomize-ordering-seed=random --platform firefox || EXIT_CODE=$?
+        ;;
       format)
         echo 'dart format --output=none --set-exit-if-changed .'
         dart format --output=none --set-exit-if-changed . || EXIT_CODE=$?
@@ -96,12 +96,12 @@ for PKG in ${PKGS}; do
         dart test --test-randomize-ordering-seed=random --platform vm || EXIT_CODE=$?
         ;;
       test_3)
-        echo 'dart test --test-randomize-ordering-seed=random --platform chrome'
-        dart test --test-randomize-ordering-seed=random --platform chrome || EXIT_CODE=$?
+        echo 'dart test --test-randomize-ordering-seed=random --platform chrome -c dart2js,dart2wasm'
+        dart test --test-randomize-ordering-seed=random --platform chrome -c dart2js,dart2wasm || EXIT_CODE=$?
         ;;
       test_4)
-        echo 'dart test --test-randomize-ordering-seed=random -p chrome -c dart2wasm'
-        dart test --test-randomize-ordering-seed=random -p chrome -c dart2wasm || EXIT_CODE=$?
+        echo 'dart test --test-randomize-ordering-seed=random -p node'
+        dart test --test-randomize-ordering-seed=random -p node || EXIT_CODE=$?
         ;;
       test_5)
         echo 'dart test --platform vm'
@@ -112,8 +112,8 @@ for PKG in ${PKGS}; do
         dart test --test-randomize-ordering-seed=random -p vm || EXIT_CODE=$?
         ;;
       test_7)
-        echo 'dart test --test-randomize-ordering-seed=random -p chrome -c dart2js'
-        dart test --test-randomize-ordering-seed=random -p chrome -c dart2js || EXIT_CODE=$?
+        echo 'dart test --test-randomize-ordering-seed=random -p chrome -c dart2js,dart2wasm'
+        dart test --test-randomize-ordering-seed=random -p chrome -c dart2js,dart2wasm || EXIT_CODE=$?
         ;;
       *)
         echo -e "\033[31mUnknown TASK '${TASK}' - TERMINATING JOB\033[0m"