diff --git a/desktop/app/package.json b/desktop/app/package.json
index 4ab74582c..e67d79352 100644
--- a/desktop/app/package.json
+++ b/desktop/app/package.json
@@ -68,7 +68,8 @@
     "7zip-bin-mac": "^1.0.1"
   },
   "devDependencies": {
-    "@testing-library/react": "^10.0.2",
+    "@testing-library/react": "^10.4.3",
+    "@testing-library/dom": "^7.20.2",
     "flipper-test-utils": "0.50.0",
     "metro": "^0.60.0",
     "mock-fs": "^4.12.0",
diff --git a/desktop/app/src/test-utils/createMockFlipperWithPlugin.tsx b/desktop/app/src/test-utils/createMockFlipperWithPlugin.tsx
index 2d67f36f9..69d222c78 100644
--- a/desktop/app/src/test-utils/createMockFlipperWithPlugin.tsx
+++ b/desktop/app/src/test-utils/createMockFlipperWithPlugin.tsx
@@ -15,6 +15,7 @@ import {
   RenderResult,
   act as testingLibAct,
 } from '@testing-library/react';
+import {queries} from '@testing-library/dom';
 
 import {
   selectPlugin,
@@ -202,7 +203,7 @@ export async function createMockFlipperWithPlugin(
   };
 }
 
-type Renderer = RenderResult<typeof import('testing-library__dom/queries')>;
+type Renderer = RenderResult<typeof queries>;
 
 export async function renderMockFlipperWithPlugin(
   pluginClazz: PluginDefinition,
diff --git a/desktop/app/src/ui/components/data-inspector/__tests__/DataInspector.node.tsx b/desktop/app/src/ui/components/data-inspector/__tests__/DataInspector.node.tsx
index 708daea86..dd13e4406 100644
--- a/desktop/app/src/ui/components/data-inspector/__tests__/DataInspector.node.tsx
+++ b/desktop/app/src/ui/components/data-inspector/__tests__/DataInspector.node.tsx
@@ -67,7 +67,7 @@ test('changing collapsed property works', async () => {
   res.rerender(
     <ManagedDataInspector data={json} collapsed={false} expandRoot />,
   );
-  await waitForElement(() => res.findByText(/cool/));
+  await res.findByText(/cool/);
 
   res.rerender(
     <ManagedDataInspector data={json} collapsed={true} expandRoot />,
diff --git a/desktop/flipper-plugin/package.json b/desktop/flipper-plugin/package.json
index 857d8335c..234e8ca3e 100644
--- a/desktop/flipper-plugin/package.json
+++ b/desktop/flipper-plugin/package.json
@@ -9,6 +9,7 @@
   "license": "MIT",
   "bugs": "https://github.com/facebook/flipper/issues",
   "dependencies": {
+    "@testing-library/dom": "^7.20.2",
     "@testing-library/react": "^10.4.3",
     "immer": "^7.0.5"
   },
diff --git a/desktop/flipper-plugin/src/test-utils/test-utils.tsx b/desktop/flipper-plugin/src/test-utils/test-utils.tsx
index 990cb295e..51b13afc0 100644
--- a/desktop/flipper-plugin/src/test-utils/test-utils.tsx
+++ b/desktop/flipper-plugin/src/test-utils/test-utils.tsx
@@ -13,6 +13,7 @@ import {
   RenderResult,
   act as testingLibAct,
 } from '@testing-library/react';
+import {queries} from '@testing-library/dom';
 import {PluginDetails} from 'flipper-plugin-lib';
 
 import {
@@ -27,7 +28,7 @@ import {
 import {SandyPluginRenderer} from '../plugin/PluginRenderer';
 import {act} from '@testing-library/react';
 
-type Renderer = RenderResult<typeof import('testing-library__dom/queries')>;
+type Renderer = RenderResult<typeof queries>;
 
 interface StartPluginOptions {
   // TODO: support initial events T68683442 (and type correctly)
diff --git a/desktop/package.json b/desktop/package.json
index a50e34fb8..24ee1ce92 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -108,7 +108,8 @@
   "devDependencies": {
     "@babel/code-frame": "^7.10.4",
     "@jest-runner/electron": "^3.0.0",
-    "@testing-library/react": "^10.0.2",
+    "@testing-library/react": "^10.4.3",
+    "@testing-library/dom": "^7.20.2",
     "@types/algoliasearch": "^3.30.19",
     "@types/babel__code-frame": "^7.0.0",
     "@types/babel__core": "^7.1.6",
@@ -148,7 +149,7 @@
     "@types/rsocket-core": "^0.0.5",
     "@types/rsocket-tcp-server": "^0.0.2",
     "@types/socket.io": "^2.1.4",
-    "@types/testing-library__react": "^10.0.0",
+    "@types/testing-library__react": "^10.2.0",
     "@types/tmp": "^0.2.0",
     "@types/uuid": "^8.0.0",
     "@types/which": "^1.3.2",
@@ -257,6 +258,5 @@
   },
   "optionalDependencies": {
     "7zip-bin-mac": "^1.0.1"
-  },
-  "dependencies": {}
+  }
 }
diff --git a/desktop/plugins/databases/package.json b/desktop/plugins/databases/package.json
index dd2f7f1cb..43cd8f355 100644
--- a/desktop/plugins/databases/package.json
+++ b/desktop/plugins/databases/package.json
@@ -18,7 +18,7 @@
   "devDependencies": {
     "@types/dateformat": "^3.0.1",
     "@types/sql-formatter": "^2.3.0",
-    "@testing-library/react": "^10.0.2",
+    "@testing-library/react": "^10.4.3",
     "redux-mock-store": "^1.0.1",
     "react-redux": "^7.1.1"
   },
diff --git a/desktop/plugins/layout/package.json b/desktop/plugins/layout/package.json
index f06248c93..e358bd27a 100644
--- a/desktop/plugins/layout/package.json
+++ b/desktop/plugins/layout/package.json
@@ -14,7 +14,7 @@
     "lodash": "^4.17.15"
   },
   "devDependencies": {
-    "@testing-library/react": "^10.0.2"
+    "@testing-library/react": "^10.4.3"
   },
   "title": "Layout",
   "icon": "target",
diff --git a/desktop/yarn.lock b/desktop/yarn.lock
index d6608796c..1cff89939 100644
--- a/desktop/yarn.lock
+++ b/desktop/yarn.lock
@@ -1786,20 +1786,21 @@
   dependencies:
     defer-to-connect "^1.0.1"
 
-"@testing-library/dom@^7.17.1":
-  version "7.18.1"
-  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.18.1.tgz#c49530410fb184522b3b59c4f9cd6397dc5b462d"
-  integrity sha512-tGq4KAFjaI7j375sMM1RRVleWA0viJWs/w69B+nyDkqYLNkhdTHdV6mGkspJlkn3PUfyBDi3rERDv4PA/LrpVA==
+"@testing-library/dom@^7.17.1", "@testing-library/dom@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.20.2.tgz#d598265248a6e16a2fe0aff6b96b858ca5f1a71b"
+  integrity sha512-9KOD0fFCTVFsT1EgB8C5qKs1nV7KdIGe0YIANAKeIDWWC0vwkiLXA/8HlrM2+w7YXiRXIeeHh0LxTYQpvaoGgA==
   dependencies:
     "@babel/runtime" "^7.10.3"
+    "@types/aria-query" "^4.2.0"
     aria-query "^4.2.2"
-    dom-accessibility-api "^0.4.5"
+    dom-accessibility-api "^0.4.6"
     pretty-format "^25.5.0"
 
-"@testing-library/react@^10.0.2", "@testing-library/react@^10.4.3":
-  version "10.4.3"
-  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-10.4.3.tgz#c6f356688cffc51f6b35385583d664bb11a161f4"
-  integrity sha512-A/ydYXcwAcfY7vkPrfUkUTf9HQLL3/GtixTefcu3OyGQtAYQ7XBQj1S9FWbLEhfWa0BLwFwTBFS3Ao1O0tbMJg==
+"@testing-library/react@*", "@testing-library/react@^10.4.3":
+  version "10.4.6"
+  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-10.4.6.tgz#70a7cac35ac8256c22a8cb0c4779e0efefd218c6"
+  integrity sha512-pVcm8v0HxCEzrtasbC2bdhWM0P5X9o8a/xfBugC97uVVTmhVeGHj+5CdE1JYi/i2K+mCyeq5YqzHLW/gB+K12w==
   dependencies:
     "@babel/runtime" "^7.10.3"
     "@testing-library/dom" "^7.17.1"
@@ -1809,6 +1810,11 @@
   resolved "https://registry.yarnpkg.com/@types/algoliasearch/-/algoliasearch-3.34.5.tgz#c40e346a6c5526f9b27af7863117d1200456e7d2"
   integrity sha512-JS+5KT9SfwzGIkoCsj7EyYHzhrsagj321BEPH3oroHYnuKUfPVoei58qLsBPo9RRa27Vb79WJssSSPBicnaAng==
 
+"@types/aria-query@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.0.tgz#14264692a9d6e2fa4db3df5e56e94b5e25647ac0"
+  integrity sha512-iIgQNzCm0v7QMhhe4Jjn9uRh+I6GoPmt03CbEtwx3ao8/EfoQcmgtqH4vQ5Db/lxiIGaWDv6nwvunuh0RyX0+A==
+
 "@types/babel__code-frame@^7.0.0":
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/@types/babel__code-frame/-/babel__code-frame-7.0.1.tgz#baf2529c4abbfb5e4008c845efcfe39a187e2f99"
@@ -2152,7 +2158,7 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-dom@*", "@types/react-dom@16.9.4", "@types/react-dom@^16.9.4":
+"@types/react-dom@16.9.4", "@types/react-dom@^16.9.4":
   version "16.9.4"
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.4.tgz#0b58df09a60961dcb77f62d4f1832427513420df"
   integrity sha512-fya9xteU/n90tda0s+FtN5Ym4tbgxpq/hb/Af24dvs6uYnYn+fspaxw5USlw0R8apDNwxsqumdRoCoKitckQqw==
@@ -2339,21 +2345,12 @@
     "@types/minipass" "*"
     "@types/node" "*"
 
-"@types/testing-library__dom@*":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@types/testing-library__dom/-/testing-library__dom-7.0.0.tgz#c0fb7d1c2495a3d26f19342102142d47500f0319"
-  integrity sha512-1TEPWyqQ6IQ7R1hCegZmFSA3KrBQjdzJW7yC9ybpRcFst5XuPOqBGNr0mTAKbxwI/TrTyc1skeyLJrpcvAf93w==
+"@types/testing-library__react@^10.2.0":
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/@types/testing-library__react/-/testing-library__react-10.2.0.tgz#8234be1248ce6728b33922507cfe1224886ede8e"
+  integrity sha512-KbU7qVfEwml8G5KFxM+xEfentAAVj/SOQSjW0+HqzjPE0cXpt0IpSamfX4jGYCImznDHgQcfXBPajS7HjLZduw==
   dependencies:
-    pretty-format "^25.1.0"
-
-"@types/testing-library__react@^10.0.0":
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/@types/testing-library__react/-/testing-library__react-10.0.0.tgz#8413a47f435bf7ce50bbc1b6d119300d39aed5bd"
-  integrity sha512-aByqRiRn9psCWbgW7a+gfW/LUQY/ChznnuPyWwLipcJm+rXaLNeYM4qL21jWPGn9W1H//oXgLE9aDlpkZSY3CQ==
-  dependencies:
-    "@types/react-dom" "*"
-    "@types/testing-library__dom" "*"
-    pretty-format "^25.1.0"
+    "@testing-library/react" "*"
 
 "@types/through@*":
   version "0.0.30"
@@ -4539,10 +4536,10 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
-dom-accessibility-api@^0.4.5:
-  version "0.4.5"
-  resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.4.5.tgz#d9c1cefa89f509d8cf132ab5d250004d755e76e3"
-  integrity sha512-HcPDilI95nKztbVikaN2vzwvmv0sE8Y2ZJFODy/m15n7mGXLeOKGiys9qWVbFbh+aq/KYj2lqMLybBOkYAEXqg==
+dom-accessibility-api@^0.4.6:
+  version "0.4.6"
+  resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.4.6.tgz#f3f2af68aee01b1c862f37918d41841bb1aaf92a"
+  integrity sha512-qxFVFR/ymtfamEQT/AsYLe048sitxFCoCHiM+vuOdR3fE94i3so2SCFJxyz/RxV69PZ+9FgToYWOd7eqJqcbYw==
 
 dom-helpers@^3.2.0, dom-helpers@^3.4.0:
   version "3.4.0"
@@ -9457,7 +9454,7 @@ prettier@^2.0.0:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.0.tgz#9c8fdba0aeae3faf0d9d9391623ac4f9321a4455"
   integrity sha512-vI55PC+GFLOVtpwr2di1mYhJF36v+kztJov8sx3AmqbfdA+2Dhozxb+3e1hTgoV9lyhnVJFF3Z8GCVeMBOS1bA==
 
-pretty-format@^25.1.0, pretty-format@^25.2.1, pretty-format@^25.5.0:
+pretty-format@^25.2.1, pretty-format@^25.5.0:
   version "25.5.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz#7873c1d774f682c34b8d48b6743a2bf2ac55791a"
   integrity sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==