diff --git a/eng/pipelines/runtime-extra-platforms-wasm.yml b/eng/pipelines/runtime-extra-platforms-wasm.yml
index 70e862197fe351ba99889e273e1686416f0bcd03..c4465c1194d88ce05a87f0ef768bc9dc2713deb2 100644
--- a/eng/pipelines/runtime-extra-platforms-wasm.yml
+++ b/eng/pipelines/runtime-extra-platforms-wasm.yml
@@ -46,6 +46,17 @@ jobs:
       runAOT: true
       alwaysRun: true
 
+  # Wasm Debugger tests - firefox
+  - template: /eng/pipelines/common/templates/wasm-debugger-tests.yml
+    parameters:
+      platforms:
+        - Browser_wasm_firefox
+      browser: firefox
+      # ff tests are unstable currently
+      shouldContinueOnError: true
+      alwaysRun: true
+
+
   # Disabled for now
   #- template: /eng/pipelines/coreclr/perf-wasm-jobs.yml
     #parameters:
diff --git a/eng/pipelines/runtime-staging.yml b/eng/pipelines/runtime-staging.yml
index b5ce3e8bf4314499bfe30fe9665df5bae1eefa8d..0f6cf9fc191267806a4b13ab7185031d753b0b62 100644
--- a/eng/pipelines/runtime-staging.yml
+++ b/eng/pipelines/runtime-staging.yml
@@ -58,53 +58,6 @@ jobs:
 - ${{ if eq(variables.dependOnEvaluatePaths, true) }}:
   - template: /eng/pipelines/common/evaluate-default-paths.yml
 
-#
-# WebAssembly legs - library tests, Wasm.Build.Tests, and debugger tests
-#
-- template: /eng/pipelines/common/templates/wasm-library-tests.yml
-  parameters:
-    platforms:
-      - Browser_wasm_win
-    shouldContinueOnError: forceFalse
-    alwaysRun: ${{ variables.isRollingBuild }}
-    scenarios:
-      - WasmTestOnBrowser
-
-# AOT Library tests
-- template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml
-  parameters:
-    platforms:
-      - Browser_wasm_win
-    nameSuffix: _AOT
-    runSmokeOnlyArg: $(_runSmokeTestsOnlyArg)
-    runAOT: true
-    shouldContinueOnError: forceFalse
-    alwaysRun: ${{ variables.isRollingBuild }}
-
-- template: /eng/pipelines/common/templates/wasm-build-tests.yml
-  parameters:
-    platforms:
-      - Browser_wasm_win
-    shouldContinueOnError: forceFalse
-    alwaysRun: ${{ variables.isRollingBuild }}
-
-- template: /eng/pipelines/common/templates/wasm-debugger-tests.yml
-  parameters:
-    platforms:
-      - Browser_wasm
-      - Browser_wasm_win
-    shouldContinueOnError: forceFalse
-    alwaysRun: ${{ variables.isRollingBuild }}
-
-- template: /eng/pipelines/common/templates/wasm-debugger-tests.yml
-  parameters:
-    platforms:
-      - Browser_wasm_firefox
-    browser: firefox
-    # ff tests are unstable currently
-    shouldContinueOnError: true
-    alwaysRun: ${{ variables.isRollingBuild }}
-
 #
 # Build the whole product using Mono
 #
diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index 882eddc4c2fce33afe1ff503848a2cf80f75bf4e..9dc55e45cc6b8b72569c8da9b4f6721ad14c0231 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -366,6 +366,14 @@ jobs:
       - normal
       - WasmTestOnBrowser
 
+- template: /eng/pipelines/common/templates/wasm-library-tests.yml
+  parameters:
+    platforms:
+      - Browser_wasm_win
+    alwaysRun: ${{ variables.isRollingBuild }}
+    scenarios:
+      - WasmTestOnBrowser
+
 # EAT Library tests - only run on linux
 - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml
   parameters:
@@ -385,12 +393,32 @@ jobs:
     runSmokeOnlyArg: $(_runSmokeTestsOnlyArg)
     alwaysRun: ${{ variables.isRollingBuild }}
 
+- template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml
+  parameters:
+    platforms:
+      - Browser_wasm_win
+    nameSuffix: _AOT
+    runAOT: true
+    runSmokeOnlyArg: $(_runSmokeTestsOnlyArg)
+    alwaysRun: ${{ variables.isRollingBuild }}
+
+# Wasm.Build.Tests
 - template: /eng/pipelines/common/templates/wasm-build-tests.yml
   parameters:
     platforms:
       - Browser_wasm
+      - Browser_wasm_win
+    alwaysRun: ${{ variables.isRollingBuild }}
+
+# Wasm Debugger tests
+- template: /eng/pipelines/common/templates/wasm-debugger-tests.yml
+  parameters:
+    platforms:
+      - Browser_wasm
+      - Browser_wasm_win
     alwaysRun: ${{ variables.isRollingBuild }}
 
+# Wasm runtime tests
 - template: /eng/pipelines/common/templates/wasm-runtime-tests.yml
   parameters:
     platforms:
diff --git a/src/mono/sample/wasm/browser-eventpipe/Program.cs b/src/mono/sample/wasm/browser-eventpipe/Program.cs
index 3781b1e4b38e4775548b28731214d1f24f26a122..65248020f5d3da947bff62aaa1f3f3b180bc3fe4 100644
--- a/src/mono/sample/wasm/browser-eventpipe/Program.cs
+++ b/src/mono/sample/wasm/browser-eventpipe/Program.cs
@@ -77,9 +77,7 @@ public static void Main(string[] args)
 
         public static CancellationToken GetCancellationToken()
         {
-            if (cts == null) {
-                cts = new CancellationTokenSource ();
-            }
+            cts ??= new CancellationTokenSource ();
             return cts.Token;
         }