diff --git a/.cron.yml b/.cron.yml
index 2b23cd7b7..c73446a44 100644
--- a/.cron.yml
+++ b/.cron.yml
@@ -12,6 +12,12 @@ jobs:
       when:
           - {hour: 5, minute: 0}
           - {hour: 17, minute: 0}
+    - name: nightly-test
+      job:
+          type: decision-task
+          treeherder-symbol: Nt
+          target-tasks-method: nightly-test
+      when: []
     - name: fennec-production
       job:
           type: decision-task
diff --git a/taskcluster/ci/browsertime/kind.yml b/taskcluster/ci/browsertime/kind.yml
index badaa688d..13b05183c 100644
--- a/taskcluster/ci/browsertime/kind.yml
+++ b/taskcluster/ci/browsertime/kind.yml
@@ -13,7 +13,7 @@ kind-dependencies:
 primary-dependency: signing
 
 only-for-build-types:
-    - nightly
+    - nightly-simulation
 
 only-for-abis:
     - armeabi-v7a
@@ -22,7 +22,7 @@ only-for-abis:
 task-defaults:
     attributes:
         artifact_prefix: public/test_info
-        nightly: true
+        nightly-test: true
     dependencies:
         geckoview-nightly: geckoview-nightly
     notify:
diff --git a/taskcluster/fenix_taskgraph/target_tasks.py b/taskcluster/fenix_taskgraph/target_tasks.py
index 5fc04872f..c69caef83 100644
--- a/taskcluster/fenix_taskgraph/target_tasks.py
+++ b/taskcluster/fenix_taskgraph/target_tasks.py
@@ -77,6 +77,14 @@ def target_tasks_nightly(full_task_graph, parameters, graph_config):
     return [l for l, t in full_task_graph.tasks.items() if filter(t, parameters)]
 
 
+@_target_task("nightly-test")
+def target_tasks_nightly_test(full_task_graph, parameters, graph_config):
+    """Select the set of tasks required for a nightly build."""
+    def filter(task, parameters):
+        return task.attributes.get("nightly-test", False)
+    return [l for l, t in full_task_graph.tasks.items() if filter(t, parameters)]
+
+
 def _filter_fennec(fennec_type, task, parameters):
     return task.attributes.get("build-type", "") == "fennec-{}".format(fennec_type)