diff --git a/taskcluster/kinds/source-test/kind.yml b/taskcluster/kinds/source-test/kind.yml
index 45789e708ad1..7200b7ac3ef4 100644
--- a/taskcluster/kinds/source-test/kind.yml
+++ b/taskcluster/kinds/source-test/kind.yml
@@ -41,6 +41,7 @@ tasks-from:
     - webcompat.yml
     - wpt-manifest.yml
     - wpt-metadata.yml
+    - wpt-unittest.yml
 
 task-defaults:
     use-python: default
diff --git a/taskcluster/kinds/source-test/wpt-unittest.yml b/taskcluster/kinds/source-test/wpt-unittest.yml
new file mode 100644
index 000000000000..559a5b2509b5
--- /dev/null
+++ b/taskcluster/kinds/source-test/wpt-unittest.yml
@@ -0,0 +1,25 @@
+# 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/.
+---
+task-defaults:
+    platform: lint/opt
+    treeherder:
+        kind: test
+        tier: 1
+    worker-type: t-linux-xlarge-source
+    worker:
+        docker-image: {in-tree: "lint"}
+        max-run-time: 1800
+
+default:
+    description: Web-platform unit tests.
+    treeherder:
+        symbol: wpt-unittest
+    run:
+        using: run-task
+        cwd: '{checkout}'
+        command: ./mach wpt-unittest -e py38
+    when:
+        files-changed:
+            - 'testing/web-platform/tests/tools/**'