--- a/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_persist_connection.js
+++ b/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_persist_connection.js
@@ -59,13 +59,14 @@ async function testRemoteClientPersistCo
 
   // Remove the runtime without emitting an update.
   // This is what happens today when we simply close Firefox for Android.
   info("Remove the runtime from the list of remote runtimes");
   mocks.removeRuntime(id);
 
   info("Emit 'closed' on the client and wait for the sidebar item to disappear");
   client._eventEmitter.emit("closed");
-  await waitUntil(() => !findSidebarItemByText(sidebarName, document));
+  await waitUntil(() => !findSidebarItemByText(sidebarName, document) &&
+                      !findSidebarItemByText(runtimeName, document));
 
   info("Remove the tab");
   await removeTab(tab);
 }

--- a/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_telemetry_runtime_updates_multi.js
+++ b/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_telemetry_runtime_updates_multi.js
@@ -72,18 +72,20 @@ add_task(async function() {
     { method: "runtime_added", extras: RUNTIME_1_EXTRAS },
     { method: "runtime_added", extras: RUNTIME_2_EXTRAS },
   ], sessionId);
 
   info("Remove both runtimes at once to simulate a device disconnection");
   mocks.removeRuntime(USB_RUNTIME_1.id);
   mocks.removeRuntime(USB_RUNTIME_2.id);
   mocks.emitUSBUpdate();
-  await waitUntil(() => !findSidebarItemByText(USB_RUNTIME_1.shortName, document));
-  await waitUntil(() => !findSidebarItemByText(USB_RUNTIME_2.shortName, document));
+  await waitUntil(() => !findSidebarItemByText(USB_RUNTIME_1.name, document) &&
+                        !findSidebarItemByText(USB_RUNTIME_1.shortName, document));
+  await waitUntil(() => !findSidebarItemByText(USB_RUNTIME_2.name, document) &&
+                        !findSidebarItemByText(USB_RUNTIME_2.shortName, document));
 
   checkTelemetryEvents([
     { method: "runtime_removed", extras: RUNTIME_1_EXTRAS },
     { method: "runtime_removed", extras: RUNTIME_2_EXTRAS },
     { method: "device_removed", extras: DEVICE_A_EXTRAS },
   ], sessionId);
 
   await removeTab(tab);