new file mode 100644
--- /dev/null
+++ b/taskcluster/ci/legacy/tasks/docker_test.yml
@@ -0,0 +1,27 @@
+$inherits:
+  from: 'tasks/test.yml'
+
+docker-image: tester
+task:
+  workerType: b2gtest
+
+  scopes:
+    - 'docker-worker:feature:allowPtrace'
+
+  payload:
+    image:
+      type: 'task-image'
+      path: 'public/image.tar'
+      taskId:
+        task-reference: "<docker-image>"
+
+    # Docker builds share a common artifact directory for ease of uploading.
+    artifacts:
+      'public/logs/':
+        type: directory
+        path: '/home/worker/workspace/build/upload/logs/'
+        expires: '{{#from_now}}1 year{{/from_now}}'
+      'public/test_info/':
+        type: directory
+        path: '/home/worker/workspace/build/blobber_upload_dir/'
+        expires: '{{#from_now}}1 year{{/from_now}}'

--- a/taskcluster/ci/legacy/tasks/test.yml
+++ b/taskcluster/ci/legacy/tasks/test.yml
@@ -1,48 +1,26 @@
 # This task is the base for most tests in gecko.
-docker-image: tester
 task:
   created: '{{now}}'
   deadline: '{{#from_now}}24 hours{{/from_now}}'
   metadata:
     source: '{{source}}'
     owner: mozilla-taskcluster-maintenance@mozilla.com
   tags:
     createdForUser: {{owner}}
-  workerType: b2gtest
   provisionerId: aws-provisioner-v1
   schedulerId: task-graph-scheduler
 
-  scopes:
-    - 'docker-worker:feature:allowPtrace'
-
   payload:
-    image:
-      type: 'task-image'
-      path: 'public/image.tar'
-      taskId:
-        task-reference: "<docker-image>"
-
     maxRunTime: 3600
     env:
       MOZILLA_BUILD_URL: {"task-reference": "https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
       MOZHARNESS_URL: {"task-reference": "https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{mozharness_location}}"}
 
-    # All builds share a common artifact directory for ease of uploading.
-    artifacts:
-      'public/logs/':
-        type: directory
-        path: '/home/worker/workspace/build/upload/logs/'
-        expires: '{{#from_now}}1 year{{/from_now}}'
-      'public/test_info/':
-        type: directory
-        path: '/home/worker/workspace/build/blobber_upload_dir/'
-        expires: '{{#from_now}}1 year{{/from_now}}'
-
   extra:
     chunks:
       total: 1
       current: {{chunk}}
     treeherder:
       jobKind: test
       groupSymbol: tc
       groupName: Submitted by taskcluster

--- a/taskcluster/ci/legacy/tasks/tests/b2g_unittest_base.yml
+++ b/taskcluster/ci/legacy/tasks/tests/b2g_unittest_base.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/test.yml'
+  from: 'tasks/docker_test.yml'
 task:
   scopes:
     - 'docker-worker:cache:level-{{level}}-{{project}}-tc-vcs'
     - 'docker-worker:cache:level-{{level}}-{{project}}-dotcache'
     - 'docker-worker:capability:device:loopbackVideo'
     - 'docker-worker:capability:device:loopbackAudio'
   payload:
     cache:

rename from taskcluster/ci/legacy/tasks/tests/fx_desktop_generic.yml
rename to taskcluster/ci/legacy/tasks/tests/fx_docker_desktop_generic.yml
--- a/taskcluster/ci/legacy/tasks/tests/fx_desktop_generic.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_docker_desktop_generic.yml
@@ -1,8 +1,8 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_test_base.yml'
+  from: 'tasks/tests/fx_docker_test_base.yml'
 task:
   payload:
     command:
       - bash
       - /home/worker/bin/test.sh

rename from taskcluster/ci/legacy/tasks/tests/fx_test_base.yml
rename to taskcluster/ci/legacy/tasks/tests/fx_docker_test_base.yml
--- a/taskcluster/ci/legacy/tasks/tests/fx_test_base.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_docker_test_base.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/test.yml'
+  from: 'tasks/docker_test.yml'
 docker-image: desktop-test
 task:
   workerType: desktop-test
   scopes:
     - docker-worker:cache:level-{{level}}-{{project}}-test-workspace
   payload:
     image:
       type: 'task-image'

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_cppunit.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_cppunit.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
       - {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
       - --cppunittest-suite=cppunittest
     env:

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_crashtest.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_crashtest.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
       - {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
       - --{{suite}}-suite={{flavor}}
       - --total-chunk={{total_chunks}}

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_crashtest_e10s.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_crashtest_e10s.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
       - {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
       - --{{suite}}-suite={{flavor}}
       - --total-chunk={{total_chunks}}

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_external_media_tests.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_external_media_tests.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
       - {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
     env:
         MOZHARNESS_SCRIPT: 'mozharness/scripts/firefox_media_tests_buildbot.py'

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     command:
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
       - {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
     env:
         MOZHARNESS_SCRIPT: 'mozharness/scripts/firefox_ui_tests/functional.py'
         MOZHARNESS_CONFIG: >

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional_e10s.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional_e10s.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     command:
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
       - {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
       - --e10s
     env:
         MOZHARNESS_SCRIPT: 'mozharness/scripts/firefox_ui_tests/functional.py'

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_gtest.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_gtest.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   workerType: desktop-test-xlarge
   payload:
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
       - {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
       - --{{suite}}-suite={{flavor}}

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_jittests.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_jittests.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
       - {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
       - --{{suite}}-suite={{flavor}}
       - --total-chunk={{total_chunks}}

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_jsreftest.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_jsreftest.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
       - {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
       - --{{suite}}-suite={{flavor}}
       - --total-chunk={{total_chunks}}

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_jsreftest_e10s.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_jsreftest_e10s.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
       - {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
       - --{{suite}}-suite={{flavor}}
       - --total-chunk={{total_chunks}}

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_luciddream.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_luciddream.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
       - {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
     env:
       MOZHARNESS_SCRIPT: 'mozharness/scripts/luciddream_unittest.py'

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_marionette.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_marionette.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
       - {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
     env:
         MOZHARNESS_SCRIPT: 'mozharness/scripts/marionette.py'

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_marionette_e10s.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_marionette_e10s.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
       - {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
       - --e10s
     env:

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_a11y.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_a11y.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     capabilities:
       devices:
         loopbackVideo: true
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_bc.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_bc.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     capabilities:
       devices:
         loopbackVideo: true
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_bc_e10s.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_bc_e10s.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     capabilities:
       devices:
         loopbackVideo: true
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_chrome.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_chrome.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     capabilities:
       devices:
         loopbackVideo: true
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_clipboard.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_clipboard.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     capabilities:
       devices:
         loopbackVideo: true
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_clipboard_e10s.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_clipboard_e10s.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     capabilities:
       devices:
         loopbackVideo: true
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_dt.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_dt.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     # these tests take longer than most to complete
     maxRunTime: 5400
     capabilities:
       devices:
         loopbackVideo: true
     command:

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_dt_e10s.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_dt_e10s.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     # these tests take longer than most to complete
     maxRunTime: 5400
     capabilities:
       devices:
         loopbackVideo: true
     command:

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_gl.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_gl.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     capabilities:
       devices:
         loopbackVideo: true
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_gl_e10s.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_gl_e10s.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     capabilities:
       devices:
         loopbackVideo: true
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_gpu.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_gpu.yml
@@ -1,10 +1,10 @@
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     capabilities:
       devices:
         loopbackVideo: true
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_gpu_e10s.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_gpu_e10s.yml
@@ -1,10 +1,10 @@
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     capabilities:
       devices:
         loopbackVideo: true
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_jetpack.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_jetpack.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     maxRunTime: 5400
     capabilities:
       devices:
         loopbackVideo: true
     command:
       - --no-read-buildbot-config

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_media.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_media.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     capabilities:
       devices:
         loopbackVideo: true
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_media_e10s.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_media_e10s.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     capabilities:
       devices:
         loopbackVideo: true
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_plain.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_plain.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     maxRunTime: 5400
     capabilities:
       devices:
         loopbackVideo: true
     command:
       - --no-read-buildbot-config

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_plain_e10s.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_plain_e10s.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     maxRunTime: 5400
     capabilities:
       devices:
         loopbackVideo: true
     command:
       - --no-read-buildbot-config

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_vg.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_mochitest_vg.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   scopes:
     - 'docker-worker:capability:device:loopbackVideo'
   payload:
     maxRunTime: 28800
     capabilities:
       devices:
         loopbackVideo: true

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_reftest.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_reftest.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
       - {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
       - --{{suite}}-suite={{flavor}}
       - --total-chunk={{total_chunks}}

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_reftest_e10s.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_reftest_e10s.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
       - {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
       - --{{suite}}-suite={{flavor}}
       - --total-chunk={{total_chunks}}

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_reftest_not_accelerated.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_reftest_not_accelerated.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
       - {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
       - --{{suite}}-suite={{flavor}}
       - --total-chunk={{total_chunks}}

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_reftest_not_accelerated_e10s.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_reftest_not_accelerated_e10s.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
       - {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
       - --{{suite}}-suite={{flavor}}
       - --total-chunk={{total_chunks}}

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_web_platform_tests.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_web_platform_tests.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   workerType: desktop-test-xlarge
   payload:
     maxRunTime: 7200
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
       - {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_web_platform_tests_e10s.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_web_platform_tests_e10s.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   workerType: desktop-test-xlarge
   payload:
     maxRunTime: 7200
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
       - {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_web_platform_tests_reftests.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_web_platform_tests_reftests.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   workerType: desktop-test-xlarge
   payload:
     maxRunTime: 5400
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
       - {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_web_platform_tests_reftests_e10s.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_web_platform_tests_reftests_e10s.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     maxRunTime: 5400
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
       - {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
       - --test-type=reftest

--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_xpcshell.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_xpcshell.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     command:
       - --no-read-buildbot-config
       - {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
       - {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
       - --{{suite}}-suite={{flavor}}
       - --total-chunk={{total_chunks}}

new file mode 100644
--- /dev/null
+++ b/taskcluster/ci/legacy/tasks/tests/fx_win32_base.yml
@@ -0,0 +1,9 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_windows_test_base.yml'
+
+  variables:
+    test_platform: 'win32'
+
+task:
+  workerType: win7

new file mode 100644
--- /dev/null
+++ b/taskcluster/ci/legacy/tasks/tests/fx_win64_base.yml
@@ -0,0 +1,9 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_windows_test_base.yml'
+
+  variables:
+    test_platform: 'win64'
+
+task:
+  workerType: win10

new file mode 100644
--- /dev/null
+++ b/taskcluster/ci/legacy/tasks/tests/fx_windows_test_base.yml
@@ -0,0 +1,35 @@
+---
+$inherits:
+  from: 'tasks/windows_test.yml'
+task:
+
+  metadata:
+    name: '[TC] {{test_platform}} {{test_name}}'
+    description: '{{test_desc}}'
+
+  payload:
+
+    command:
+      - 'hg share c:\builds\hg-shared\mozilla-central .\'
+      - 'hg pull -u -R .\ --rev %GECKO_HEAD_REV% %GECKO_HEAD_REPOSITORY%'
+      - 'c:\mozilla-build\python\python.exe -u {{mh_script}} {{mh_args}}'
+
+    artifacts:
+      -
+        type: 'directory'
+        path: 'public\test'
+        expires: '{{#from_now}}1 year{{/from_now}}'
+
+  extra:
+    treeherder:
+      groupName: Desktop tests
+    treeherderEnv:
+      - production
+      - staging
+
+    suite:
+      name: '{{test_name}}test'
+      flavor: '{{test_name}}test'
+    treeherder:
+      groupName: 'Desktop {{test_name}}'
+      symbol: '{{test_symbol}}'

new file mode 100644
--- /dev/null
+++ b/taskcluster/ci/legacy/tasks/windows_test.yml
@@ -0,0 +1,14 @@
+$inherits:
+  from: 'tasks/test.yml'
+
+task:
+  payload:
+    artifacts:
+      -
+        type: 'directory'
+        path: 'public\logs'
+        expires: '{{#from_now}}1 year{{/from_now}}'
+      -
+        type: 'directory'
+        path: 'public\test_info'
+        expires: '{{#from_now}}1 year{{/from_now}}'