diff --git a/eng/pipelines/diagnostics/runtime-diag-job.yml b/eng/pipelines/diagnostics/runtime-diag-job.yml
index a9421e29b6199d..9916a42663822c 100644
--- a/eng/pipelines/diagnostics/runtime-diag-job.yml
+++ b/eng/pipelines/diagnostics/runtime-diag-job.yml
@@ -38,6 +38,7 @@ parameters:
   disableComponentGovernance: ''
   liveRuntimeDir: ''
   useCdac: false
+  classFilter: ''
 
 jobs:
 - template: /eng/common/${{ parameters.templatePath }}/job/job.yml
@@ -88,6 +89,7 @@ jobs:
       - _TestArgs: '-test'
       - _Cross: ''
       - _CdacArgs: ''
+      - _ClassFilterArgs: ''
 
       - _buildScript: $(Build.SourcesDirectory)$(dir)build$(scriptExt)
 
@@ -103,6 +105,9 @@ jobs:
       - ${{ if eq(parameters.useCdac, 'true') }}:
         - _CdacArgs: '-useCdac'
 
+      - ${{ if ne(parameters.classFilter, '') }}:
+        - _ClassFilterArgs: '-classfilter ${{ parameters.classFilter }}'
+
       # For testing msrc's and service releases. The RuntimeSourceVersion is either "default" or the service release version to test
       - _InternalInstallArgs: ''
       - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.isCodeQLRun, 'false')) }}:
@@ -200,6 +205,7 @@ jobs:
           $(_TestArgs)
           $(_Cross)
           $(_InternalInstallArgs)
+          $(_ClassFilterArgs)
           /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
       ${{ if eq(parameters.testOnly, 'true') }}:
         displayName: Test
diff --git a/eng/pipelines/runtime-diagnostics.yml b/eng/pipelines/runtime-diagnostics.yml
index bf55b91ac49bc5..9574343309c435 100644
--- a/eng/pipelines/runtime-diagnostics.yml
+++ b/eng/pipelines/runtime-diagnostics.yml
@@ -104,6 +104,7 @@ extends:
           jobParameters:
             name: cDAC
             useCdac: true
+            classFilter: SOS
             isOfficialBuild: ${{ variables.isOfficialBuild }}
             liveRuntimeDir: $(Build.SourcesDirectory)/artifacts/runtime
             timeoutInMinutes: 360
@@ -156,6 +157,7 @@ extends:
           jobParameters:
             name: DAC
             useCdac: false
+            classFilter: SOS
             isOfficialBuild: ${{ variables.isOfficialBuild }}
             liveRuntimeDir: $(Build.SourcesDirectory)/artifacts/runtime
             timeoutInMinutes: 360