diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml
index 24c4a7735e785..84343a31e095b 100644
--- a/eng/pipelines/common/variables.yml
+++ b/eng/pipelines/common/variables.yml
@@ -18,7 +18,7 @@ variables:
 - name: isNotExtraPlatformsBuild
   value: ${{ ne(variables['Build.DefinitionName'], 'runtime-extra-platforms') }}
 - name: isWasmOnlyBuild
-  value: ${{ in(variables['Build.DefinitionName'], 'runtime-wasm', 'runtime-wasm-libtests', 'runtime-wasm-non-libtests') }}
+  value: ${{ in(variables['Build.DefinitionName'], 'runtime-wasm', 'runtime-wasm-libtests', 'runtime-wasm-non-libtests', 'runtime-wasm-dbgtests') }}
 - name: isiOSLikeOnlyBuild
   value: ${{ in(variables['Build.DefinitionName'], 'runtime-ioslike') }}
 - name: isiOSLikeSimulatorOnlyBuild
diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml
index a5b6e050b2407..1fff116909b81 100644
--- a/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml
+++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml
@@ -9,6 +9,7 @@ parameters:
   isRollingBuild: false
   excludeLibTests: false
   excludeNonLibTests: false
+  debuggerTestsOnly: false
 
 jobs:
 
@@ -61,7 +62,7 @@ jobs:
 # - run everything, if relevant paths changed
 # - For runtime-wasm, force run all the jobs
 #
-- ${{ if and(ne(parameters.isRollingBuild, true), ne(parameters.excludeLibTests, true)) }}:
+- ${{ if and(ne(parameters.isRollingBuild, true), ne(parameters.excludeLibTests, true), ne(parameters.debuggerTestsOnly, true)) }}:
   # Library tests
   # these run on runtime also
   - template: /eng/pipelines/common/templates/wasm-library-tests.yml
@@ -175,7 +176,7 @@ jobs:
       isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
       alwaysRun: ${{ parameters.isWasmOnlyBuild }}
 
-- ${{ if and(ne(parameters.isRollingBuild, true), ne(parameters.excludeNonLibTests, true)) }}:
+- ${{ if and(ne(parameters.isRollingBuild, true), ne(parameters.excludeNonLibTests, true), ne(parameters.debuggerTestsOnly, true)) }}:
   # Wasm.Build.Tests
   - template: /eng/pipelines/common/templates/wasm-build-tests.yml
     parameters:
@@ -185,19 +186,20 @@ jobs:
       isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
       isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
 
-  # Debugger tests
-  - template: /eng/pipelines/common/templates/wasm-debugger-tests.yml
+  - template: /eng/pipelines/common/templates/wasm-runtime-tests.yml
     parameters:
       platforms:
         - browser_wasm
-        - browser_wasm_win
       isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
       isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
 
-  - template: /eng/pipelines/common/templates/wasm-runtime-tests.yml
+- ${{ if and(ne(parameters.isRollingBuild, true), or(ne(parameters.excludeNonLibTests, true), eq(parameters.debuggerTestsOnly, true))) }}:
+  # Debugger tests
+  - template: /eng/pipelines/common/templates/wasm-debugger-tests.yml
     parameters:
       platforms:
         - browser_wasm
+        - browser_wasm_win
       isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
       isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
 
diff --git a/eng/pipelines/runtime-wasm-dbgtests.yml b/eng/pipelines/runtime-wasm-dbgtests.yml
index 85e66692f648a..fb5ee6123fdbf 100644
--- a/eng/pipelines/runtime-wasm-dbgtests.yml
+++ b/eng/pipelines/runtime-wasm-dbgtests.yml
@@ -1,41 +1,24 @@
 trigger: none
+pr: none
 
 variables:
   - template: /eng/pipelines/common/variables.yml
 
-jobs:
-
-#
-# Evaluate paths
-#
-- template: /eng/pipelines/common/evaluate-default-paths.yml
-
-# Debugger tests
-- template: /eng/pipelines/common/templates/wasm-debugger-tests.yml
+extends:
+  template:  /eng/pipelines/common/templates/pipeline-with-resources.yml
   parameters:
-    platforms:
-      - Browser_wasm
-      - Browser_wasm_win
-    isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
-    isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
+    stages:
+    - stage: Build
+      jobs:
 
-- template: /eng/pipelines/common/templates/wasm-debugger-tests.yml
-  parameters:
-    platforms:
-      - Browser_wasm
-      - Browser_wasm_win
-    extraBuildArgs: /p:MonoWasmBuildVariant=multithread /p:WasmEnableThreads=true
-    nameSuffix: DebuggerTests_MultiThreaded
-    isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
-    isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
+      #
+      # Evaluate paths
+      #
+      - template: /eng/pipelines/common/evaluate-default-paths.yml
 
-- template: /eng/pipelines/common/templates/wasm-debugger-tests.yml
-  parameters:
-    platforms:
-      - Browser_wasm_firefox
-    browser: firefox
-    isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
-    isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
-    alwaysRun: ${{ parameters.isWasmOnlyBuild }}
-    # ff tests are unstable currently
-    shouldContinueOnError: true
+      - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml
+        parameters:
+          isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
+          isWasmOnlyBuild: ${{ variables.isWasmOnlyBuild }}
+          isRollingBuild: ${{ variables.isRollingBuild }}
+          debuggerTestsOnly: true
diff --git a/src/mono/wasm/README.md b/src/mono/wasm/README.md
index 110f876859ca5..b092b4843ff6b 100644
--- a/src/mono/wasm/README.md
+++ b/src/mono/wasm/README.md
@@ -314,6 +314,8 @@ npm update --lockfile-version=1
 * `runtime-extra-platforms` does not run any wasm jobs on PRs
 * `high resource aot` runs a few specific library tests with AOT, that require more memory to AOT.
 
+* `runtime-wasm-dbgtests` runs all the debugger test jobs
+
 ## Rolling build (twice a day):
 
 * `runtime` runs all the wasm jobs, but `AOT` still only runs smoke tests.