diff --git a/taskcluster/ci/test/raptor.yml b/taskcluster/ci/test/raptor.yml
index 629cde615a3a..35d3b14de3ff 100644
--- a/taskcluster/ci/test/raptor.yml
+++ b/taskcluster/ci/test/raptor.yml
@@ -199,7 +199,6 @@ raptor-unity-webgl-firefox:
     try-name: raptor-unity-webgl-firefox
     treeherder-symbol: Rap(ugl)
     run-on-projects: ['try', 'mozilla-central']
-    tier: 3
     max-run-time: 3600
     mozharness:
         extra-options:
@@ -213,7 +212,6 @@ raptor-unity-webgl-chrome:
     try-name: raptor-unity-webgl-chrome
     treeherder-symbol: Rap-C(ugl)
     run-on-projects: ['try', 'mozilla-central']
-    tier: 3
     max-run-time: 3600
     mozharness:
         extra-options:
@@ -228,7 +226,6 @@ raptor-wasm-misc-firefox:
     try-name: raptor-wasm-misc-firefox
     treeherder-symbol: Rap(wm)
     run-on-projects: ['try', 'mozilla-central']
-    tier: 3
     max-run-time: 1800
     mozharness:
         extra-options:
@@ -237,12 +234,37 @@ raptor-wasm-misc-firefox:
         fetch:
             - wasm-misc
 
+raptor-wasm-misc-baseline-firefox:
+    description: "Raptor WASM Misc on Firefox with baseline JIT"
+    try-name: raptor-wasm-misc-baseline-firefox
+    treeherder-symbol: Rap(wm-b)
+    run-on-projects: ['try', 'mozilla-central']
+    max-run-time: 1800
+    mozharness:
+        extra-options:
+            - --test=raptor-wasm-misc-baseline
+    fetches:
+        fetch:
+            - wasm-misc
+
+raptor-wasm-misc-ion-firefox:
+    description: "Raptor WASM Misc on Firefox with ION Monkey"
+    try-name: raptor-wasm-misc-ion-firefox
+    treeherder-symbol: Rap(wm-i)
+    run-on-projects: ['try', 'mozilla-central']
+    max-run-time: 1800
+    mozharness:
+        extra-options:
+            - --test=raptor-wasm-misc-ion
+    fetches:
+        fetch:
+            - wasm-misc
+
 raptor-wasm-misc-chrome:
     description: "Raptor WASM Misc on Chrome"
     try-name: raptor-wasm-misc-chrome
     treeherder-symbol: Rap-C(wm)
     run-on-projects: ['try', 'mozilla-central']
-    tier: 3
     max-run-time: 1800
     mozharness:
         extra-options:
diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
index 02504549d7b7..5e44bfc08524 100644
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -108,6 +108,8 @@ raptor-chrome:
 raptor-fetch-firefox:
     - raptor-unity-webgl-firefox
     - raptor-wasm-misc-firefox
+    - raptor-wasm-misc-baseline-firefox
+    - raptor-wasm-misc-ion-firefox
 
 raptor-fetch-chrome:
     - raptor-unity-webgl-chrome
diff --git a/testing/raptor/raptor/raptor.ini b/testing/raptor/raptor/raptor.ini
index ea26ddf75a4c..ee4730a5464a 100644
--- a/testing/raptor/raptor/raptor.ini
+++ b/testing/raptor/raptor/raptor.ini
@@ -9,4 +9,6 @@
 [include:tests/raptor-webaudio.ini]
 [include:tests/raptor-gdocs.ini]
 [include:tests/raptor-wasm-misc.ini]
+[include:tests/raptor-wasm-misc-baseline.ini]
+[include:tests/raptor-wasm-misc-ion.ini]
 [include:tests/raptor-assorted-dom.ini]
diff --git a/testing/raptor/raptor/tests/raptor-wasm-misc-baseline.ini b/testing/raptor/raptor/tests/raptor-wasm-misc-baseline.ini
new file mode 100644
index 000000000000..31ca5ac39597
--- /dev/null
+++ b/testing/raptor/raptor/tests/raptor-wasm-misc-baseline.ini
@@ -0,0 +1,19 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Wasm-Misc benchmark for firefox and chrome
+
+[DEFAULT]
+type =  benchmark
+test_url = http://localhost:<port>/wasm-misc/index.html?raptor
+page_cycles = 5
+page_timeout = 1200000
+unit = ms
+lower_is_better = true
+alert_threshold = 2.0
+
+[raptor-wasm-misc-baseline-firefox]
+apps = firefox
+preferences = {"javascript.options.wasm_baselinejit": true,
+               "javascript.options.wasm_ionjit": false}
diff --git a/testing/raptor/raptor/tests/raptor-wasm-misc-ion.ini b/testing/raptor/raptor/tests/raptor-wasm-misc-ion.ini
new file mode 100644
index 000000000000..d7d867c0b19f
--- /dev/null
+++ b/testing/raptor/raptor/tests/raptor-wasm-misc-ion.ini
@@ -0,0 +1,19 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Wasm-Misc benchmark for firefox and chrome
+
+[DEFAULT]
+type =  benchmark
+test_url = http://localhost:<port>/wasm-misc/index.html?raptor
+page_cycles = 5
+page_timeout = 1200000
+unit = ms
+lower_is_better = true
+alert_threshold = 2.0
+
+[raptor-wasm-misc-ion-firefox]
+apps = firefox
+preferences = {"javascript.options.wasm_baselinejit": false,
+               "javascript.options.wasm_ionjit": true}