--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -159,64 +159,16 @@ win64-dmd/opt:
         config:
             - builds/taskcluster_firefox_windows_64_opt.py
         custom-build-variant-cfg: dmd
     run-on-projects: [ ]
     toolchains:
         - win64-clang-cl
         - win64-sccache
 
-win32-devedition/opt:
-    description: "Win32 Dev Edition Opt"
-    index:
-        product: devedition
-        job-name: win32-devedition-opt
-    treeherder:
-        platform: windows2012-32-devedition/opt
-        symbol: tc(B)
-        tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
-    worker:
-        max-run-time: 7200
-        env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
-    run:
-        using: mozharness
-        script: mozharness/scripts/fx_desktop_build.py
-        config:
-            - builds/taskcluster_firefox_windows_32_opt.py
-    run-on-projects: ['mozilla-beta', ]
-    toolchains:
-        - win32-clang-cl
-        - win64-sccache
-
-win64-devedition/opt:
-    description: "Win64 Dev Edition Opt"
-    index:
-        product: devedition
-        job-name: win64-devedition-opt
-    treeherder:
-        platform: windows2012-64-devedition/opt
-        symbol: tc(B)
-        tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
-    worker:
-        max-run-time: 7200
-        env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
-    run:
-        using: mozharness
-        script: mozharness/scripts/fx_desktop_build.py
-        config:
-            - builds/taskcluster_firefox_windows_64_opt.py
-    run-on-projects: ['mozilla-beta', ]
-    toolchains:
-        - win64-clang-cl
-        - win64-sccache
-
 win32-nightly/opt:
     description: "Win32 Nightly"
     index:
         product: firefox
         job-name: win32-opt
         type: nightly
     attributes:
         nightly: true

--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -183,17 +183,17 @@ windows7-32-pgo/opt:
 windows7-32-nightly/opt:
     build-platform: win32-nightly/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - windows-tests
 
 windows7-32-devedition/opt:
-    build-platform: win32-devedition/opt
+    build-platform: win32-devedition-nightly/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - windows-tests
 
 # win64
 windows10-64/debug:
     build-platform: win64/debug
@@ -219,17 +219,17 @@ windows10-64-pgo/opt:
 windows10-64-nightly/opt:
     build-platform: win64-nightly/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - windows-tests
 
 windows10-64-devedition/opt:
-    build-platform: win64-devedition/opt
+    build-platform: win64-devedition-nightly/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - windows-tests
 
 windows10-64-asan/opt:
     build-platform: win64-asan/opt
     test-sets:
@@ -248,17 +248,17 @@ windows8-64-pgo/opt:
     build-platform: win64-pgo/opt
     test-sets:
         - windows8-tests
 windows8-64-nightly/opt:
     build-platform: win64-nightly/opt
     test-sets:
         - windows8-tests
 windows8-64-devedition/opt:
-    build-platform: win64-devedition/opt
+    build-platform: win64-devedition-nightly/opt
     test-sets:
         - windows8-tests
 
 ##
 # MacOS X platforms (matching /macosx.*/)
 
 macosx64/debug:
     build-platform: macosx64/debug