diff --git a/packages/app/src/setupTests.ts b/packages/app/src/setupTests.ts
index 17ff0c096d..c717b2753b 100644
--- a/packages/app/src/setupTests.ts
+++ b/packages/app/src/setupTests.ts
@@ -18,4 +18,4 @@
 // allows you to do things like:
 // expect(element).toHaveTextContent(/react/i)
 // learn more: https://github.com/testing-library/jest-dom
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
diff --git a/packages/cli/templates/default-app/packages/app/src/setupTests.ts b/packages/cli/templates/default-app/packages/app/src/setupTests.ts
index 666127af39..7b0828bfa8 100644
--- a/packages/cli/templates/default-app/packages/app/src/setupTests.ts
+++ b/packages/cli/templates/default-app/packages/app/src/setupTests.ts
@@ -1 +1 @@
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
diff --git a/packages/cli/templates/default-app/plugins/welcome/src/setupTests.ts b/packages/cli/templates/default-app/plugins/welcome/src/setupTests.ts
index 666127af39..7b0828bfa8 100644
--- a/packages/cli/templates/default-app/plugins/welcome/src/setupTests.ts
+++ b/packages/cli/templates/default-app/plugins/welcome/src/setupTests.ts
@@ -1 +1 @@
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
diff --git a/packages/cli/templates/default-plugin/src/setupTests.ts b/packages/cli/templates/default-plugin/src/setupTests.ts
index 1a907ab8e6..e34bc46f4b 100644
--- a/packages/cli/templates/default-plugin/src/setupTests.ts
+++ b/packages/cli/templates/default-plugin/src/setupTests.ts
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 require('jest-fetch-mock').enableMocks();
diff --git a/packages/core/src/setupTests.ts b/packages/core/src/setupTests.ts
index 8925258421..825bcd4115 100644
--- a/packages/core/src/setupTests.ts
+++ b/packages/core/src/setupTests.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
diff --git a/packages/dev-utils/src/setupTests.ts b/packages/dev-utils/src/setupTests.ts
index 8925258421..825bcd4115 100644
--- a/packages/dev-utils/src/setupTests.ts
+++ b/packages/dev-utils/src/setupTests.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
diff --git a/packages/test-utils-core/src/setupTests.ts b/packages/test-utils-core/src/setupTests.ts
index 8925258421..825bcd4115 100644
--- a/packages/test-utils-core/src/setupTests.ts
+++ b/packages/test-utils-core/src/setupTests.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
diff --git a/packages/test-utils/src/setupTests.ts b/packages/test-utils/src/setupTests.ts
index 8925258421..825bcd4115 100644
--- a/packages/test-utils/src/setupTests.ts
+++ b/packages/test-utils/src/setupTests.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
diff --git a/plugins/catalog/src/setupTests.ts b/plugins/catalog/src/setupTests.ts
index 1a907ab8e6..e34bc46f4b 100644
--- a/plugins/catalog/src/setupTests.ts
+++ b/plugins/catalog/src/setupTests.ts
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 require('jest-fetch-mock').enableMocks();
diff --git a/plugins/explore/src/setupTests.ts b/plugins/explore/src/setupTests.ts
index 1a907ab8e6..e34bc46f4b 100644
--- a/plugins/explore/src/setupTests.ts
+++ b/plugins/explore/src/setupTests.ts
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 require('jest-fetch-mock').enableMocks();
diff --git a/plugins/graphiql/src/setupTests.ts b/plugins/graphiql/src/setupTests.ts
index 1a907ab8e6..e34bc46f4b 100644
--- a/plugins/graphiql/src/setupTests.ts
+++ b/plugins/graphiql/src/setupTests.ts
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 require('jest-fetch-mock').enableMocks();
diff --git a/plugins/home-page/src/setupTests.ts b/plugins/home-page/src/setupTests.ts
index 8925258421..825bcd4115 100644
--- a/plugins/home-page/src/setupTests.ts
+++ b/plugins/home-page/src/setupTests.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
diff --git a/plugins/lighthouse/src/setupTests.ts b/plugins/lighthouse/src/setupTests.ts
index 1a907ab8e6..e34bc46f4b 100644
--- a/plugins/lighthouse/src/setupTests.ts
+++ b/plugins/lighthouse/src/setupTests.ts
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 require('jest-fetch-mock').enableMocks();
diff --git a/plugins/register-component/src/setupTests.ts b/plugins/register-component/src/setupTests.ts
index 1a907ab8e6..e34bc46f4b 100644
--- a/plugins/register-component/src/setupTests.ts
+++ b/plugins/register-component/src/setupTests.ts
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 require('jest-fetch-mock').enableMocks();
diff --git a/plugins/scaffolder/src/setupTests.ts b/plugins/scaffolder/src/setupTests.ts
index 1a907ab8e6..e34bc46f4b 100644
--- a/plugins/scaffolder/src/setupTests.ts
+++ b/plugins/scaffolder/src/setupTests.ts
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 require('jest-fetch-mock').enableMocks();
diff --git a/plugins/tech-radar/src/setupTests.ts b/plugins/tech-radar/src/setupTests.ts
index 1a907ab8e6..e34bc46f4b 100644
--- a/plugins/tech-radar/src/setupTests.ts
+++ b/plugins/tech-radar/src/setupTests.ts
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 require('jest-fetch-mock').enableMocks();
diff --git a/plugins/welcome/src/setupTests.ts b/plugins/welcome/src/setupTests.ts
index 8925258421..825bcd4115 100644
--- a/plugins/welcome/src/setupTests.ts
+++ b/plugins/welcome/src/setupTests.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';