diff --git a/taskcluster/ci/build-signing/kind.yml b/taskcluster/ci/build-signing/kind.yml
index d75e9f603838..5f5f22e6ced9 100644
--- a/taskcluster/ci/build-signing/kind.yml
+++ b/taskcluster/ci/build-signing/kind.yml
@@ -2,7 +2,7 @@
 # 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/.
 
-loader: taskgraph.loader.build_signing:loader
+loader: taskgraph.loader.single_dep:loader
 
 transforms:
    - taskgraph.transforms.build_signing:transforms
@@ -12,5 +12,8 @@ transforms:
 kind-dependencies:
   - build
 
+only-for-attributes:
+  - nightly
+
 not-for-build-platforms:
    - win64-nightly/opt
diff --git a/taskcluster/ci/test/kind.yml b/taskcluster/ci/test/kind.yml
index 8856f5a69271..0f7dfe52d536 100644
--- a/taskcluster/ci/test/kind.yml
+++ b/taskcluster/ci/test/kind.yml
@@ -2,7 +2,6 @@ loader: taskgraph.loader.test:loader
 
 kind-dependencies:
     - build
-    - build-signing
 
 transforms:
    - taskgraph.transforms.tests:transforms
diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
index bad57531dcdf..e01854b461ad 100644
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -123,7 +123,7 @@ windows-vm-tests:
     - mochitest-media
     - web-platform-tests
     - web-platform-tests-reftests
-    - xpcshell
+    #- xpcshell
 
 windows-gpu-tests:
     - reftest
diff --git a/taskcluster/ci/test/tests.yml b/taskcluster/ci/test/tests.yml
index 9c25c026809b..9aeb740a00f9 100644
--- a/taskcluster/ci/test/tests.yml
+++ b/taskcluster/ci/test/tests.yml
@@ -1570,27 +1570,22 @@ xpcshell:
     treeherder-symbol: tc-X(X)
     run-on-projects:
         by-test-platform:
+            windows.*: []
             linux64-qr/.*: ['mozilla-central', 'try']
-            # TODO Windows: Turn on on the other branches once Bug 1374787 is fixed
-            windows.*: ['mozilla-central', 'try']
             default: built-projects
     docker-image: {"in-tree": "desktop1604-test"}
     chunks:
         by-test-platform:
             linux64/debug: 10
             android-4.2-x86/opt: 6
+            # windows.*: 1
             macosx.*: 1
-            windows.*: 1
             default: 8
     instance-size:
         by-test-platform:
             android.*: xlarge
             default: legacy # Bug 1281241: migrating to m3.large instances
     max-run-time: 5400
-    tier:
-        by-test-platform:
-            windows.*: 3
-            default: default
     e10s: false
     allow-software-gl-layers: false
     mozharness:
@@ -1624,8 +1619,3 @@ xpcshell:
                             - --xpcshell-suite=xpcshell-coverage
                         default:
                             - --xpcshell-suite=xpcshell
-                requires-signed-builds:
-                    by-test-platform:
-                        windows10-64-asan/opt: false    # No XPCShell on ASAN yet
-                        windows.*: true
-                        default: false
diff --git a/taskcluster/docs/kinds.rst b/taskcluster/docs/kinds.rst
index 035db56beb57..8b4b77d27c92 100644
--- a/taskcluster/docs/kinds.rst
+++ b/taskcluster/docs/kinds.rst
@@ -15,9 +15,10 @@ build-signing
 -------------
 
 Many builds must be signed. The build-signing task takes the unsigned `build`
-kind artifacts and passes them through signingscriptworker to a signing server
+kind artifacts and passess them through signingscriptworker to a signing server
 and returns signed results.
 
+
 artifact-build
 --------------
 
diff --git a/taskcluster/taskgraph/loader/build_signing.py b/taskcluster/taskgraph/loader/build_signing.py
deleted file mode 100644
index 3c84a6bec2da..000000000000
--- a/taskcluster/taskgraph/loader/build_signing.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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/.
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-from taskgraph.loader.single_dep import loader as base_loader
-
-# XXX: This logic should rely in kind.yml. This hasn't been done in the original
-# patch because it required some heavy changes in single_dep.
-LABELS_WHICH_SHOULD_SIGN_CI_BUILDS = (
-    'build-win32/debug', 'build-win32/opt', 'build-win32-pgo/opt',
-    'build-win64/debug', 'build-win64/opt', 'build-win64-pgo/opt',
-)
-
-
-def loader(kind, path, config, params, loaded_tasks):
-    jobs = base_loader(kind, path, config, params, loaded_tasks)
-
-    for job in jobs:
-        dependent_task = job['dependent-task']
-        if dependent_task.attributes.get('nightly') or \
-                dependent_task.label in LABELS_WHICH_SHOULD_SIGN_CI_BUILDS:
-            yield job
diff --git a/taskcluster/taskgraph/loader/push_apk.py b/taskcluster/taskgraph/loader/push_apk.py
index 070f493e6186..5a8320ade043 100644
--- a/taskcluster/taskgraph/loader/push_apk.py
+++ b/taskcluster/taskgraph/loader/push_apk.py
@@ -14,13 +14,7 @@ def loader(kind, path, config, params, loaded_tasks):
     jobs = base_loader(kind, path, config, params, loaded_tasks)
 
     for job in jobs:
-        dependent_tasks = get_dependent_loaded_tasks(config, loaded_tasks)
-        if not dependent_tasks:
-            # PushApk must depend on signed APK. If no dependent task was found,
-            # this means another plaform (like windows) is being processed
-            continue
-
-        job['dependent-tasks'] = dependent_tasks
+        job['dependent-tasks'] = get_dependent_loaded_tasks(config, loaded_tasks)
         yield job
 
 
diff --git a/taskcluster/taskgraph/loader/test.py b/taskcluster/taskgraph/loader/test.py
index aafa9cb8831d..aa24583f9fa9 100644
--- a/taskcluster/taskgraph/loader/test.py
+++ b/taskcluster/taskgraph/loader/test.py
@@ -18,21 +18,17 @@ def loader(kind, path, config, params, loaded_tasks):
     """
 
     # the kind on which this one depends
-    if len(config.get('kind-dependencies', [])) != 2:
+    if len(config.get('kind-dependencies', [])) != 1:
         raise Exception(
-            'Test kinds must have exactly 2 items in kind-dependencies'
-        )
+            "Test kinds must have exactly one item in kind-dependencies")
+    dep_kind = config['kind-dependencies'][0]
 
-    builds_by_platform = get_builds_by_platform(dep_kind='build', loaded_tasks=loaded_tasks)
-    signed_builds_by_platform = get_builds_by_platform(
-        dep_kind='build-signing', loaded_tasks=loaded_tasks
-    )
+    # get build tasks, keyed by build platform
+    builds_by_platform = get_builds_by_platform(dep_kind, loaded_tasks)
 
     # get the test platforms for those build tasks
     test_platforms_cfg = load_yaml(path, 'test-platforms.yml')
-    test_platforms = get_test_platforms(
-        test_platforms_cfg, builds_by_platform, signed_builds_by_platform
-    )
+    test_platforms = get_test_platforms(test_platforms_cfg, builds_by_platform)
 
     # expand the test sets for each of those platforms
     test_sets_cfg = load_yaml(path, 'test-sets.yml')
@@ -48,12 +44,9 @@ def loader(kind, path, config, params, loaded_tasks):
             test['build-platform'] = test_platform['build-platform']
             test['test-platform'] = test_platform_name
             test['build-label'] = test_platform['build-label']
-            if test_platform.get('build-signing-label', None):
-                test['build-signing-label'] = test_platform['build-signing-label']
-
             test['build-attributes'] = test_platform['build-attributes']
             test['test-name'] = test_name
-            if test_platform.get('nightly'):
+            if test_platform['nightly']:
                 test.setdefault('attributes', {})['nightly'] = True
 
             logger.debug("Generating tasks for test {} on platform {}".format(
@@ -80,7 +73,7 @@ def get_builds_by_platform(dep_kind, loaded_tasks):
     return builds_by_platform
 
 
-def get_test_platforms(test_platforms_cfg, builds_by_platform, signed_builds_by_platform={}):
+def get_test_platforms(test_platforms_cfg, builds_by_platform):
     """Get the test platforms for which test tasks should be generated,
     based on the available build platforms.  Returns a dictionary mapping
     test platform to {test-set, build-platform, build-label}."""
@@ -93,22 +86,12 @@ def get_test_platforms(test_platforms_cfg, builds_by_platform, signed_builds_by_
                     build_platform, test_platform))
             continue
         test_platforms[test_platform] = {
+            'nightly': builds_by_platform[build_platform].attributes.get('nightly', False),
             'build-platform': build_platform,
             'build-label': builds_by_platform[build_platform].label,
             'build-attributes': builds_by_platform[build_platform].attributes,
         }
-
-        if builds_by_platform[build_platform].attributes.get('nightly'):
-            test_platforms[test_platform]['nightly'] = \
-                builds_by_platform[build_platform].attributes['nightly']
-
         test_platforms[test_platform].update(cfg)
-
-        if build_platform in signed_builds_by_platform:
-            # Context: Signed builds are only used by Windows
-            test_platforms[test_platform]['build-signing-label'] = \
-                signed_builds_by_platform[build_platform].label
-
     return test_platforms
 
 
diff --git a/taskcluster/taskgraph/transforms/balrog.py b/taskcluster/taskgraph/transforms/balrog.py
index 663435f662c3..9465b37a952c 100644
--- a/taskcluster/taskgraph/transforms/balrog.py
+++ b/taskcluster/taskgraph/transforms/balrog.py
@@ -8,7 +8,6 @@ Transform the beetmover task into an actual task description.
 from __future__ import absolute_import, print_function, unicode_literals
 
 from taskgraph.transforms.base import TransformSequence
-from taskgraph.util.attributes import copy_attributes_from_dependent_job
 from taskgraph.util.schema import validate_schema, Schema
 from taskgraph.util.scriptworker import (get_balrog_server_scope,
                                          get_balrog_channel_scopes)
@@ -64,7 +63,11 @@ def make_task_description(config, jobs):
         treeherder.setdefault('tier', 1)
         treeherder.setdefault('kind', 'build')
 
-        attributes = copy_attributes_from_dependent_job(dep_job)
+        attributes = {
+            'nightly': dep_job.attributes.get('nightly', False),
+            'build_platform': dep_job.attributes.get('build_platform'),
+            'build_type': dep_job.attributes.get('build_type'),
+        }
 
         if dep_job.attributes.get('locale'):
             treeherder['symbol'] = 'tc-Up({})'.format(dep_job.attributes.get('locale'))
diff --git a/taskcluster/taskgraph/transforms/beetmover.py b/taskcluster/taskgraph/transforms/beetmover.py
index ef6fb2a21006..d6ddb11c1592 100644
--- a/taskcluster/taskgraph/transforms/beetmover.py
+++ b/taskcluster/taskgraph/transforms/beetmover.py
@@ -8,7 +8,6 @@ Transform the beetmover task into an actual task description.
 from __future__ import absolute_import, print_function, unicode_literals
 
 from taskgraph.transforms.base import TransformSequence
-from taskgraph.util.attributes import copy_attributes_from_dependent_job
 from taskgraph.util.schema import validate_schema, Schema
 from taskgraph.util.scriptworker import (get_beetmover_bucket_scope,
                                          get_beetmover_action_scope)
@@ -269,8 +268,12 @@ def make_task_description(config, jobs):
         signing_dependencies = dep_job.dependencies
         dependencies.update(signing_dependencies)
 
-        attributes = copy_attributes_from_dependent_job(dep_job)
-
+        attributes = {
+            'nightly': dep_job.attributes.get('nightly', False),
+            'signed': dep_job.attributes.get('signed', False),
+            'build_platform': dep_job.attributes.get('build_platform'),
+            'build_type': dep_job.attributes.get('build_type'),
+        }
         if job.get('locale'):
             attributes['locale'] = job['locale']
 
diff --git a/taskcluster/taskgraph/transforms/beetmover_checksums.py b/taskcluster/taskgraph/transforms/beetmover_checksums.py
index 9ca181063a5c..420f9597adb8 100644
--- a/taskcluster/taskgraph/transforms/beetmover_checksums.py
+++ b/taskcluster/taskgraph/transforms/beetmover_checksums.py
@@ -8,7 +8,6 @@ Transform the checksums signing task into an actual task description.
 from __future__ import absolute_import, print_function, unicode_literals
 
 from taskgraph.transforms.base import TransformSequence
-from taskgraph.util.attributes import copy_attributes_from_dependent_job
 from taskgraph.util.schema import validate_schema, Schema
 from taskgraph.util.scriptworker import (get_beetmover_bucket_scope,
                                          get_beetmover_action_scope)
@@ -64,8 +63,12 @@ def make_beetmover_checksums_description(config, jobs):
             if k.startswith('beetmover'):
                 dependencies[k] = v
 
-        attributes = copy_attributes_from_dependent_job(dep_job)
-
+        attributes = {
+            'nightly': dep_job.attributes.get('nightly', False),
+            'signed': dep_job.attributes.get('signed', False),
+            'build_platform': dep_job.attributes.get('build_platform'),
+            'build_type': dep_job.attributes.get('build_type'),
+        }
         if dep_job.attributes.get('locale'):
             treeherder['symbol'] = 'tc-BMcs({})'.format(dep_job.attributes.get('locale'))
             attributes['locale'] = dep_job.attributes.get('locale')
diff --git a/taskcluster/taskgraph/transforms/beetmover_repackage.py b/taskcluster/taskgraph/transforms/beetmover_repackage.py
index 141e42fedcf8..13122a4ef074 100644
--- a/taskcluster/taskgraph/transforms/beetmover_repackage.py
+++ b/taskcluster/taskgraph/transforms/beetmover_repackage.py
@@ -8,7 +8,6 @@ Transform the beetmover task into an actual task description.
 from __future__ import absolute_import, print_function, unicode_literals
 
 from taskgraph.transforms.base import TransformSequence
-from taskgraph.util.attributes import copy_attributes_from_dependent_job
 from taskgraph.util.schema import validate_schema, Schema
 from taskgraph.util.scriptworker import (get_beetmover_bucket_scope,
                                          get_beetmover_action_scope)
@@ -167,7 +166,12 @@ def make_task_description(config, jobs):
                                   }
         dependencies.update(repackage_dependencies)
 
-        attributes = copy_attributes_from_dependent_job(dep_job)
+        attributes = {
+            'nightly': dep_job.attributes.get('nightly', False),
+            'signed': dep_job.attributes.get('signed', False),
+            'build_platform': dep_job.attributes.get('build_platform'),
+            'build_type': dep_job.attributes.get('build_type'),
+        }
         if job.get('locale'):
             attributes['locale'] = job['locale']
 
diff --git a/taskcluster/taskgraph/transforms/build.py b/taskcluster/taskgraph/transforms/build.py
index d21b9b069c3a..4fb2cf8aa553 100644
--- a/taskcluster/taskgraph/transforms/build.py
+++ b/taskcluster/taskgraph/transforms/build.py
@@ -22,8 +22,8 @@ def set_defaults(config, jobs):
         job['treeherder'].setdefault('tier', 1)
         job.setdefault('needs-sccache', True)
         _, worker_os = worker_type_implementation(job['worker-type'])
-        worker = job.setdefault('worker', {})
         if worker_os == "linux":
+            worker = job.setdefault('worker')
             worker.setdefault('docker-image', {'in-tree': 'desktop-build'})
             worker['chain-of-trust'] = True
             extra = job.setdefault('extra', {})
@@ -32,12 +32,8 @@ def set_defaults(config, jobs):
             extra['chainOfTrust']['inputs']['docker-image'] = {
                 "task-reference": "<docker-image>"
             }
-        elif worker_os == "windows":
-            worker.setdefault('env', {})
-            worker['chain-of-trust'] = True
-        elif worker_os == "macosx":
-            worker.setdefault('env', {})
-
+        elif worker_os in set(["macosx", "windows"]):
+            job['worker'].setdefault('env', {})
         yield job
 
 
diff --git a/taskcluster/taskgraph/transforms/build_signing.py b/taskcluster/taskgraph/transforms/build_signing.py
index cab30db53098..cdcba6e418ee 100644
--- a/taskcluster/taskgraph/transforms/build_signing.py
+++ b/taskcluster/taskgraph/transforms/build_signing.py
@@ -21,15 +21,13 @@ def add_signed_routes(config, jobs):
         dep_job = job['dependent-task']
 
         job['routes'] = []
-        if dep_job.attributes.get('nightly'):
-            for dep_route in dep_job.task.get('routes', []):
-                if not dep_route.startswith('index.gecko.v2'):
-                    continue
-                branch = dep_route.split(".")[3]
-                rest = ".".join(dep_route.split(".")[4:])
-                job['routes'].append(
-                    'index.gecko.v2.{}.signed-nightly.{}'.format(branch, rest))
-
+        for dep_route in dep_job.task.get('routes', []):
+            if not dep_route.startswith('index.gecko.v2'):
+                continue
+            branch = dep_route.split(".")[3]
+            rest = ".".join(dep_route.split(".")[4:])
+            job['routes'].append(
+                'index.gecko.v2.{}.signed-nightly.{}'.format(branch, rest))
         yield job
 
 
@@ -38,10 +36,42 @@ def make_signing_description(config, jobs):
     for job in jobs:
         dep_job = job['dependent-task']
 
-        job['upstream-artifacts'] = _generate_upstream_artifacts(
-            dep_job.attributes.get('build_platform'),
-            dep_job.attributes.get('nightly')
-        )
+        if 'android' in dep_job.attributes.get('build_platform'):
+            job_specs = [
+                {
+                    'artifacts': ['public/build/target.apk',
+                                  'public/build/en-US/target.apk'],
+                    'format': 'jar',
+                },
+            ]
+        elif 'macosx' in dep_job.attributes.get('build_platform'):
+            job_specs = [
+                {
+                   'artifacts': ['public/build/target.dmg'],
+                   'format': 'macapp',
+                },
+            ]
+        else:
+            job_specs = [
+                {
+                    'artifacts': ['public/build/target.tar.bz2'],
+                    'format': 'gpg',
+                }, {
+                    'artifacts': ['public/build/update/target.complete.mar'],
+                    'format': 'mar',
+                }
+            ]
+        upstream_artifacts = []
+        for spec in job_specs:
+            fmt = spec["format"]
+            upstream_artifacts.append({
+                "taskId": {"task-reference": "<build>"},
+                "taskType": "build",
+                "paths": spec["artifacts"],
+                "formats": [fmt]
+            })
+
+        job['upstream-artifacts'] = upstream_artifacts
 
         label = dep_job.label.replace("build-", "signing-")
         job['label'] = label
@@ -51,41 +81,3 @@ def make_signing_description(config, jobs):
         job['use-funsize-route'] = True
 
         yield job
-
-
-def _generate_upstream_artifacts(build_platform, is_nightly=False):
-    if 'android' in build_platform:
-        artifacts_specificities = [{
-            'artifacts': [
-                'public/build/target.apk',
-                'public/build/en-US/target.apk'
-            ],
-            'format': 'jar',
-        }]
-    # XXX: Mac and Windows don't sign mars because internal aren't signed at
-    # this stage of the release
-    elif 'macosx' in build_platform:
-        artifacts_specificities = [{
-            'artifacts': ['public/build/target.dmg'],
-            'format': 'macapp',
-        }]
-    elif 'win' in build_platform:
-        artifacts_specificities = [{
-            'artifacts': ['public/build/target.zip'],
-            'format': 'sha2signcode',
-        }]
-    else:
-        artifacts_specificities = [{
-            'artifacts': ['public/build/target.tar.bz2'],
-            'format': 'gpg',
-        }, {
-            'artifacts': ['public/build/update/target.complete.mar'],
-            'format': 'mar',
-        }]
-
-    return [{
-        'taskId': {'task-reference': '<build>'},
-        'taskType': 'build',
-        'paths': specificity['artifacts'],
-        'formats': [specificity['format']],
-    } for specificity in artifacts_specificities]
diff --git a/taskcluster/taskgraph/transforms/checksums_signing.py b/taskcluster/taskgraph/transforms/checksums_signing.py
index 42f1b35e14c2..ebfab7dbe90b 100644
--- a/taskcluster/taskgraph/transforms/checksums_signing.py
+++ b/taskcluster/taskgraph/transforms/checksums_signing.py
@@ -8,7 +8,6 @@ Transform the checksums signing task into an actual task description.
 from __future__ import absolute_import, print_function, unicode_literals
 
 from taskgraph.transforms.base import TransformSequence
-from taskgraph.util.attributes import copy_attributes_from_dependent_job
 from taskgraph.util.schema import validate_schema, Schema
 from taskgraph.util.scriptworker import get_signing_cert_scope
 from taskgraph.transforms.task import task_description_schema
@@ -58,8 +57,11 @@ def make_checksums_signing_description(config, jobs):
         label = job.get('label', "checksumssigning-{}".format(dep_job.label))
         dependencies = {"beetmover": dep_job.label}
 
-        attributes = copy_attributes_from_dependent_job(dep_job)
-
+        attributes = {
+            'nightly': dep_job.attributes.get('nightly', False),
+            'build_platform': dep_job.attributes.get('build_platform'),
+            'build_type': dep_job.attributes.get('build_type'),
+        }
         if dep_job.attributes.get('locale'):
             treeherder['symbol'] = 'tc-cs({})'.format(dep_job.attributes.get('locale'))
             attributes['locale'] = dep_job.attributes.get('locale')
diff --git a/taskcluster/taskgraph/transforms/job/mozharness.py b/taskcluster/taskgraph/transforms/job/mozharness.py
index cc96edab7f6f..9920f597bf6d 100644
--- a/taskcluster/taskgraph/transforms/job/mozharness.py
+++ b/taskcluster/taskgraph/transforms/job/mozharness.py
@@ -81,8 +81,6 @@ mozharness_run_schema = Schema({
 
     # If specified, use the in-tree job script specified.
     Optional('job-script'): basestring,
-
-    Required('requires-signed-builds', default=False): bool,
 })
 
 
diff --git a/taskcluster/taskgraph/transforms/job/mozharness_test.py b/taskcluster/taskgraph/transforms/job/mozharness_test.py
index 464907a4cce2..77d3f66dfc49 100644
--- a/taskcluster/taskgraph/transforms/job/mozharness_test.py
+++ b/taskcluster/taskgraph/transforms/job/mozharness_test.py
@@ -203,8 +203,7 @@ def mozharness_test_on_generic_worker(config, job, taskdesc):
             'type': 'directory'
         })
 
-    upstream_task = '<build-signing>' if mozharness['requires-signed-builds'] else '<build>'
-    installer_url = get_artifact_url(upstream_task, mozharness['build-artifact-name'])
+    installer_url = get_artifact_url('<build>', mozharness['build-artifact-name'])
 
     taskdesc['scopes'].extend(
         ['generic-worker:os-group:{}'.format(group) for group in test['os-groups']])
diff --git a/taskcluster/taskgraph/transforms/repackage.py b/taskcluster/taskgraph/transforms/repackage.py
index f3d08dbc7e8a..5ce293b9f343 100644
--- a/taskcluster/taskgraph/transforms/repackage.py
+++ b/taskcluster/taskgraph/transforms/repackage.py
@@ -8,7 +8,6 @@ Transform the repackage task into an actual task description.
 from __future__ import absolute_import, print_function, unicode_literals
 
 from taskgraph.transforms.base import TransformSequence
-from taskgraph.util.attributes import copy_attributes_from_dependent_job
 from taskgraph.util.schema import validate_schema, Schema
 from taskgraph.transforms.task import task_description_schema
 from voluptuous import Any, Required, Optional
@@ -110,8 +109,11 @@ def make_job_description(config, jobs):
         signing_task_ref = "<{}>".format(signing_task)
         build_task_ref = "<{}>".format(build_task)
 
-        attributes = copy_attributes_from_dependent_job(dep_job)
-
+        attributes = {
+            'nightly': dep_job.attributes.get('nightly', False),
+            'build_platform': dep_job.attributes.get('build_platform'),
+            'build_type': dep_job.attributes.get('build_type'),
+        }
         if job.get('locale'):
             attributes['locale'] = job['locale']
 
diff --git a/taskcluster/taskgraph/transforms/repackage_signing.py b/taskcluster/taskgraph/transforms/repackage_signing.py
index 3c7e3c51135e..bb54cbb62079 100644
--- a/taskcluster/taskgraph/transforms/repackage_signing.py
+++ b/taskcluster/taskgraph/transforms/repackage_signing.py
@@ -8,7 +8,6 @@ Transform the repackage signing task into an actual task description.
 from __future__ import absolute_import, print_function, unicode_literals
 
 from taskgraph.transforms.base import TransformSequence
-from taskgraph.util.attributes import copy_attributes_from_dependent_job
 from taskgraph.util.schema import validate_schema, Schema
 from taskgraph.util.scriptworker import get_signing_cert_scope
 from taskgraph.transforms.task import task_description_schema
@@ -58,8 +57,11 @@ def make_repackage_signing_description(config, jobs):
         # This is so we get the build task etc in our dependencies to
         # have better beetmover support.
         dependencies.update(signing_dependencies)
-        attributes = copy_attributes_from_dependent_job(dep_job)
-
+        attributes = {
+            'nightly': dep_job.attributes.get('nightly', False),
+            'build_platform': dep_job.attributes.get('build_platform'),
+            'build_type': dep_job.attributes.get('build_type'),
+        }
         locale_str = ""
         if dep_job.attributes.get('locale'):
             treeherder['symbol'] = 'tc-rs({})'.format(dep_job.attributes.get('locale'))
diff --git a/taskcluster/taskgraph/transforms/signing.py b/taskcluster/taskgraph/transforms/signing.py
index e0a2405ea65a..d46950175e94 100644
--- a/taskcluster/taskgraph/transforms/signing.py
+++ b/taskcluster/taskgraph/transforms/signing.py
@@ -8,7 +8,6 @@ Transform the signing task into an actual task description.
 from __future__ import absolute_import, print_function, unicode_literals
 
 from taskgraph.transforms.base import TransformSequence
-from taskgraph.util.attributes import copy_attributes_from_dependent_job
 from taskgraph.util.schema import validate_schema, Schema
 from taskgraph.util.scriptworker import get_signing_cert_scope, get_devedition_signing_cert_scope
 from taskgraph.transforms.task import task_description_schema
@@ -89,27 +88,21 @@ def make_task_description(config, jobs):
             signing_format_scopes.append("project:releng:signing:format:{}".format(format))
 
         treeherder = job.get('treeherder', {})
-        is_nightly = dep_job.attributes.get('nightly', False)
-        treeherder.setdefault('symbol', _generate_treeherder_symbol(is_nightly))
-
+        treeherder.setdefault('symbol', 'tc(Ns)')
         dep_th_platform = dep_job.task.get('extra', {}).get(
             'treeherder', {}).get('machine', {}).get('platform', '')
-        build_type = dep_job.attributes.get('build_type')
-        build_platform = dep_job.attributes.get('build_platform')
-        treeherder.setdefault('platform', _generate_treeherder_platform(
-            dep_th_platform, build_platform, build_type
-        ))
-
-        # TODO: Make non-nightly (i.e. windows CI builds) Tier 1 once green on
-        # central, inbound, autoland and try
-        treeherder.setdefault('tier', 1 if is_nightly else 3)
+        treeherder.setdefault('platform', "{}/opt".format(dep_th_platform))
+        treeherder.setdefault('tier', 1)
         treeherder.setdefault('kind', 'build')
 
         label = job.get('label', "{}-signing".format(dep_job.label))
 
-        attributes = copy_attributes_from_dependent_job(dep_job)
-        attributes['signed'] = True
-
+        attributes = {
+            'nightly': dep_job.attributes.get('nightly', False),
+            'build_platform': dep_job.attributes.get('build_platform'),
+            'build_type': dep_job.attributes.get('build_type'),
+            'signed': True,
+        }
         if dep_job.attributes.get('chunk_locales'):
             # Used for l10n attribute passthrough
             attributes['chunk_locales'] = dep_job.attributes.get('chunk_locales')
@@ -120,16 +113,14 @@ def make_task_description(config, jobs):
         if dep_job.attributes.get('build_platform') in set(
           ['linux64-devedition-nightly', 'linux-devedition-nightly']):
             signing_cert_scope = get_devedition_signing_cert_scope(config)
-        elif is_nightly:
-            signing_cert_scope = get_signing_cert_scope(config)
         else:
-            signing_cert_scope = 'project:releng:signing:cert:dep-signing'
+            signing_cert_scope = get_signing_cert_scope(config)
 
         task = {
             'label': label,
             'description': "{} Signing".format(
                 dep_job.task["metadata"]["description"]),
-            'worker-type': _generate_worker_type(signing_cert_scope),
+            'worker-type': "scriptworker-prov-v1/signing-linux-v1",
             'worker': {'implementation': 'scriptworker-signing',
                        'upstream-artifacts': job['upstream-artifacts'],
                        'max-run-time': 3600},
@@ -147,17 +138,3 @@ def make_task_description(config, jobs):
                 project=config.params['project'], level=config.params['level']))
 
         yield task
-
-
-def _generate_treeherder_platform(dep_th_platform, build_platform, build_type):
-    actual_build_type = 'pgo' if '-pgo' in build_platform else build_type
-    return '{}/{}'.format(dep_th_platform, actual_build_type)
-
-
-def _generate_treeherder_symbol(is_nightly):
-    return 'tc(Ns)' if is_nightly else 'tc(Bs)'
-
-
-def _generate_worker_type(signing_cert_scope):
-    worker_type = 'depsigning' if 'dep-signing' in signing_cert_scope else 'signing-linux-v1'
-    return 'scriptworker-prov-v1/{}'.format(worker_type)
diff --git a/taskcluster/taskgraph/transforms/tests.py b/taskcluster/taskgraph/transforms/tests.py
index 5c446176a3ad..6077895eed78 100644
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -249,10 +249,6 @@ test_description_schema = Schema({
             # chunking-args = test-suite-suffix; "<CHUNK>" in this string will
             # be replaced with the chunk number.
             Optional('chunk-suffix'): basestring,
-
-            Required('requires-signed-builds', default=False): optionally_keyed_by(
-                'test-platform',
-                bool),
         }
     ),
 
@@ -273,10 +269,6 @@ test_description_schema = Schema({
     # the label of the build task generating the materials to test
     'build-label': basestring,
 
-    # the label of the signing task generating the materials to test.
-    # Signed builds are used in xpcshell tests on Windows, for instance.
-    Optional('build-signing-label'): basestring,
-
     # the build's attributes
     'build-attributes': {basestring: object},
 
@@ -395,7 +387,6 @@ def set_target(config, tests):
         else:
             target = 'target.tar.bz2'
         test['mozharness']['build-artifact-name'] = 'public/build/' + target
-
         yield test
 
 
@@ -501,7 +492,6 @@ def handle_keyed_by(config, tests):
         'mozharness.chunked',
         'mozharness.config',
         'mozharness.extra-options',
-        'mozharness.requires-signed-builds',
     ]
     for test in tests:
         for field in fields:
@@ -785,10 +775,6 @@ def make_job_description(config, tests):
         jobdesc['when'] = test.get('when', {})
         jobdesc['attributes'] = attributes
         jobdesc['dependencies'] = {'build': build_label}
-
-        if test['mozharness']['requires-signed-builds'] is True:
-            jobdesc['dependencies']['build-signing'] = test['build-signing-label']
-
         jobdesc['expires-after'] = test['expires-after']
         jobdesc['routes'] = []
         jobdesc['run-on-projects'] = test['run-on-projects']
diff --git a/taskcluster/taskgraph/util/attributes.py b/taskcluster/taskgraph/util/attributes.py
index 79f5e023af38..030709a19eeb 100644
--- a/taskcluster/taskgraph/util/attributes.py
+++ b/taskcluster/taskgraph/util/attributes.py
@@ -19,8 +19,6 @@ RELEASE_PROJECTS = {
     'mozilla-release',
 }
 
-_OPTIONAL_ATTRIBUTES = ('nightly', 'signed')
-
 
 def attrmatch(attributes, **kwargs):
     """Determine whether the given set of task attributes matches.  The
@@ -83,17 +81,3 @@ def match_run_on_projects(project, run_on_projects):
             return True
 
     return project in run_on_projects
-
-
-def copy_attributes_from_dependent_job(dep_job):
-    attributes = {
-        'build_platform': dep_job.attributes.get('build_platform'),
-        'build_type': dep_job.attributes.get('build_type'),
-    }
-
-    attributes.update({
-        attr: dep_job.attributes[attr]
-        for attr in _OPTIONAL_ATTRIBUTES if attr in dep_job.attributes
-    })
-
-    return attributes