diff --git a/dev/devicelab/manifest.yaml b/dev/devicelab/manifest.yaml
index e9e2cb4..0e32f47 100644
--- a/dev/devicelab/manifest.yaml
+++ b/dev/devicelab/manifest.yaml
@@ -193,6 +193,7 @@
       Runs end-to-end Flutter tests on Android.
     stage: devicelab
     required_agent_capabilities: ["mac/android"]
+    flaky: true
 
   commands_test:
     description: >
diff --git a/dev/integration_tests/ui/lib/driver.dart b/dev/integration_tests/ui/lib/driver.dart
index a2e1718..ede2f66 100644
--- a/dev/integration_tests/ui/lib/driver.dart
+++ b/dev/integration_tests/ui/lib/driver.dart
@@ -7,10 +7,7 @@
 import 'package:flutter_driver/driver_extension.dart';
 
 void main() {
-  enableFlutterDriverExtension(handler: (String message) async {
-    // TODO(cbernaschina) remove when test flakiness is resolved
-    return 'driver';
-  });
+  enableFlutterDriverExtension();
   runApp(new DriverTestApp());
 }