diff --git a/dwds/test/devtools_test.dart b/dwds/test/devtools_test.dart
index 2dfa86f5a..961cae076 100644
--- a/dwds/test/devtools_test.dart
+++ b/dwds/test/devtools_test.dart
@@ -95,7 +95,7 @@ void main() {
       final devToolsWindow =
           windows.firstWhere((window) => window != newAppWindow);
       await devToolsWindow.setAsActive();
-      expect(await context.webDriver.title, equals('Dart DevTools'));
+      expect(await context.webDriver.pageSource, contains('DevTools'));
     });
 
     test(
diff --git a/dwds/test/events_test.dart b/dwds/test/events_test.dart
index e8ddd4351..13e38c840 100644
--- a/dwds/test/events_test.dart
+++ b/dwds/test/events_test.dart
@@ -143,21 +143,25 @@ void main() {
         await context.tearDown();
       });
 
-      test('emits DEBUGGER_READY and DEVTOOLS_LOAD events', () async {
-        await expectEventsDuring(
-          [
-            matchesEvent(DwdsEventKind.debuggerReady, {
-              'elapsedMilliseconds': isNotNull,
-              'screen': equals('debugger'),
-            }),
-            matchesEvent(DwdsEventKind.devToolsLoad, {
-              'elapsedMilliseconds': isNotNull,
-              'screen': equals('debugger'),
-            }),
-          ],
-          () => keyboard.sendChord([Keyboard.alt, 'd']),
-        );
-      });
+      test(
+        'emits DEBUGGER_READY and DEVTOOLS_LOAD events',
+        () async {
+          await expectEventsDuring(
+            [
+              matchesEvent(DwdsEventKind.debuggerReady, {
+                'elapsedMilliseconds': isNotNull,
+                'screen': equals('debugger'),
+              }),
+              matchesEvent(DwdsEventKind.devToolsLoad, {
+                'elapsedMilliseconds': isNotNull,
+                'screen': equals('debugger'),
+              }),
+            ],
+            () => keyboard.sendChord([Keyboard.alt, 'd']),
+          );
+        },
+        skip: 'https://github.com/dart-lang/webdev/issues/2181',
+      );
 
       test('emits DEVTOOLS_LAUNCH event', () async {
         await expectEventDuring(