diff --git a/service-workers/service-worker/registration-updateviacache.https.html b/service-workers/service-worker/registration-updateviacache.https.html
new file mode 100644
index 000000000000000..7cfe06ed568f1f7
--- /dev/null
+++ b/service-workers/service-worker/registration-updateviacache.https.html
@@ -0,0 +1,150 @@
+<!DOCTYPE html>
+<title>Service Worker: Registration-updateViaCache</title>
+<script src="/resources/testharness.js"></script>
+<script src="resources/testharness-helpers.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/test-helpers.sub.js"></script>
+<script>
+  const updateViaCacheValues = [undefined, 'imports', 'all', 'never'];
+  const scriptUrl = 'resources/update-max-aged-worker.py';
+  const scope = 'resources/blank.html';
+
+  async function cleanup() {
+    const reg = await navigator.serviceWorker.getRegistration(scope);
+    if (!reg) return;
+    if (reg.scope == new URL(scope, location).href) {
+      return reg.unregister()
+    };
+  }
+
+  function waitForActivated(sw) {
+    return new Promise((resolve, reject) => {
+      function check() {
+        if (sw.state == 'activated') {
+          sw.removeEventListener('statechange', check);
+          resolve();
+          return;
+        }
+        if (sw.state == 'redundant') {
+          sw.removeEventListener('statechange', check);
+          reject(Error('Service worker rejected'));
+          return;
+        }
+      }
+
+      sw.addEventListener('statechange', check);
+      check();
+    });
+  }
+
+  function getScriptTimes(sw, testName) {
+    return new Promise(resolve => {
+      navigator.serviceWorker.addEventListener('message', function listener(event) {
+        if (event.data.test !== testName) return;
+        navigator.serviceWorker.removeEventListener('message', listener);
+        resolve({
+          mainTime: event.data.mainTime,
+          importTime: event.data.importTime
+        });
+      });
+
+      sw.postMessage('');
+    });
+  }
+
+  // Testing updating registrations
+  for (const updateViaCache of updateViaCacheValues) {
+    const testName = `register-with-updateViaCache-${updateViaCache}`;
+
+    promise_test(async () => {
+      await cleanup();
+
+      const opts = {scope};
+
+      if (updateViaCache) opts.updateViaCache = updateViaCache;
+
+      const reg = await navigator.serviceWorker.register(
+        `${scriptUrl}?test=${testName}`,
+        opts
+      );
+
+      const sw = reg.installing;
+      await waitForActivated(sw);
+      const values = await getScriptTimes(sw, testName);
+      await reg.update();
+
+      if (updateViaCache == 'all') {
+        assert_equals(reg.installing, null, "No new service worker");
+      }
+      else {
+        const newWorker = reg.installing;
+        assert_true(!!newWorker, "New worker installing");
+        const newValues = await getScriptTimes(newWorker, testName);
+
+        if (!updateViaCache || updateViaCache == 'imports') {
+          assert_not_equals(values.mainTime, newValues.mainTime, "Main script should have updated");
+          assert_equals(values.importTime, newValues.importTime, "Imported script should be the same");
+        }
+        else { // 'never'
+          assert_not_equals(values.mainTime, newValues.mainTime, "Main script should have updated");
+          assert_not_equals(values.importTime, newValues.importTime, "Imported script should have updated");
+        }
+      }
+
+      await cleanup();
+    }, testName);
+  }
+
+  // Testing changing registration
+  for (const updateViaCache1 of updateViaCacheValues) {
+    for (const updateViaCache2 of updateViaCacheValues) {
+      const testName = `register-with-updateViaCache-${updateViaCache1}-then-${updateViaCache2}`;
+
+      promise_test(async () => {
+        await cleanup();
+
+        const fullScriptUrl = `${scriptUrl}?test=${testName}`;
+        let opts = {scope};
+        if (updateViaCache1) opts.updateViaCache = updateViaCache1;
+
+        const reg = await navigator.serviceWorker.register(fullScriptUrl, opts);
+
+        const sw = reg.installing;
+        await waitForActivated(sw);
+        const values = await getScriptTimes(sw, testName);
+
+        opts = {scope};
+        if (updateViaCache2) opts.updateViaCache = updateViaCache2;
+
+        await navigator.serviceWorker.register(fullScriptUrl, opts);
+
+        // If there's no change, register should be a no-op.
+        // The default value should behave as 'imports'.
+        if ((updateViaCache1 || 'imports') == (updateViaCache2 || 'imports')) {
+          assert_equals(reg.installing, null, "No new service worker");
+        }
+        else {
+          const newWorker = reg.installing;
+          assert_true(!!newWorker, "New worker installing");
+          const newValues = await getScriptTimes(newWorker, testName);
+
+          if (updateViaCache2 == 'all') {
+            assert_equals(values.mainTime, newValues.mainTime, "Main script should be the same");
+            assert_equals(values.importTime, newValues.importTime, "Imported script should be the same");
+          }
+          else if (updateViaCache2 == 'imports') {
+            assert_not_equals(values.mainTime, newValues.mainTime, "Main script should have updated");
+            assert_equals(values.importTime, newValues.importTime, "Imported script should be the same");
+          }
+          else { // 'never'
+            assert_not_equals(values.mainTime, newValues.mainTime, "Main script should have updated");
+            assert_not_equals(values.importTime, newValues.importTime, "Imported script should have updated");
+          }
+        }
+
+        await cleanup();
+      }, testName);
+    }
+  }
+
+</script>
diff --git a/service-workers/service-worker/registration-useCache.https.html b/service-workers/service-worker/registration-useCache.https.html
deleted file mode 100644
index 1976fa117d6c3c3..000000000000000
--- a/service-workers/service-worker/registration-useCache.https.html
+++ /dev/null
@@ -1,223 +0,0 @@
-<!DOCTYPE html>
-<title>Service Worker: Registration-useCache</title>
-<script src="/resources/testharness.js"></script>
-<script src="resources/testharness-helpers.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/test-helpers.sub.js"></script>
-<script>
-
-function registerFirstServiceWorker(test, script, scope, useCache) {
-    var swr, sw;
-
-    var setting = {scope: scope};
-    if (useCache !== undefined) {
-        setting['useCache'] = useCache;
-    }
-
-    return Promise.resolve()
-        .then(() => navigator.serviceWorker.register(script, setting))
-        .then(registration => swr = registration)
-
-        .then(() => wait_for_update(test, swr))
-        .then(worker => sw = worker)
-
-        .then(() => getMessageFromServiceWorker(sw, 'normal'))
-        .then(() => wait_for_state(test, sw, 'activated'))
-        .then(() => assert_true((!!swr.active &&
-                                 !swr.waiting &&
-                                 !swr.installing),
-                                ('The active SW should be the only SW. ' +
-                                 '(a: ' + !!swr.active +
-                                 ',w: ' + !swr.waiting +
-                                 ',i: ' + !swr.installing + ')')))
-        .then(() => swr);
-}
-
-function getMessageFromServiceWorker(sw, httpRequestType, oldValues) {
-    var mainResolveFunction, importedResolveFunction;
-    var promises = [
-        new Promise(function(resolve) {mainResolveFunction = resolve}),
-        new Promise(function(resolve) {importedResolveFunction = resolve})
-    ];
-
-    var messageChannel = new MessageChannel();
-    messageChannel.port1.onmessage = e => {
-        if (httpRequestType) {
-          assert_equals(e.data.type, httpRequestType,
-                        "HTTP request type check.");
-        }
-
-        var compareOldValue = (httpRequestType === 'revalidate') && oldValues;
-        switch(e.data.from) {
-            case 'main':
-                if (compareOldValue) {
-                    assert_not_equals(e.data.value, oldValues[0],
-                                      'Values shouldn\'t be the same');
-                }
-                mainResolveFunction(e.data.value);
-                break;
-            case 'imported':
-                if (compareOldValue) {
-                    assert_not_equals(e.data.value, oldValues[1],
-                                      'Values shouldn\'t be the same');
-                }
-                importedResolveFunction(e.data.value);
-                break;
-        }
-    };
-
-    sw.postMessage({port: messageChannel.port2}, [messageChannel.port2]);
-    return Promise.all(promises);
-}
-
-function testAction(test, registration, action, shouldCreateSW) {
-    var testFunction = shouldCreateSW ? testActionDoesCreateSW
-                                      : testActionDoesNotCreateSW;
-
-    return Promise.resolve()
-        .then(() => testFunction(registration, action, test))
-        .then(() => registration);
-}
-
-function testActionDoesCreateSW(registration, action, test) {
-    var oldValues;
-
-    return Promise.resolve()
-        .then(() => getMessageFromServiceWorker(registration.active))
-        .then(values => oldValues = values)
-
-        .then(() => action())
-        .then(() => wait_for_update(test, registration))
-        .then(worker => getMessageFromServiceWorker(worker,
-                                                    'revalidate',
-                                                    oldValues));
-}
-
-function testActionDoesNotCreateSW(registration, action) {
-    return Promise.resolve()
-        .then(() => action())
-        .then(() => assert_true((!!registration.active &&
-                                 !registration.waiting &&
-                                 !registration.installing),
-                                ('The active SW should still be the only SW. ' +
-                                 '(a: ' + !!registration.active +
-                                 ',w: ' + !registration.waiting +
-                                 ',i: ' + !registration.installing + ')')));
-}
-
-promise_test(function(t) {
-    var script = 'resources/update-max-aged-worker.py' +
-                 '?Test=Test_with_useCache_default';
-    var scope = 'resources/blank.html';
-
-    return Promise.resolve()
-        .then(() => registerFirstServiceWorker(t, script, scope))
-        .then(r => testAction(t, r, r.update.bind(r), true))
-
-        // Tear down
-        .then(() => service_worker_unregister_and_done(t, scope));
-}, 'Test with useCache: default');
-
-promise_test(function(t) {
-    var script = 'resources/update-max-aged-worker.py' +
-                 '?Test=Test_with_useCache_true';
-    var scope = 'resources/blank.html';
-
-    return Promise.resolve()
-        .then(() => registerFirstServiceWorker(t, script, scope, true))
-        .then(r => testAction(t, r, r.update.bind(r), false))
-
-        // Tear down
-        .then(() => service_worker_unregister_and_done(t, scope));
-}, 'Test with useCache: true');
-
-promise_test(function(t) {
-    var script = 'resources/update-max-aged-worker.py' +
-                 '?Test=Test_with_useCache_false';
-    var scope = 'resources/blank.html';
-
-    return Promise.resolve()
-        .then(() => registerFirstServiceWorker(t, script, scope, false))
-        .then(r => testAction(t, r, r.update.bind(r), true))
-
-        // Tear down
-        .then(() => service_worker_unregister_and_done(t, scope));
-  }, 'Test with useCache: false');
-
-promise_test(function(t) {
-    var script = 'resources/update-max-aged-worker.py' +
-                 '?Test=Consecutive_registrations_with_useCache_settings_false_false';
-    var scope = 'resources/blank.html';
-
-    return Promise.resolve()
-        .then(() => registerFirstServiceWorker(t, script, scope, false))
-        .then(r => {
-            var action = navigator.serviceWorker.register.bind(
-                navigator.serviceWorker, script, {scope: scope,
-                                                  useCache: false});
-            return testAction(t, r, action, false);
-        })
-
-        // Tear down
-        .then(() => service_worker_unregister_and_done(t, scope))
-}, "Consecutive registrations with useCache settings(false, false)");
-
-promise_test(function(t) {
-    var script = 'resources/update-max-aged-worker.py' +
-                 '?Test=Consecutive_registrations_with_useCache_settings_false_true';
-    var scope = 'resources/blank.html';
-
-    return Promise.resolve()
-        .then(() => registerFirstServiceWorker(t, script, scope, false))
-        .then(r => testAction(t, r, r.update.bind(r), true))
-        .then(r => {
-            var action = navigator.serviceWorker.register.bind(
-                navigator.serviceWorker, script, {scope: scope,
-                                                  useCache: true});
-            return testAction(t, r, action, false);
-        })
-        .then(r => testAction(t, r, r.update.bind(r), false))
-
-        // Tear down
-        .then(() => service_worker_unregister_and_done(t, scope))
-}, "Consecutive registrations with useCache settings(false, true)");
-
-promise_test(function(t) {
-    var script = 'resources/update-max-aged-worker.py' +
-                 '?Test=Consecutive_registrations_with_useCache_settings_true_false';
-    var scope = 'resources/blank.html';
-
-    return Promise.resolve()
-        .then(() => registerFirstServiceWorker(t, script, scope, true))
-        .then(r => testAction(t, r, r.update.bind(r), false))
-        .then(r => {
-            var action = navigator.serviceWorker.register.bind(
-                navigator.serviceWorker, script, {scope: scope,
-                                                  useCache: false});
-            return testAction(t, r, action, true);
-        })
-        .then(r => testAction(t, r, r.update.bind(r), true))
-
-        // Tear down
-        .then(() => service_worker_unregister_and_done(t, scope));
-}, "Consecutive registrations with useCache settings(true, false)");
-
-promise_test(function(t) {
-    var script = 'resources/update-max-aged-worker.py' +
-                 '?Test=Consecutive_registrations_with_useCache_settings_true_true';
-    var scope = 'resources/blank.html';
-
-    return Promise.resolve()
-        .then(() => registerFirstServiceWorker(t, script, scope, true))
-        .then(r => {
-            var action = navigator.serviceWorker.register.bind(
-                navigator.serviceWorker, script, {scope: scope,
-                                                  useCache: true});
-            return testAction(t, r, action, false);
-        })
-
-        // Tear down
-        .then(() => service_worker_unregister_and_done(t, scope))
-}, "Consecutive registrations with useCache settings(true, true)");
-
-</script>
diff --git a/service-workers/service-worker/resources/update-max-aged-worker-imported-script.py b/service-workers/service-worker/resources/update-max-aged-worker-imported-script.py
index e166143e2bb2b0e..3f7f88bafaac618 100644
--- a/service-workers/service-worker/resources/update-max-aged-worker-imported-script.py
+++ b/service-workers/service-worker/resources/update-max-aged-worker-imported-script.py
@@ -1,22 +1,12 @@
 import time
 
 def main(request, response):
-    headers = [('Cache-Control', 'max-age=86400'),
-               ('Content-Type', 'application/javascript'),
-               ('Last-Modified', time.strftime("%a, %d %b %Y %H:%M:%S GMT",
-                                               time.gmtime()))]
-
-
-    revalidate = request.headers.has_key('if-modified-since');
+    headers = [('Content-Type', 'application/javascript'),
+               ('Cache-Control', 'max-age=86400'),
+               ('Last-Modified', time.strftime("%a, %d %b %Y %H:%M:%S GMT", time.gmtime()))]
 
     body = '''
-    self.addEventListener('message', function(e) {
-        e.data.port.postMessage({
-            from: "imported",
-            type: "%s",
-            value: %s
-        });
-    });
-    ''' % ('revalidate' if revalidate else 'normal', time.time())
+        const importTime = {time};
+    '''.format(time=time.time())
 
     return headers, body
diff --git a/service-workers/service-worker/resources/update-max-aged-worker.py b/service-workers/service-worker/resources/update-max-aged-worker.py
index 6eb7c343a269e37..a9acf1b6de547c2 100644
--- a/service-workers/service-worker/resources/update-max-aged-worker.py
+++ b/service-workers/service-worker/resources/update-max-aged-worker.py
@@ -1,26 +1,28 @@
 import time
+import json
 
 def main(request, response):
     headers = [('Content-Type', 'application/javascript'),
                ('Cache-Control', 'max-age=86400'),
                ('Last-Modified', time.strftime("%a, %d %b %Y %H:%M:%S GMT", time.gmtime()))]
 
-    test = '';
-    if 'Test' in request.GET:
-      test = request.GET['Test'];
-
-    revalidate = request.headers.has_key('if-modified-since');
+    test = request.GET['test'];
 
     body = '''
-    importScripts('update-max-aged-worker-imported-script.py?Test=%s');
+        const mainTime = {time};
+        const testName = {test};
+        importScripts('update-max-aged-worker-imported-script.py');
 
-    self.addEventListener('message', function(e) {
-        e.data.port.postMessage({
-            from: "main",
-            type: "%s",
-            value: %s
-        });
-    });
-    ''' % (test, 'revalidate' if revalidate else 'normal', time.time())
+        addEventListener('message', event => {{
+            event.source.postMessage({{
+                mainTime,
+                importTime,
+                test: {test}
+            }});
+        }});
+    '''.format(
+        time=time.time(),
+        test=json.dumps(test)
+    )
 
     return headers, body
