diff --git a/etc/ci/buildbot_steps.yml b/etc/ci/buildbot_steps.yml
index c9ead7956c8..03f2dfba7a3 100644
--- a/etc/ci/buildbot_steps.yml
+++ b/etc/ci/buildbot_steps.yml
@@ -5,42 +5,6 @@ env:
   SCCACHE_IDLE_TIMEOUT: "1200"
   GST_DEBUG: '3'
 
-mac-rel-wpt4:
- env:
-   CC: /usr/local/opt/llvm/bin/clang
-   CXX: /usr/local/opt/llvm/bin/clang++
- commands:
-  - ./mach clean-nightlies --keep 3 --force
-  - ./mach clean-cargo-cache --keep 3 --force
-  - env PKG_CONFIG_PATH=/usr/local/opt/zlib/lib/pkgconfig ./mach build --release
-  - ./mach test-wpt --release --processes 4 --total-chunks 6 --this-chunk 4 --log-raw test-wpt.log --log-errorsummary wpt-errorsummary.log --always-succeed
-  - ./mach filter-intermittents wpt-errorsummary.log --log-intermittents intermittents.log --log-filteredsummary filtered-wpt-errorsummary.log --tracker-api default --reporter-api default
-  - ./mach test-wpt --release --pref dom.servoparser.async_html_tokenizer.enabled --processes=8 --log-raw test-async-parsing.log --log-errorsummary async-parsing-errorsummary.log --always-succeed domparsing html/syntax html/dom/documents html/dom/dynamic-markup-insertion
-  - ./mach filter-intermittents async-parsing-errorsummary.log --log-intermittents async-parsing-intermittents.log --log-filteredsummary filtered-async-parsing-errorsummary.log --tracker-api default --reporter-api default
-
-mac-rel-css1:
- env:
-   CC: /usr/local/opt/llvm/bin/clang
-   CXX: /usr/local/opt/llvm/bin/clang++
- commands:
-  - ./mach clean-nightlies --keep 3 --force
-  - ./mach clean-cargo-cache --keep 3 --force
-  - env PKG_CONFIG_PATH=/usr/local/opt/zlib/lib/pkgconfig ./mach build --release
-  - ./mach test-wpt --release --processes 4 --total-chunks 6 --this-chunk 5 --log-raw test-wpt.log --log-errorsummary wpt-errorsummary.log --always-succeed
-  - ./mach filter-intermittents wpt-errorsummary.log --log-intermittents intermittents.log --log-filteredsummary filtered-wpt-errorsummary.log --tracker-api default --reporter-api default
-  - bash ./etc/ci/lockfile_changed.sh
-
-mac-rel-css2:
- env:
-   CC: /usr/local/opt/llvm/bin/clang
-   CXX: /usr/local/opt/llvm/bin/clang++
- commands:
-  - ./mach clean-nightlies --keep 3 --force
-  - ./mach clean-cargo-cache --keep 3 --force
-  - env PKG_CONFIG_PATH=/usr/local/opt/zlib/lib/pkgconfig ./mach build --release
-  - ./mach test-wpt --release --processes 4 --total-chunks 6 --this-chunk 6 --log-raw test-wpt.log --log-errorsummary wpt-errorsummary.log --always-succeed
-  - ./mach filter-intermittents wpt-errorsummary.log --log-intermittents intermittents.log --log-filteredsummary filtered-wpt-errorsummary.log --tracker-api default --reporter-api default
-
 linux-rel-intermittent:
  env:
    CC: clang-4.0
@@ -193,6 +157,9 @@ android-x86: []
 mac-rel-wpt1: []
 mac-rel-wpt2: []
 mac-rel-wpt3: []
+mac-rel-wpt4: []
+mac-rel-css1: []
+mac-rel-css2: []
 android-nightly: []
 windows-msvc-nightly: []
 mac-nightly: []
diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py
index 36a9d3b1d01..5173270d146 100644
--- a/etc/taskcluster/decision_task.py
+++ b/etc/taskcluster/decision_task.py
@@ -528,7 +528,7 @@ def macos_wpt():
             """)
         )
     wpt_chunks("macOS x64", macos_run_task, build_task, repo_dir="repo",
-               total_chunks=6, processes=4, chunks=[1,2,3])
+               total_chunks=6, processes=4)
 
 
 def wpt_chunks(platform, make_chunk_task, build_task, total_chunks, processes,
@@ -568,6 +568,11 @@ def wpt_chunks(platform, make_chunk_task, build_task, total_chunks, processes,
                     tests/wpt/mozilla/tests/css/img_simple.html \
                     tests/wpt/mozilla/tests/mozilla/secure.https.html \
                     | cat
+                time ./mach test-wpt --release --processes 1 --product=servodriver \
+                    --headless --log-raw test-bluetooth.log \
+                    --log-errorsummary bluetooth-errorsummary.log \
+                    bluetooth \
+                    | cat
             """)
         # `test-wpt` is piped into `cat` so that stdout is not a TTY
         # and wptrunner does not use "interactive mode" formatting: