diff --git a/service-workers/service-worker/resources/imported-classic-script.js b/service-workers/service-worker/resources/imported-classic-script.js
new file mode 100644
index 00000000000000..5fc520405135e2
--- /dev/null
+++ b/service-workers/service-worker/resources/imported-classic-script.js
@@ -0,0 +1 @@
+const imported = 'A classic script.';
diff --git a/service-workers/service-worker/resources/imported-module-script.js b/service-workers/service-worker/resources/imported-module-script.js
new file mode 100644
index 00000000000000..56d196df040f9a
--- /dev/null
+++ b/service-workers/service-worker/resources/imported-module-script.js
@@ -0,0 +1 @@
+export const imported = 'A module script.';
diff --git a/service-workers/service-worker/resources/update-registration-with-type.py b/service-workers/service-worker/resources/update-registration-with-type.py
new file mode 100644
index 00000000000000..4f6d5ae28200e0
--- /dev/null
+++ b/service-workers/service-worker/resources/update-registration-with-type.py
@@ -0,0 +1,33 @@
+def classic_script():
+    return """
+      importScripts('./imported-classic-script.js');
+      self.onmessage = e => {
+        e.source.postMessage(imported);
+      };
+      """
+
+def module_script():
+    return """
+      import * as module from './imported-module-script.js';
+      self.onmessage = e => {
+        e.source.postMessage(module.imported);
+      };
+      """
+
+# Returns the classic script for a first request and
+# returns the module script for second and subsequent requests.
+def main(request, response):
+    headers = [('Content-Type', 'application/javascript'),
+               ('Pragma', 'no-store'),
+               ('Cache-Control', 'no-store')]
+
+    classic_first = request.GET['classic_first']
+    key = request.GET['key']
+    requested_once = request.server.stash.take(key)
+    if requested_once is None:
+        request.server.stash.put(key, True)
+        body = classic_script() if classic_first == '1' else module_script()
+    else:
+        body = module_script() if classic_first == '1' else classic_script()
+
+    return 200, headers, body
diff --git a/service-workers/service-worker/update-registration-with-type.https.html b/service-workers/service-worker/update-registration-with-type.https.html
new file mode 100644
index 00000000000000..00c8a3345bb3d8
--- /dev/null
+++ b/service-workers/service-worker/update-registration-with-type.https.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Service Worker: Update the registration with a different script type.</title>
+<!-- common.js is for guid() -->
+<script src="/mixed-content/generic/common.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/test-helpers.sub.js"></script>
+<script>
+// These tests check that a registration is updated correctly with
+// different script type. At first Service Worker is register as
+// classic script type, then it is re-registered as module script type,
+// and vice versa. A main script is also updated at the same time.
+promise_test(async t => {
+  const key = guid();
+  const script = `resources/update-registration-with-type.py?classic_first=1&key=${key}`;
+  const scope = 'resources/update-registration-with-type';
+  await service_worker_unregister(t, scope);
+
+  // Register with classic script type.
+  const firstRegistration = await navigator.serviceWorker.register(script, {
+    scope: scope,
+    type: 'classic'
+  });
+  firstRegistration.installing.postMessage(' ');
+  let msgEvent = await new Promise(resolve => {
+    navigator.serviceWorker.onmessage = resolve;
+  });
+  assert_equals(msgEvent.data, 'A classic script.');
+
+  // Re-register with module script type.
+  const secondRegistration = await navigator.serviceWorker.register(script, {
+    scope: scope,
+    type: 'module'
+  });
+  secondRegistration.installing.postMessage(' ');
+  msgEvent = await new Promise(resolve => {
+    navigator.serviceWorker.onmessage = resolve;
+  });
+  assert_equals(msgEvent.data, 'A module script.');
+  assert_equals(firstRegistration, secondRegistration);
+}, 'Update the registration with a different script type (classic => module).');
+
+promise_test(async t => {
+  const key = guid();
+  const script = `resources/update-registration-with-type.py?classic_first=0&key=${key}`;
+  const scope = 'resources/update-registration-with-type';
+  await service_worker_unregister(t, scope);
+
+  // Register with module script type.
+  const firstRegistration = await navigator.serviceWorker.register(script, {
+    scope: scope,
+    type: 'module'
+  });
+  firstRegistration.installing.postMessage(' ');
+  let msgEvent = await new Promise(resolve => {
+    navigator.serviceWorker.onmessage = resolve;
+  });
+  assert_equals(msgEvent.data, 'A module script.');
+
+  // Re-register with classic script type.
+  const secondRegistration = await navigator.serviceWorker.register(script, {
+    scope: scope,
+    type: 'classic'
+  });
+  secondRegistration.installing.postMessage(' ');
+  msgEvent = await new Promise(resolve => {
+    navigator.serviceWorker.onmessage = resolve;
+  });
+  assert_equals(msgEvent.data, 'A classic script.');
+  assert_equals(firstRegistration, secondRegistration);
+}, 'Update the registration with a different script type (module => classic).');
+</script>
+</body>
