--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -342083,26 +342083,26 @@
     ]
    ],
    "encoding/idlharness.any.js": [
     [
      "/encoding/idlharness.any.html",
      {}
     ],
     [
+     "/encoding/idlharness.any.serviceworker.html",
+     {}
+    ],
+    [
      "/encoding/idlharness.any.sharedworker.html",
      {}
     ],
     [
      "/encoding/idlharness.any.worker.html",
      {}
-    ],
-    [
-     "/encoding/idlharness.https.any.serviceworker.html",
-     {}
     ]
    ],
    "encoding/iso-2022-jp-decoder.any.js": [
     [
      "/encoding/iso-2022-jp-decoder.any.html",
      {}
     ],
     [
@@ -350865,26 +350865,26 @@
     ]
    ],
    "fetch/api/abort/general.any.js": [
     [
      "/fetch/api/abort/general.any.html",
      {}
     ],
     [
+     "/fetch/api/abort/general.any.serviceworker.html",
+     {}
+    ],
+    [
      "/fetch/api/abort/general.any.sharedworker.html",
      {}
     ],
     [
      "/fetch/api/abort/general.any.worker.html",
      {}
-    ],
-    [
-     "/fetch/api/abort/general.https.any.serviceworker.html",
-     {}
     ]
    ],
    "fetch/api/abort/keepalive.html": [
     [
      "/fetch/api/abort/keepalive.html",
      {}
     ]
    ],
@@ -352623,26 +352623,26 @@
     ]
    ],
    "hr-time/idlharness.any.js": [
     [
      "/hr-time/idlharness.any.html",
      {}
     ],
     [
+     "/hr-time/idlharness.any.serviceworker.html",
+     {}
+    ],
+    [
      "/hr-time/idlharness.any.sharedworker.html",
      {}
     ],
     [
      "/hr-time/idlharness.any.worker.html",
      {}
-    ],
-    [
-     "/hr-time/idlharness.https.any.serviceworker.html",
-     {}
     ]
    ],
    "hr-time/monotonic-clock.any.js": [
     [
      "/hr-time/monotonic-clock.any.html",
      {}
     ],
     [
@@ -365051,44 +365051,44 @@
     ]
    ],
    "html/webappapis/microtask-queuing/queue-microtask-exceptions.any.js": [
     [
      "/html/webappapis/microtask-queuing/queue-microtask-exceptions.any.html",
      {}
     ],
     [
+     "/html/webappapis/microtask-queuing/queue-microtask-exceptions.any.serviceworker.html",
+     {}
+    ],
+    [
      "/html/webappapis/microtask-queuing/queue-microtask-exceptions.any.sharedworker.html",
      {}
     ],
     [
      "/html/webappapis/microtask-queuing/queue-microtask-exceptions.any.worker.html",
      {}
-    ],
-    [
-     "/html/webappapis/microtask-queuing/queue-microtask-exceptions.https.any.serviceworker.html",
-     {}
     ]
    ],
    "html/webappapis/microtask-queuing/queue-microtask.any.js": [
     [
      "/html/webappapis/microtask-queuing/queue-microtask.any.html",
      {}
     ],
     [
+     "/html/webappapis/microtask-queuing/queue-microtask.any.serviceworker.html",
+     {}
+    ],
+    [
      "/html/webappapis/microtask-queuing/queue-microtask.any.sharedworker.html",
      {}
     ],
     [
      "/html/webappapis/microtask-queuing/queue-microtask.any.worker.html",
      {}
-    ],
-    [
-     "/html/webappapis/microtask-queuing/queue-microtask.https.any.serviceworker.html",
-     {}
     ]
    ],
    "html/webappapis/microtask-queuing/queue-microtask.window.js": [
     [
      "/html/webappapis/microtask-queuing/queue-microtask.window.html",
      {}
     ]
    ],
@@ -388821,26 +388821,26 @@
     ]
    ],
    "secure-contexts/idlharness.any.js": [
     [
      "/secure-contexts/idlharness.any.html",
      {}
     ],
     [
+     "/secure-contexts/idlharness.any.serviceworker.html",
+     {}
+    ],
+    [
      "/secure-contexts/idlharness.any.sharedworker.html",
      {}
     ],
     [
      "/secure-contexts/idlharness.any.worker.html",
      {}
-    ],
-    [
-     "/secure-contexts/idlharness.https.any.serviceworker.html",
-     {}
     ]
    ],
    "secure-contexts/shared-worker-insecure-first.https.html": [
     [
      "/secure-contexts/shared-worker-insecure-first.https.html",
      {}
     ]
    ],
@@ -397977,26 +397977,26 @@
     ]
    ],
    "websockets/basic-auth.any.js": [
     [
      "/websockets/basic-auth.any.html",
      {}
     ],
     [
+     "/websockets/basic-auth.any.serviceworker.html",
+     {}
+    ],
+    [
      "/websockets/basic-auth.any.sharedworker.html",
      {}
     ],
     [
      "/websockets/basic-auth.any.worker.html",
      {}
-    ],
-    [
-     "/websockets/basic-auth.https.any.serviceworker.html",
-     {}
     ]
    ],
    "websockets/binary/001.html": [
     [
      "/websockets/binary/001.html",
      {}
     ],
     [
@@ -638759,17 +638759,17 @@
    "61919fcc31e9c7afa8c1d5733a2723fc41bd326d",
    "support"
   ],
   "tools/manifest/log.py": [
    "55ff6e87c9dc003e284b0ce9c330a9e54963a132",
    "support"
   ],
   "tools/manifest/manifest.py": [
-   "02250e8300fb0136b882df5d51eabe7dd6f87778",
+   "42a8e1ceb23693a3e139cf6129bc82327b765182",
    "support"
   ],
   "tools/manifest/sourcefile.py": [
    "133f8b59828dafd016df95429fe5286562b4733c",
    "support"
   ],
   "tools/manifest/tests/__init__.py": [
    "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
@@ -638779,17 +638779,17 @@
    "fc130b7a21f4f89f152d50ab1d34644b86284815",
    "support"
   ],
   "tools/manifest/tests/test_item.py": [
    "9f798747bd4ed5e972a11b232480fca16728f25d",
    "support"
   ],
   "tools/manifest/tests/test_manifest.py": [
-   "e0a2c828a770f7c6897c18ccb8116057de04c8ef",
+   "017513ae01ae92d7f4807d77358849c142a182a3",
    "support"
   ],
   "tools/manifest/tests/test_sourcefile.py": [
    "57a175cae913a273c6ba4ebbcc13dd47571e4970",
    "support"
   ],
   "tools/manifest/update.py": [
    "29c80105735d4ea0edc3fa566ee5e68996d824d7",
@@ -656956,10 +656956,10 @@
    "testharness"
   ],
   "xhr/xmlhttprequest-unsent.htm": [
    "eb52d63eef971895f69f1b0151baa457250dd452",
    "testharness"
   ]
  },
  "url_base": "/",
- "version": 4
+ "version": 5
 }

--- a/testing/web-platform/tests/tools/manifest/manifest.py
+++ b/testing/web-platform/tests/tools/manifest/manifest.py
@@ -4,17 +4,17 @@ import os
 from collections import defaultdict
 from six import iteritems, itervalues, viewkeys, string_types
 
 from .item import ManualTest, WebdriverSpecTest, Stub, RefTestNode, RefTest, TestharnessTest, SupportFile, ConformanceCheckerTest, VisualTest
 from .log import get_logger
 from .utils import from_os_path, to_os_path
 
 
-CURRENT_VERSION = 4
+CURRENT_VERSION = 5
 
 
 class ManifestError(Exception):
     pass
 
 
 class ManifestVersionMismatch(ManifestError):
     pass

--- a/testing/web-platform/tests/tools/manifest/tests/test_manifest.py
+++ b/testing/web-platform/tests/tools/manifest/tests/test_manifest.py
@@ -106,17 +106,17 @@ def test_manifest_to_json_forwardslash()
     s = SourceFileWithTest("a/b", "0"*40, item.TestharnessTest)
 
     assert m.update([s]) is True
 
     assert m.to_json() == {
         'paths': {
             'a/b': ('0000000000000000000000000000000000000000', 'testharness')
         },
-        'version': 4,
+        'version': 5,
         'url_base': '/',
         'items': {
             'reftest': {},
             'reftest_node': {},
             'testharness': {
                 'a/b': [['/a/b', {}]]
             }
         }
@@ -130,17 +130,17 @@ def test_manifest_to_json_backslash():
 
     if os.path.sep == "\\":
         assert m.update([s]) is True
 
         assert m.to_json() == {
             'paths': {
                 'a/b': ('0000000000000000000000000000000000000000', 'testharness')
             },
-            'version': 4,
+            'version': 5,
             'url_base': '/',
             'items': {
                 'reftest': {},
                 'reftest_node': {},
                 'testharness': {
                     'a/b': [['/a/b', {}]]
                 }
             }
@@ -153,17 +153,17 @@ def test_manifest_to_json_backslash():
             m.to_json()
 
 
 def test_manifest_from_json_backslash():
     json_obj = {
         'paths': {
             'a\\b': ('0000000000000000000000000000000000000000', 'testharness')
         },
-        'version': 4,
+        'version': 5,
         'url_base': '/',
         'items': {
             'reftest': {},
             'reftest_node': {},
             'testharness': {
                 'a\\b': [['/a/b', {}]]
             }
         }