diff --git a/jest.config.base.js b/jest.config.base.js
index 75cb1e9a2d..8d189c3746 100644
--- a/jest.config.base.js
+++ b/jest.config.base.js
@@ -43,7 +43,6 @@ module.exports = {
             },
         ],
     ],
-    resolver: `${__dirname}/src/tests/common/resolver.js`,
     setupFilesAfterEnv: [`${__dirname}/src/tests/common/flush-promises-after-each-test.ts`],
     snapshotSerializers: [`${__dirname}/src/tests/common/typemoq-snapshot-serializer.ts`],
     testEnvironment: 'node',
diff --git a/package.json b/package.json
index 41b7455081..fe00224552 100644
--- a/package.json
+++ b/package.json
@@ -208,7 +208,7 @@
         "react-router-dom": "^6.3.0",
         "tabbable": "^6.0.0",
         "ua-parser-js": "^1.0.2",
-        "uuid": "^8.3.2",
+        "uuid": "^9.0.0",
         "webextension-polyfill": "^0.10.0"
     },
     "resolutions": {
diff --git a/packages/report/package.json b/packages/report/package.json
index d45909d0ef..169b8a3abd 100644
--- a/packages/report/package.json
+++ b/packages/report/package.json
@@ -26,6 +26,6 @@
         "react": "^16.14.0",
         "react-dom": "^16.14.0",
         "react-helmet": "^6.1.0",
-        "uuid": "^8.3.2"
+        "uuid": "^9.0.0"
     }
 }
diff --git a/packages/ui/package.json b/packages/ui/package.json
index e849f5f024..fe28057dcd 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -26,6 +26,6 @@
         "react-dom": "^16.14.0",
         "react-helmet": "^6.1.0",
         "react-resize-detector": "^7.1.2",
-        "uuid": "^8.3.2"
+        "uuid": "^9.0.0"
     }
 }
diff --git a/src/tests/common/resolver.js b/src/tests/common/resolver.js
deleted file mode 100644
index 825e7bc2d5..0000000000
--- a/src/tests/common/resolver.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-module.exports = (path, options) => {
-    // Call the defaultResolver, so we leverage its cache, error handling, etc.
-    return options.defaultResolver(path, {
-        ...options,
-        // Use packageFilter to process parsed `package.json` before the resolution (see https://www.npmjs.com/package/resolve#resolveid-opts-cb)
-        packageFilter: pkg => {
-            // This is a workaround for https://github.com/uuidjs/uuid/pull/616
-            //
-            // jest-environment-jsdom 28+ tries to use browser exports instead of default exports,
-            // but uuid only offers an ESM browser export and not a CommonJS one. Jest does not yet
-            // support ESM modules natively, so this causes a Jest error related to trying to parse
-            // "export" syntax.
-            //
-            // This workaround prevents Jest from considering uuid's module-based exports at all;
-            // it falls back to uuid's CommonJS+node "main" property.
-            //
-            // Once we're able to migrate our Jest config to ESM and a browser crypto
-            // implementation is available for the browser+ESM version of uuid to use (eg, via
-            // https://github.com/jsdom/jsdom/pull/3352 or a similar polyfill), this can go away.
-            if (pkg.name === 'uuid') {
-                delete pkg['exports'];
-                delete pkg['module'];
-            }
-            return pkg;
-        },
-    });
-};
diff --git a/yarn.lock b/yarn.lock
index 76196262c2..7c92c27d95 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13080,6 +13080,11 @@ uuid@8.3.2, uuid@^8.0.0, uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+uuid@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
+  integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
+
 v8-compile-cache@2.3.0, v8-compile-cache@^2.0.3, v8-compile-cache@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"