deleted file mode 100755
--- a/js/src/devtools/automation/autospider.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-exec python2.7 "$(dirname $0)/autospider.py" "$@"

new file mode 100644
--- /dev/null
+++ b/js/src/devtools/automation/variants/warpdebug
@@ -0,0 +1,11 @@
+{
+    "configure-args": "--enable-rust-simd",
+    "debug": true,
+    "compiler": "clang",
+    "env": {
+        "JITTEST_EXTRA_ARGS": "--jitflags=warp"
+    },
+    "skip-tests": {
+        "all": ["jstests", "jsapitests"]
+    }
+}

--- a/js/src/tests/lib/tests.py
+++ b/js/src/tests/lib/tests.py
@@ -29,16 +29,21 @@ JITFLAGS = {
         ['--baseline-eager'],
         ['--no-blinterp', '--no-baseline', '--no-ion', '--more-compartments'],
     ],
     # used by jit_test.py
     'ion': [
         ['--baseline-eager'],
         ['--ion-eager', '--ion-offthread-compile=off', '--more-compartments']
     ],
+    # Used for testing WarpBuilder.
+    'warp': [
+        ['--warp'],
+        ['--warp', '--ion-eager', '--ion-offthread-compile=off']
+    ],
     # Run reduced variants on debug builds, since they take longer time.
     'debug': [
         [],  # no flags, normal baseline and ion
         ['--ion-eager', '--ion-offthread-compile=off',  # implies --baseline-eager
          '--more-compartments'],
         ['--baseline-eager'],
     ],
     # Cover cases useful for tsan. Note that we test --ion-eager without

--- a/taskcluster/ci/spidermonkey/linux.yml
+++ b/taskcluster/ci/spidermonkey/linux.yml
@@ -100,16 +100,28 @@ sm-smoosh-linux64/opt:
     fetches:
         toolchain:
             - linux64-clang
             - linux64-gcc
             - linux64-rust
             - linux64-cbindgen
     run-on-projects: ['try', 'central']
 
+sm-warp-linux64/debug:
+    description: "Spidermonkey WarpBuilder"
+    index:
+        job-name: sm-warp-linux64-debug
+    treeherder:
+        platform: linux64/debug
+        symbol: SM(warp)
+        tier: 2
+    run:
+        spidermonkey-variant: warpdebug
+    run-on-projects: ['try', 'mozilla-central']
+
 sm-nojit-linux64/opt:
     description: "Spidermonkey no JIT"
     index:
         job-name: sm-nojit-linux64-opt
     treeherder:
         symbol: SM(nojit)
         platform: linux64/opt
     run: