diff --git a/.ci.yaml b/.ci.yaml
index ef9d698fead..fbf9905c0d7 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -398,9 +398,6 @@ targets:
           "CHANNEL": "stable"
         }
 
-  # All of the Linux_android android_platform_tests shards have the same
-  # dependency list, despite some running on Android 33 AVDs versus 34.
-  # See https://github.com/flutter/flutter/issues/137082 for context.
   - name: Linux_android android_platform_tests_shard_1 master
     recipe: packages/packages
     timeout: 60
@@ -408,7 +405,6 @@ targets:
       target_file: android_platform_tests.yaml
       channel: master
       version_file: flutter_master.version
-      # set up for 34
       package_sharding: "--shardIndex 0 --shardCount 6"
       dependencies: >-
         [
@@ -427,7 +423,6 @@ targets:
       target_file: android_platform_tests.yaml
       channel: master
       version_file: flutter_master.version
-      # set up for 34
       package_sharding: "--shardIndex 1 --shardCount 6"
       dependencies: >-
         [
@@ -446,7 +441,6 @@ targets:
       target_file: android_platform_tests.yaml
       channel: master
       version_file: flutter_master.version
-      # set up for 34
       package_sharding: "--shardIndex 2 --shardCount 6"
       dependencies: >-
         [
@@ -465,7 +459,6 @@ targets:
       target_file: android_platform_tests.yaml
       channel: master
       version_file: flutter_master.version
-      # set up for 34
       package_sharding: "--shardIndex 3 --shardCount 6"
       dependencies: >-
         [
@@ -484,7 +477,6 @@ targets:
       target_file: android_platform_tests.yaml
       channel: master
       version_file: flutter_master.version
-      # set up for 34
       package_sharding: "--shardIndex 4 --shardCount 6"
       dependencies: >-
         [
@@ -503,7 +495,6 @@ targets:
       target_file: android_platform_tests.yaml
       channel: master
       version_file: flutter_master.version
-      # set up for 34
       package_sharding: "--shardIndex 5 --shardCount 6"
       dependencies: >-
         [
@@ -515,44 +506,6 @@ targets:
           "PACKAGE_SHARDING": "--shardIndex 5 --shardCount 6"
         }
 
-  - name: Linux_android android_platform_tests_api_33_shard_1 master
-    recipe: packages/packages
-    timeout: 60
-    properties:
-      target_file: android_platform_tests_api_33_avd.yaml
-      channel: master
-      version_file: flutter_master.version
-      # set up for 33
-      package_sharding: "--shardIndex 0 --shardCount 2"
-      dependencies: >-
-        [
-          {"dependency": "android_virtual_device", "version": "android_33_google_apis_x64.textpb"}
-        ]
-      env_variables: >-
-        {
-          "CHANNEL": "master",
-          "PACKAGE_SHARDING": "--shardIndex 0 --shardCount 2"
-        }
-
-  - name: Linux_android android_platform_tests_api_33_shard_2 master
-    recipe: packages/packages
-    timeout: 60
-    properties:
-      target_file: android_platform_tests_api_33_avd.yaml
-      channel: master
-      version_file: flutter_master.version
-      # set up for 33
-      package_sharding: "--shardIndex 1 --shardCount 2"
-      dependencies: >-
-        [
-          {"dependency": "android_virtual_device", "version": "android_33_google_apis_x64.textpb"}
-        ]
-      env_variables: >-
-        {
-          "CHANNEL": "master",
-          "PACKAGE_SHARDING": "--shardIndex 1 --shardCount 2"
-        }
-
   - name: Linux_android android_platform_tests_shard_1 stable
     recipe: packages/packages
     presubmit: false
@@ -667,42 +620,6 @@ targets:
           "PACKAGE_SHARDING": "--shardIndex 5 --shardCount 6"
         }
 
-  - name: Linux_android android_platform_tests_api_33_shard_1 stable
-    recipe: packages/packages
-    timeout: 60
-    properties:
-      target_file: android_platform_tests_api_33_avd.yaml
-      channel: stable
-      version_file: flutter_stable.version
-      package_sharding: "--shardIndex 0 --shardCount 2"
-      dependencies: >-
-        [
-          {"dependency": "android_virtual_device", "version": "android_33_google_apis_x64.textpb"}
-        ]
-      env_variables: >-
-        {
-          "CHANNEL": "stable",
-          "PACKAGE_SHARDING": "--shardIndex 0 --shardCount 2"
-        }
-
-  - name: Linux_android android_platform_tests_api_33_shard_2 stable
-    recipe: packages/packages
-    timeout: 60
-    properties:
-      target_file: android_platform_tests_api_33_avd.yaml
-      channel: stable
-      version_file: flutter_stable.version
-      package_sharding: "--shardIndex 1 --shardCount 2"
-      dependencies: >-
-        [
-          {"dependency": "android_virtual_device", "version": "android_33_google_apis_x64.textpb"}
-        ]
-      env_variables: >-
-        {
-          "CHANNEL": "stable",
-          "PACKAGE_SHARDING": "--shardIndex 1 --shardCount 2"
-        }
-
   - name: Linux_android_legacy android_platform_tests_legacy_api_shard_1 master
     recipe: packages/packages
     timeout: 60
diff --git a/.ci/targets/android_platform_tests.yaml b/.ci/targets/android_platform_tests.yaml
index 23fc6039bdf..d1019f7df18 100644
--- a/.ci/targets/android_platform_tests.yaml
+++ b/.ci/targets/android_platform_tests.yaml
@@ -5,23 +5,23 @@ tasks:
   - name: download Dart and Android deps
     script: .ci/scripts/tool_runner.sh
     infra_step: true
-    args: ["fetch-deps", "--android", "--supporting-target-platforms-only", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
+    args: ["fetch-deps", "--android", "--supporting-target-platforms-only"]
   - name: build examples
     script: .ci/scripts/tool_runner.sh
-    args: ["build-examples", "--apk", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
+    args: ["build-examples", "--apk"]
   - name: lint
     script: .ci/scripts/tool_runner.sh
-    args: ["lint-android", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
+    args: ["lint-android"]
   # Native unit and native integration are split into two steps to allow for
   # different exclusions.
   # TODO(stuartmorgan): Eliminate the native unit test exclusion, and combine
   # these steps.
   - name: native unit tests
     script: .ci/scripts/tool_runner.sh
-    args: ["native-test", "--android", "--no-integration", "--exclude=script/configs/exclude_native_unit_android.yaml,script/configs/still_requires_api_33_avd.yaml"]
+    args: ["native-test", "--android", "--no-integration", "--exclude=script/configs/exclude_native_unit_android.yaml"]
   - name: native integration tests
     script: .ci/scripts/tool_runner.sh
-    args: ["native-test", "--android", "--no-unit", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
+    args: ["native-test", "--android", "--no-unit"]
   - name: drive examples
     script: .ci/scripts/tool_runner.sh
-    args: ["drive-examples", "--android", "--exclude=script/configs/exclude_integration_android.yaml,script/configs/exclude_integration_android_emulator.yaml,script/configs/still_requires_api_33_avd.yaml"]
+    args: ["drive-examples", "--android", "--exclude=script/configs/exclude_integration_android.yaml,script/configs/exclude_integration_android_emulator.yaml"]
diff --git a/.ci/targets/android_platform_tests_api_33_avd.yaml b/.ci/targets/android_platform_tests_api_33_avd.yaml
deleted file mode 100644
index cc5324b141f..00000000000
--- a/.ci/targets/android_platform_tests_api_33_avd.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Same as android_platform_tests.yaml with only packages currently requiring
-# Android 33 due to test failures caused by running on Android 34 AVDs.
-tasks:
-  - name: prepare tool
-    script: .ci/scripts/prepare_tool.sh
-    infra_step: true # Note infra steps failing prevents "always" from running.
-  - name: download Dart and Android deps
-    script: .ci/scripts/tool_runner.sh
-    infra_step: true
-    args: ["fetch-deps", "--android", "--supporting-target-platforms-only", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
-  - name: build examples
-    script: .ci/scripts/tool_runner.sh
-    args: ["build-examples", "--apk", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
-  - name: lint
-    script: .ci/scripts/tool_runner.sh
-    args: ["lint-android", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
-  # Native unit and native integration are split into two steps to allow for
-  # different exclusions.
-  # TODO(stuartmorgan): Eliminate the native unit test exclusion, and combine
-  # these steps.
-  - name: native unit tests
-    script: .ci/scripts/tool_runner.sh
-    args: ["native-test", "--android", "--no-integration", "--exclude=script/configs/exclude_native_unit_android.yaml", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
-  - name: native integration tests
-    script: .ci/scripts/tool_runner.sh
-    args: ["native-test", "--android", "--no-unit", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
-  - name: drive examples
-    script: .ci/scripts/tool_runner.sh
-    args: ["drive-examples", "--android", "--exclude=script/configs/exclude_integration_android.yaml,script/configs/exclude_integration_android_emulator.yaml", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
diff --git a/packages/webview_flutter/webview_flutter/example/integration_test/webview_flutter_test.dart b/packages/webview_flutter/webview_flutter/example/integration_test/webview_flutter_test.dart
index a18c1be0345..de5d3df6dea 100644
--- a/packages/webview_flutter/webview_flutter/example/integration_test/webview_flutter_test.dart
+++ b/packages/webview_flutter/webview_flutter/example/integration_test/webview_flutter_test.dart
@@ -66,10 +66,10 @@ Future<void> main() async {
     final Completer<void> pageFinished = Completer<void>();
 
     final WebViewController controller = WebViewController();
-    unawaited(controller.setNavigationDelegate(
+    await controller.setNavigationDelegate(
       NavigationDelegate(onPageFinished: (_) => pageFinished.complete()),
-    ));
-    unawaited(controller.loadRequest(Uri.parse(primaryUrl)));
+    );
+    await controller.loadRequest(Uri.parse(primaryUrl));
 
     await tester.pumpWidget(WebViewWidget(controller: controller));
     await pageFinished.future;
@@ -82,11 +82,11 @@ Future<void> main() async {
     final Completer<void> pageFinished = Completer<void>();
 
     final WebViewController controller = WebViewController();
-    unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-    unawaited(controller.setNavigationDelegate(
+    await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+    await controller.setNavigationDelegate(
       NavigationDelegate(onPageFinished: (_) => pageFinished.complete()),
-    ));
-    unawaited(controller.loadRequest(Uri.parse(primaryUrl)));
+    );
+    await controller.loadRequest(Uri.parse(primaryUrl));
 
     await tester.pumpWidget(WebViewWidget(controller: controller));
 
@@ -106,14 +106,14 @@ Future<void> main() async {
     final StreamController<String> pageLoads = StreamController<String>();
 
     final WebViewController controller = WebViewController();
-    unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-    unawaited(controller.setNavigationDelegate(
+    await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+    await controller.setNavigationDelegate(
       NavigationDelegate(onPageFinished: (String url) => pageLoads.add(url)),
-    ));
+    );
 
     await tester.pumpWidget(WebViewWidget(controller: controller));
 
-    unawaited(controller.loadRequest(Uri.parse(headersUrl), headers: headers));
+    await controller.loadRequest(Uri.parse(headersUrl), headers: headers);
 
     await pageLoads.stream.firstWhere((String url) => url == headersUrl);
 
@@ -126,10 +126,10 @@ Future<void> main() async {
   testWidgets('JavascriptChannel', (WidgetTester tester) async {
     final Completer<void> pageFinished = Completer<void>();
     final WebViewController controller = WebViewController();
-    unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-    unawaited(controller.setNavigationDelegate(
+    await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+    await controller.setNavigationDelegate(
       NavigationDelegate(onPageFinished: (_) => pageFinished.complete()),
-    ));
+    );
 
     final Completer<String> channelCompleter = Completer<String>();
     await controller.addJavaScriptChannel(
@@ -187,12 +187,12 @@ Future<void> main() async {
     final Completer<void> pageFinished = Completer<void>();
 
     final WebViewController controller = WebViewController();
-    unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-    unawaited(controller.setNavigationDelegate(NavigationDelegate(
+    await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+    await controller.setNavigationDelegate(NavigationDelegate(
       onPageFinished: (_) => pageFinished.complete(),
-    )));
-    unawaited(controller.setUserAgent('Custom_User_Agent1'));
-    unawaited(controller.loadRequest(Uri.parse('about:blank')));
+    ));
+    await controller.setUserAgent('Custom_User_Agent1');
+    await controller.loadRequest(Uri.parse('about:blank'));
 
     await tester.pumpWidget(WebViewWidget(controller: controller));
 
@@ -256,14 +256,15 @@ Future<void> main() async {
 
       WebViewController controller =
           WebViewController.fromPlatformCreationParams(params);
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-      unawaited(controller.setNavigationDelegate(
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+
+      await controller.setNavigationDelegate(
         NavigationDelegate(onPageFinished: (_) => pageLoaded.complete()),
-      ));
+      );
 
       if (controller.platform is AndroidWebViewController) {
-        unawaited((controller.platform as AndroidWebViewController)
-            .setMediaPlaybackRequiresUserGesture(false));
+        await (controller.platform as AndroidWebViewController)
+            .setMediaPlaybackRequiresUserGesture(false);
       }
 
       await controller.loadRequest(
@@ -272,6 +273,8 @@ Future<void> main() async {
 
       await tester.pumpWidget(WebViewWidget(controller: controller));
 
+      await tester.pumpAndSettle();
+
       await pageLoaded.future;
 
       bool isPaused =
@@ -280,16 +283,20 @@ Future<void> main() async {
 
       pageLoaded = Completer<void>();
       controller = WebViewController();
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-      unawaited(controller.setNavigationDelegate(
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+
+      await controller.setNavigationDelegate(
         NavigationDelegate(onPageFinished: (_) => pageLoaded.complete()),
-      ));
-      unawaited(controller.loadRequest(
+      );
+
+      await controller.loadRequest(
         Uri.parse('data:text/html;charset=utf-8;base64,$videoTestBase64'),
-      ));
+      );
 
       await tester.pumpWidget(WebViewWidget(controller: controller));
 
+      await tester.pumpAndSettle();
+
       await pageLoaded.future;
 
       isPaused =
@@ -312,11 +319,13 @@ Future<void> main() async {
       }
       final WebViewController controller =
           WebViewController.fromPlatformCreationParams(params);
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-      unawaited(controller.setNavigationDelegate(
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+
+      await controller.setNavigationDelegate(
         NavigationDelegate(onPageFinished: (_) => pageLoaded.complete()),
-      ));
-      unawaited(controller.addJavaScriptChannel(
+      );
+
+      await controller.addJavaScriptChannel(
         'VideoTestTime',
         onMessageReceived: (JavaScriptMessage message) {
           final double currentTime = double.parse(message.message);
@@ -325,11 +334,11 @@ Future<void> main() async {
             videoPlaying.complete(null);
           }
         },
-      ));
+      );
 
       if (controller.platform is AndroidWebViewController) {
-        unawaited((controller.platform as AndroidWebViewController)
-            .setMediaPlaybackRequiresUserGesture(false));
+        await (controller.platform as AndroidWebViewController)
+            .setMediaPlaybackRequiresUserGesture(false);
       }
 
       await controller.loadRequest(
@@ -395,14 +404,14 @@ Future<void> main() async {
 
       WebViewController controller =
           WebViewController.fromPlatformCreationParams(params);
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-      unawaited(controller.setNavigationDelegate(
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+      await controller.setNavigationDelegate(
         NavigationDelegate(onPageFinished: (_) => pageLoaded.complete()),
-      ));
+      );
 
       if (controller.platform is AndroidWebViewController) {
-        unawaited((controller.platform as AndroidWebViewController)
-            .setMediaPlaybackRequiresUserGesture(false));
+        await (controller.platform as AndroidWebViewController)
+            .setMediaPlaybackRequiresUserGesture(false);
       }
 
       await controller.loadRequest(
@@ -420,17 +429,18 @@ Future<void> main() async {
 
       pageLoaded = Completer<void>();
       controller = WebViewController();
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-      unawaited(controller.setNavigationDelegate(
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+      await controller.setNavigationDelegate(
         NavigationDelegate(onPageFinished: (_) => pageLoaded.complete()),
-      ));
-      unawaited(controller.loadRequest(
+      );
+
+      await controller.loadRequest(
         Uri.parse('data:text/html;charset=utf-8;base64,$audioTestBase64'),
-      ));
+      );
 
       await tester.pumpWidget(WebViewWidget(controller: controller));
-      await tester.pumpAndSettle();
 
+      await tester.pumpAndSettle();
       await pageLoaded.future;
 
       isPaused =
@@ -453,13 +463,13 @@ Future<void> main() async {
     final Completer<void> pageLoaded = Completer<void>();
 
     final WebViewController controller = WebViewController();
-    unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-    unawaited(controller.setNavigationDelegate(NavigationDelegate(
+    await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+    await controller.setNavigationDelegate(NavigationDelegate(
       onPageFinished: (_) => pageLoaded.complete(),
-    )));
-    unawaited(controller.loadRequest(
-      Uri.parse('data:text/html;charset=utf-8;base64,$getTitleTestBase64'),
     ));
+    await controller.loadRequest(
+      Uri.parse('data:text/html;charset=utf-8;base64,$getTitleTestBase64'),
+    );
 
     await tester.pumpWidget(WebViewWidget(controller: controller));
 
@@ -504,18 +514,18 @@ Future<void> main() async {
       final Completer<void> pageLoaded = Completer<void>();
       final WebViewController controller = WebViewController();
       ScrollPositionChange? recordedPosition;
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-      unawaited(controller.setNavigationDelegate(NavigationDelegate(
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+      await controller.setNavigationDelegate(NavigationDelegate(
         onPageFinished: (_) => pageLoaded.complete(),
-      )));
-      unawaited(controller.setOnScrollPositionChange(
+      ));
+      await controller.setOnScrollPositionChange(
           (ScrollPositionChange contentOffsetChange) {
         recordedPosition = contentOffsetChange;
-      }));
+      });
 
-      unawaited(controller.loadRequest(Uri.parse(
+      await controller.loadRequest(Uri.parse(
         'data:text/html;charset=utf-8;base64,$scrollTestPageBase64',
-      )));
+      ));
 
       await tester.pumpWidget(WebViewWidget(controller: controller));
 
@@ -562,19 +572,19 @@ Future<void> main() async {
       Completer<void> pageLoaded = Completer<void>();
 
       final WebViewController controller = WebViewController();
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-      unawaited(controller.setNavigationDelegate(NavigationDelegate(
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+      await controller.setNavigationDelegate(NavigationDelegate(
         onPageFinished: (_) => pageLoaded.complete(),
         onNavigationRequest: (NavigationRequest navigationRequest) {
           return (navigationRequest.url.contains('youtube.com'))
               ? NavigationDecision.prevent
               : NavigationDecision.navigate;
         },
-      )));
+      ));
 
       await tester.pumpWidget(WebViewWidget(controller: controller));
 
-      unawaited(controller.loadRequest(Uri.parse(blankPageEncoded)));
+      await controller.loadRequest(Uri.parse(blankPageEncoded));
 
       await pageLoaded.future; // Wait for initial page load.
 
@@ -591,13 +601,12 @@ Future<void> main() async {
           Completer<WebResourceError>();
 
       final WebViewController controller = WebViewController();
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-      unawaited(controller.setNavigationDelegate(
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+      await controller.setNavigationDelegate(
           NavigationDelegate(onWebResourceError: (WebResourceError error) {
         errorCompleter.complete(error);
-      })));
-      unawaited(
-          controller.loadRequest(Uri.parse('https://www.notawebsite..com')));
+      }));
+      await controller.loadRequest(Uri.parse('https://www.notawebsite..com'));
 
       await tester.pumpWidget(WebViewWidget(controller: controller));
 
@@ -612,16 +621,16 @@ Future<void> main() async {
       final Completer<void> pageFinishCompleter = Completer<void>();
 
       final WebViewController controller = WebViewController();
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-      unawaited(controller.setNavigationDelegate(NavigationDelegate(
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+      await controller.setNavigationDelegate(NavigationDelegate(
         onPageFinished: (_) => pageFinishCompleter.complete(),
         onWebResourceError: (WebResourceError error) {
           errorCompleter.complete(error);
         },
-      )));
-      unawaited(controller.loadRequest(
-        Uri.parse('data:text/html;charset=utf-8;base64,PCFET0NUWVBFIGh0bWw+'),
       ));
+      await controller.loadRequest(
+        Uri.parse('data:text/html;charset=utf-8;base64,PCFET0NUWVBFIGh0bWw+'),
+      );
 
       await tester.pumpWidget(WebViewWidget(controller: controller));
 
@@ -633,18 +642,18 @@ Future<void> main() async {
       Completer<void> pageLoaded = Completer<void>();
 
       final WebViewController controller = WebViewController();
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-      unawaited(controller.setNavigationDelegate(NavigationDelegate(
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+      await controller.setNavigationDelegate(NavigationDelegate(
           onPageFinished: (_) => pageLoaded.complete(),
           onNavigationRequest: (NavigationRequest navigationRequest) {
             return (navigationRequest.url.contains('youtube.com'))
                 ? NavigationDecision.prevent
                 : NavigationDecision.navigate;
-          })));
+          }));
 
       await tester.pumpWidget(WebViewWidget(controller: controller));
 
-      unawaited(controller.loadRequest(Uri.parse(blankPageEncoded)));
+      await controller.loadRequest(Uri.parse(blankPageEncoded));
 
       await pageLoaded.future; // Wait for initial page load.
 
@@ -665,8 +674,8 @@ Future<void> main() async {
       Completer<void> pageLoaded = Completer<void>();
 
       final WebViewController controller = WebViewController();
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-      unawaited(controller.setNavigationDelegate(NavigationDelegate(
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+      await controller.setNavigationDelegate(NavigationDelegate(
           onPageFinished: (_) => pageLoaded.complete(),
           onNavigationRequest: (NavigationRequest navigationRequest) async {
             NavigationDecision decision = NavigationDecision.prevent;
@@ -674,11 +683,11 @@ Future<void> main() async {
                 const Duration(milliseconds: 10),
                 () => NavigationDecision.navigate);
             return decision;
-          })));
+          }));
 
       await tester.pumpWidget(WebViewWidget(controller: controller));
 
-      unawaited(controller.loadRequest(Uri.parse(blankPageEncoded)));
+      await controller.loadRequest(Uri.parse(blankPageEncoded));
 
       await pageLoaded.future; // Wait for initial page load.
 
@@ -694,11 +703,11 @@ Future<void> main() async {
       final Completer<void> pageLoaded = Completer<void>();
 
       final WebViewController controller = WebViewController();
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-      unawaited(controller.setNavigationDelegate(NavigationDelegate(
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+      await controller.setNavigationDelegate(NavigationDelegate(
         onPageFinished: (_) => pageLoaded.complete(),
-      )));
-      unawaited(controller.loadRequest(Uri.parse(blankPageEncoded)));
+      ));
+      await controller.loadRequest(Uri.parse(blankPageEncoded));
 
       await tester.pumpWidget(WebViewWidget(controller: controller));
 
@@ -725,9 +734,9 @@ Future<void> main() async {
       );
 
       final WebViewController controller = WebViewController();
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-      unawaited(controller.setNavigationDelegate(navigationDelegate));
-      unawaited(controller.loadRequest(Uri.parse(primaryUrl)));
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+      await controller.setNavigationDelegate(navigationDelegate);
+      await controller.loadRequest(Uri.parse(primaryUrl));
 
       await tester.pumpWidget(WebViewWidget(controller: controller));
 
@@ -752,18 +761,16 @@ Future<void> main() async {
       final Completer<void> authRequested = Completer<void>();
       final WebViewController controller = WebViewController();
 
-      unawaited(
-        controller.setNavigationDelegate(
-          NavigationDelegate(
-            onHttpAuthRequest: (HttpAuthRequest request) =>
-                authRequested.complete(),
-          ),
+      await controller.setNavigationDelegate(
+        NavigationDelegate(
+          onHttpAuthRequest: (HttpAuthRequest request) =>
+              authRequested.complete(),
         ),
       );
 
       await tester.pumpWidget(WebViewWidget(controller: controller));
 
-      unawaited(controller.loadRequest(Uri.parse(basicAuthUrl)));
+      await controller.loadRequest(Uri.parse(basicAuthUrl));
 
       await expectLater(authRequested.future, completes);
     });
@@ -773,24 +780,20 @@ Future<void> main() async {
       final WebViewController controller = WebViewController();
       final Completer<void> pageFinished = Completer<void>();
 
-      unawaited(
-        controller.setNavigationDelegate(
-          NavigationDelegate(
-            onHttpAuthRequest: (HttpAuthRequest request) => request.onProceed(
-              const WebViewCredential(
-                user: 'user',
-                password: 'password',
-              ),
-            ),
-            onPageFinished: (_) => pageFinished.complete(),
-            onWebResourceError: (_) => fail('Authentication failed'),
+      await controller.setNavigationDelegate(NavigationDelegate(
+        onHttpAuthRequest: (HttpAuthRequest request) => request.onProceed(
+          const WebViewCredential(
+            user: 'user',
+            password: 'password',
           ),
         ),
-      );
+        onPageFinished: (_) => pageFinished.complete(),
+        onWebResourceError: (_) => fail('Authentication failed'),
+      ));
 
       await tester.pumpWidget(WebViewWidget(controller: controller));
 
-      unawaited(controller.loadRequest(Uri.parse(basicAuthUrl)));
+      await controller.loadRequest(Uri.parse(basicAuthUrl));
 
       await expectLater(pageFinished.future, completes);
     });
@@ -801,10 +804,10 @@ Future<void> main() async {
     final Completer<void> pageLoaded = Completer<void>();
 
     final WebViewController controller = WebViewController();
-    unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-    unawaited(controller.setNavigationDelegate(NavigationDelegate(
+    await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+    await controller.setNavigationDelegate(NavigationDelegate(
       onPageFinished: (_) => pageLoaded.complete(),
-    )));
+    ));
 
     await tester.pumpWidget(WebViewWidget(controller: controller));
 
@@ -820,11 +823,11 @@ Future<void> main() async {
       Completer<void> pageLoaded = Completer<void>();
 
       final WebViewController controller = WebViewController();
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-      unawaited(controller.setNavigationDelegate(NavigationDelegate(
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+      await controller.setNavigationDelegate(NavigationDelegate(
         onPageFinished: (_) => pageLoaded.complete(),
-      )));
-      unawaited(controller.loadRequest(Uri.parse(primaryUrl)));
+      ));
+      await controller.loadRequest(Uri.parse(primaryUrl));
 
       await tester.pumpWidget(WebViewWidget(controller: controller));
 
@@ -850,11 +853,11 @@ Future<void> main() async {
       Completer<void> pageLoadCompleter = Completer<void>();
 
       final WebViewController controller = WebViewController();
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-      unawaited(controller.setNavigationDelegate(NavigationDelegate(
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+      await controller.setNavigationDelegate(NavigationDelegate(
         onPageFinished: (_) => pageLoadCompleter.complete(),
-      )));
-      unawaited(controller.loadRequest(Uri.parse(primaryUrl)));
+      ));
+      await controller.loadRequest(Uri.parse(primaryUrl));
 
       await tester.pumpWidget(WebViewWidget(controller: controller));
 
diff --git a/packages/webview_flutter/webview_flutter/example/integration_test/legacy/webview_flutter_test.dart b/packages/webview_flutter/webview_flutter/example/integration_test/webview_flutter_test_legacy.dart
similarity index 100%
rename from packages/webview_flutter/webview_flutter/example/integration_test/legacy/webview_flutter_test.dart
rename to packages/webview_flutter/webview_flutter/example/integration_test/webview_flutter_test_legacy.dart
diff --git a/packages/webview_flutter/webview_flutter_android/example/integration_test/webview_flutter_test.dart b/packages/webview_flutter/webview_flutter_android/example/integration_test/webview_flutter_test.dart
index cee7d65f33f..4c22df1ff28 100644
--- a/packages/webview_flutter/webview_flutter_android/example/integration_test/webview_flutter_test.dart
+++ b/packages/webview_flutter/webview_flutter_android/example/integration_test/webview_flutter_test.dart
@@ -64,8 +64,8 @@ Future<void> main() async {
     final PlatformNavigationDelegate delegate = PlatformNavigationDelegate(
       const PlatformNavigationDelegateCreationParams(),
     );
-    unawaited(delegate.setOnPageFinished((_) => pageFinished.complete()));
-    unawaited(controller.setPlatformNavigationDelegate(delegate));
+    await delegate.setOnPageFinished((_) => pageFinished.complete());
+    await controller.setPlatformNavigationDelegate(delegate);
     await controller.loadRequest(
       LoadRequestParams(uri: Uri.parse(primaryUrl)),
     );
@@ -189,12 +189,12 @@ Future<void> main() async {
     final PlatformWebViewController controller = PlatformWebViewController(
       const PlatformWebViewControllerCreationParams(),
     );
-    unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
+    await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
     final PlatformNavigationDelegate delegate = PlatformNavigationDelegate(
       const PlatformNavigationDelegateCreationParams(),
     );
-    unawaited(delegate.setOnPageFinished((_) => pageFinished.complete()));
-    unawaited(controller.setPlatformNavigationDelegate(delegate));
+    await delegate.setOnPageFinished((_) => pageFinished.complete());
+    await controller.setPlatformNavigationDelegate(delegate);
     await controller.loadRequest(LoadRequestParams(uri: Uri.parse(primaryUrl)));
 
     await tester.pumpWidget(Builder(
@@ -223,12 +223,12 @@ Future<void> main() async {
     final PlatformWebViewController controller = PlatformWebViewController(
       const PlatformWebViewControllerCreationParams(),
     );
-    unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
+    await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
     final PlatformNavigationDelegate delegate = PlatformNavigationDelegate(
       const PlatformNavigationDelegateCreationParams(),
     );
-    unawaited(delegate.setOnPageFinished((String url) => pageLoads.add(url)));
-    unawaited(controller.setPlatformNavigationDelegate(delegate));
+    await delegate.setOnPageFinished((String url) => pageLoads.add(url));
+    await controller.setPlatformNavigationDelegate(delegate);
     await controller.loadRequest(
       LoadRequestParams(
         uri: Uri.parse(headersUrl),
@@ -258,12 +258,12 @@ Future<void> main() async {
     final PlatformWebViewController controller = PlatformWebViewController(
       const PlatformWebViewControllerCreationParams(),
     );
-    unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
+    await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
     final PlatformNavigationDelegate delegate = PlatformNavigationDelegate(
       const PlatformNavigationDelegateCreationParams(),
     );
-    unawaited(delegate.setOnPageFinished((_) => pageFinished.complete()));
-    unawaited(controller.setPlatformNavigationDelegate(delegate));
+    await delegate.setOnPageFinished((_) => pageFinished.complete());
+    await controller.setPlatformNavigationDelegate(delegate);
 
     final Completer<String> channelCompleter = Completer<String>();
     await controller.addJavaScriptChannel(
@@ -331,13 +331,13 @@ Future<void> main() async {
     final PlatformWebViewController controller = PlatformWebViewController(
       const PlatformWebViewControllerCreationParams(),
     );
-    unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-    unawaited(controller.setUserAgent('Custom_User_Agent1'));
+    await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+    await controller.setUserAgent('Custom_User_Agent1');
     final PlatformNavigationDelegate delegate = PlatformNavigationDelegate(
       const PlatformNavigationDelegateCreationParams(),
     );
-    unawaited(delegate.setOnPageFinished((_) => pageFinished.complete()));
-    unawaited(controller.setPlatformNavigationDelegate(delegate));
+    await delegate.setOnPageFinished((_) => pageFinished.complete());
+    await controller.setPlatformNavigationDelegate(delegate);
 
     await controller
         .loadRequest(LoadRequestParams(uri: Uri.parse('about:blank')));
@@ -427,13 +427,13 @@ Future<void> main() async {
       AndroidWebViewController controller = AndroidWebViewController(
         const PlatformWebViewControllerCreationParams(),
       );
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-      unawaited(controller.setMediaPlaybackRequiresUserGesture(false));
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+      await controller.setMediaPlaybackRequiresUserGesture(false);
       AndroidNavigationDelegate delegate = AndroidNavigationDelegate(
         const PlatformNavigationDelegateCreationParams(),
       );
-      unawaited(delegate.setOnPageFinished((_) => pageLoaded.complete()));
-      unawaited(controller.setPlatformNavigationDelegate(delegate));
+      await delegate.setOnPageFinished((_) => pageLoaded.complete());
+      await controller.setPlatformNavigationDelegate(delegate);
 
       await controller.loadRequest(
         LoadRequestParams(
@@ -461,12 +461,12 @@ Future<void> main() async {
       controller = AndroidWebViewController(
         const PlatformWebViewControllerCreationParams(),
       );
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
       delegate = AndroidNavigationDelegate(
         const PlatformNavigationDelegateCreationParams(),
       );
-      unawaited(delegate.setOnPageFinished((_) => pageLoaded.complete()));
-      unawaited(controller.setPlatformNavigationDelegate(delegate));
+      await delegate.setOnPageFinished((_) => pageLoaded.complete());
+      await controller.setPlatformNavigationDelegate(delegate);
 
       await controller.loadRequest(
         LoadRequestParams(
@@ -498,15 +498,15 @@ Future<void> main() async {
       final AndroidWebViewController controller = AndroidWebViewController(
         const PlatformWebViewControllerCreationParams(),
       );
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-      unawaited(controller.setMediaPlaybackRequiresUserGesture(false));
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+      await controller.setMediaPlaybackRequiresUserGesture(false);
       final AndroidNavigationDelegate delegate = AndroidNavigationDelegate(
         const PlatformNavigationDelegateCreationParams(),
       );
-      unawaited(delegate.setOnPageFinished((_) => pageLoaded.complete()));
-      unawaited(controller.setPlatformNavigationDelegate(delegate));
+      await delegate.setOnPageFinished((_) => pageLoaded.complete());
+      await controller.setPlatformNavigationDelegate(delegate);
 
-      unawaited(controller.addJavaScriptChannel(
+      await controller.addJavaScriptChannel(
         JavaScriptChannelParams(
           name: 'VideoTestTime',
           onMessageReceived: (JavaScriptMessage message) {
@@ -517,7 +517,7 @@ Future<void> main() async {
             }
           },
         ),
-      ));
+      );
 
       await controller.loadRequest(
         LoadRequestParams(
@@ -553,20 +553,20 @@ Future<void> main() async {
       final AndroidWebViewController controller = AndroidWebViewController(
         const PlatformWebViewControllerCreationParams(),
       );
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-      unawaited(controller.setMediaPlaybackRequiresUserGesture(false));
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+      await controller.setMediaPlaybackRequiresUserGesture(false);
       final AndroidNavigationDelegate delegate = AndroidNavigationDelegate(
         const PlatformNavigationDelegateCreationParams(),
       );
-      unawaited(delegate.setOnPageFinished((_) => pageLoaded.complete()));
-      unawaited(controller.setPlatformNavigationDelegate(delegate));
-      unawaited(controller.setCustomWidgetCallbacks(onHideCustomWidget: () {
+      await delegate.setOnPageFinished((_) => pageLoaded.complete());
+      await controller.setPlatformNavigationDelegate(delegate);
+      await controller.setCustomWidgetCallbacks(onHideCustomWidget: () {
         fullscreenExited.complete();
       }, onShowCustomWidget:
           (Widget webView, void Function() onHideCustomView) {
         fullscreenEntered.complete();
         onHideCustomView();
-      }));
+      });
 
       await controller.loadRequest(
         LoadRequestParams(
@@ -642,13 +642,13 @@ Future<void> main() async {
       AndroidWebViewController controller = AndroidWebViewController(
         const PlatformWebViewControllerCreationParams(),
       );
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-      unawaited(controller.setMediaPlaybackRequiresUserGesture(false));
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+      await controller.setMediaPlaybackRequiresUserGesture(false);
       AndroidNavigationDelegate delegate = AndroidNavigationDelegate(
         const PlatformNavigationDelegateCreationParams(),
       );
-      unawaited(delegate.setOnPageFinished((_) => pageLoaded.complete()));
-      unawaited(controller.setPlatformNavigationDelegate(delegate));
+      await delegate.setOnPageFinished((_) => pageLoaded.complete());
+      await controller.setPlatformNavigationDelegate(delegate);
 
       await controller.loadRequest(
         LoadRequestParams(
@@ -676,12 +676,12 @@ Future<void> main() async {
       controller = AndroidWebViewController(
         const PlatformWebViewControllerCreationParams(),
       );
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
       delegate = AndroidNavigationDelegate(
         const PlatformNavigationDelegateCreationParams(),
       );
-      unawaited(delegate.setOnPageFinished((_) => pageLoaded.complete()));
-      unawaited(controller.setPlatformNavigationDelegate(delegate));
+      await delegate.setOnPageFinished((_) => pageLoaded.complete());
+      await controller.setPlatformNavigationDelegate(delegate);
       await controller.loadRequest(
         LoadRequestParams(
           uri: Uri.parse(
@@ -722,12 +722,12 @@ Future<void> main() async {
     final PlatformWebViewController controller = PlatformWebViewController(
       const PlatformWebViewControllerCreationParams(),
     );
-    unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
+    await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
     final PlatformNavigationDelegate delegate = PlatformNavigationDelegate(
       const PlatformNavigationDelegateCreationParams(),
     );
-    unawaited(delegate.setOnPageFinished((_) => pageLoaded.complete()));
-    unawaited(controller.setPlatformNavigationDelegate(delegate));
+    await delegate.setOnPageFinished((_) => pageLoaded.complete());
+    await controller.setPlatformNavigationDelegate(delegate);
 
     await controller.loadRequest(
       LoadRequestParams(
@@ -789,16 +789,16 @@ Future<void> main() async {
       final PlatformWebViewController controller = PlatformWebViewController(
         const PlatformWebViewControllerCreationParams(),
       );
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
       final PlatformNavigationDelegate delegate = PlatformNavigationDelegate(
         const PlatformNavigationDelegateCreationParams(),
       );
-      unawaited(delegate.setOnPageFinished((_) => pageLoaded.complete()));
-      unawaited(controller.setPlatformNavigationDelegate(delegate));
-      unawaited(controller.setOnScrollPositionChange(
+      await delegate.setOnPageFinished((_) => pageLoaded.complete());
+      await controller.setPlatformNavigationDelegate(delegate);
+      await controller.setOnScrollPositionChange(
           (ScrollPositionChange contentOffsetChange) {
         recordedPosition = contentOffsetChange;
-      }));
+      });
 
       await controller.loadRequest(
         LoadRequestParams(
@@ -860,19 +860,18 @@ Future<void> main() async {
       final PlatformWebViewController controller = PlatformWebViewController(
         const PlatformWebViewControllerCreationParams(),
       );
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
       final PlatformNavigationDelegate delegate = PlatformNavigationDelegate(
         const PlatformNavigationDelegateCreationParams(),
       );
-      unawaited(delegate.setOnPageFinished((_) => pageLoaded.complete()));
-      unawaited(
-        delegate.setOnNavigationRequest((NavigationRequest navigationRequest) {
-          return (navigationRequest.url.contains('youtube.com'))
-              ? NavigationDecision.prevent
-              : NavigationDecision.navigate;
-        }),
-      );
-      unawaited(controller.setPlatformNavigationDelegate(delegate));
+      await delegate.setOnPageFinished((_) => pageLoaded.complete());
+      await delegate
+          .setOnNavigationRequest((NavigationRequest navigationRequest) {
+        return (navigationRequest.url.contains('youtube.com'))
+            ? NavigationDecision.prevent
+            : NavigationDecision.navigate;
+      });
+      await controller.setPlatformNavigationDelegate(delegate);
 
       await controller.loadRequest(
         LoadRequestParams(uri: Uri.parse(blankPageEncoded)),
@@ -903,16 +902,14 @@ Future<void> main() async {
       final PlatformWebViewController controller = PlatformWebViewController(
         const PlatformWebViewControllerCreationParams(),
       );
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
       final PlatformNavigationDelegate delegate = PlatformNavigationDelegate(
         const PlatformNavigationDelegateCreationParams(),
       );
-      unawaited(
-        delegate.setOnWebResourceError((WebResourceError error) {
-          errorCompleter.complete(error);
-        }),
-      );
-      unawaited(controller.setPlatformNavigationDelegate(delegate));
+      await delegate.setOnWebResourceError((WebResourceError error) {
+        errorCompleter.complete(error);
+      });
+      await controller.setPlatformNavigationDelegate(delegate);
 
       await controller.loadRequest(
         LoadRequestParams(uri: Uri.parse('https://www.notawebsite..com')),
@@ -945,19 +942,15 @@ Future<void> main() async {
       final PlatformWebViewController controller = PlatformWebViewController(
         const PlatformWebViewControllerCreationParams(),
       );
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
       final PlatformNavigationDelegate delegate = PlatformNavigationDelegate(
         const PlatformNavigationDelegateCreationParams(),
       );
-      unawaited(
-        delegate.setOnPageFinished((_) => pageFinishCompleter.complete()),
-      );
-      unawaited(
-        delegate.setOnWebResourceError((WebResourceError error) {
-          errorCompleter.complete(error);
-        }),
-      );
-      unawaited(controller.setPlatformNavigationDelegate(delegate));
+      await delegate.setOnPageFinished((_) => pageFinishCompleter.complete());
+      await delegate.setOnWebResourceError((WebResourceError error) {
+        errorCompleter.complete(error);
+      });
+      await controller.setPlatformNavigationDelegate(delegate);
       await controller.loadRequest(
         LoadRequestParams(
           uri: Uri.parse(
@@ -985,17 +978,17 @@ Future<void> main() async {
       final PlatformWebViewController controller = PlatformWebViewController(
         const PlatformWebViewControllerCreationParams(),
       );
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
       final PlatformNavigationDelegate delegate = PlatformNavigationDelegate(
         const PlatformNavigationDelegateCreationParams(),
       );
-      unawaited(delegate.setOnHttpError((HttpResponseError error) {
+      await delegate.setOnHttpError((HttpResponseError error) {
         errorCompleter.complete(error);
-      }));
-      unawaited(controller.setPlatformNavigationDelegate(delegate));
-      unawaited(controller.loadRequest(
+      });
+      await controller.setPlatformNavigationDelegate(delegate);
+      await controller.loadRequest(
         LoadRequestParams(uri: Uri.parse('$prefixUrl/favicon.ico')),
-      ));
+      );
 
       await tester.pumpWidget(Builder(
         builder: (BuildContext context) {
@@ -1028,18 +1021,18 @@ Future<void> main() async {
       final PlatformWebViewController controller = PlatformWebViewController(
         const PlatformWebViewControllerCreationParams(),
       );
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
       final PlatformNavigationDelegate delegate = PlatformNavigationDelegate(
         const PlatformNavigationDelegateCreationParams(),
       );
-      unawaited(delegate.setOnHttpError((HttpResponseError error) {
+      await delegate.setOnHttpError((HttpResponseError error) {
         errorCompleter.complete(error);
-      }));
-      unawaited(delegate.setOnPageFinished(
+      });
+      await delegate.setOnPageFinished(
         (_) => pageFinishCompleter.complete(),
-      ));
-      unawaited(controller.setPlatformNavigationDelegate(delegate));
-      unawaited(controller.loadHtmlString(testPage));
+      );
+      await controller.setPlatformNavigationDelegate(delegate);
+      await controller.loadHtmlString(testPage);
 
       await tester.pumpWidget(Builder(
         builder: (BuildContext context) {
@@ -1059,18 +1052,18 @@ Future<void> main() async {
       final PlatformWebViewController controller = PlatformWebViewController(
         const PlatformWebViewControllerCreationParams(),
       );
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
       final PlatformNavigationDelegate delegate = PlatformNavigationDelegate(
         const PlatformNavigationDelegateCreationParams(),
       );
-      unawaited(delegate.setOnPageFinished((_) => pageLoaded.complete()));
-      unawaited(delegate
+      await delegate.setOnPageFinished((_) => pageLoaded.complete());
+      await delegate
           .setOnNavigationRequest((NavigationRequest navigationRequest) {
         return (navigationRequest.url.contains('youtube.com'))
             ? NavigationDecision.prevent
             : NavigationDecision.navigate;
-      }));
-      unawaited(controller.setPlatformNavigationDelegate(delegate));
+      });
+      await controller.setPlatformNavigationDelegate(delegate);
 
       await controller
           .loadRequest(LoadRequestParams(uri: Uri.parse(blankPageEncoded)));
@@ -1104,20 +1097,20 @@ Future<void> main() async {
       final PlatformWebViewController controller = PlatformWebViewController(
         const PlatformWebViewControllerCreationParams(),
       );
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
       final PlatformNavigationDelegate delegate = PlatformNavigationDelegate(
         const PlatformNavigationDelegateCreationParams(),
       );
-      unawaited(delegate.setOnPageFinished((_) => pageLoaded.complete()));
-      unawaited(delegate
+      await delegate.setOnPageFinished((_) => pageLoaded.complete());
+      await delegate
           .setOnNavigationRequest((NavigationRequest navigationRequest) async {
         NavigationDecision decision = NavigationDecision.prevent;
         decision = await Future<NavigationDecision>.delayed(
             const Duration(milliseconds: 10),
             () => NavigationDecision.navigate);
         return decision;
-      }));
-      unawaited(controller.setPlatformNavigationDelegate(delegate));
+      });
+      await controller.setPlatformNavigationDelegate(delegate);
       await controller
           .loadRequest(LoadRequestParams(uri: Uri.parse(blankPageEncoded)));
 
@@ -1145,12 +1138,12 @@ Future<void> main() async {
       final PlatformWebViewController controller = PlatformWebViewController(
         const PlatformWebViewControllerCreationParams(),
       );
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
       final PlatformNavigationDelegate delegate = PlatformNavigationDelegate(
         const PlatformNavigationDelegateCreationParams(),
       );
-      unawaited(delegate.setOnPageFinished((_) => pageLoaded.complete()));
-      unawaited(controller.setPlatformNavigationDelegate(delegate));
+      await delegate.setOnPageFinished((_) => pageLoaded.complete());
+      await controller.setPlatformNavigationDelegate(delegate);
       await controller
           .loadRequest(LoadRequestParams(uri: Uri.parse(blankPageEncoded)));
 
@@ -1182,12 +1175,12 @@ Future<void> main() async {
       final PlatformWebViewController controller = PlatformWebViewController(
         const PlatformWebViewControllerCreationParams(),
       );
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
       final PlatformNavigationDelegate delegate = PlatformNavigationDelegate(
         const PlatformNavigationDelegateCreationParams(),
       );
-      unawaited(delegate.setOnPageFinished((_) => pageLoaded.complete()));
-      unawaited(controller.setPlatformNavigationDelegate(delegate));
+      await delegate.setOnPageFinished((_) => pageLoaded.complete());
+      await controller.setPlatformNavigationDelegate(delegate);
       await controller
           .loadRequest(LoadRequestParams(uri: Uri.parse(primaryUrl)));
 
@@ -1298,12 +1291,12 @@ Future<void> main() async {
     final PlatformWebViewController controller = PlatformWebViewController(
       const PlatformWebViewControllerCreationParams(),
     );
-    unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
+    await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
     final PlatformNavigationDelegate delegate = PlatformNavigationDelegate(
       const PlatformNavigationDelegateCreationParams(),
     );
-    unawaited(delegate.setOnPageFinished((_) => pageLoaded.complete()));
-    unawaited(controller.setPlatformNavigationDelegate(delegate));
+    await delegate.setOnPageFinished((_) => pageLoaded.complete());
+    await controller.setPlatformNavigationDelegate(delegate);
 
     await tester.pumpWidget(Builder(
       builder: (BuildContext context) {
@@ -1327,12 +1320,12 @@ Future<void> main() async {
       final PlatformWebViewController controller = PlatformWebViewController(
         const PlatformWebViewControllerCreationParams(),
       );
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
       final PlatformNavigationDelegate delegate = PlatformNavigationDelegate(
         const PlatformNavigationDelegateCreationParams(),
       );
-      unawaited(delegate.setOnPageFinished((_) => pageLoaded.complete()));
-      unawaited(controller.setPlatformNavigationDelegate(delegate));
+      await delegate.setOnPageFinished((_) => pageLoaded.complete());
+      await controller.setPlatformNavigationDelegate(delegate);
       await controller
           .loadRequest(LoadRequestParams(uri: Uri.parse(primaryUrl)));
 
@@ -1399,13 +1392,12 @@ Future<void> main() async {
       final PlatformWebViewController controller = PlatformWebViewController(
         const PlatformWebViewControllerCreationParams(),
       );
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
       final PlatformNavigationDelegate delegate = PlatformNavigationDelegate(
         const PlatformNavigationDelegateCreationParams(),
       );
-      unawaited(
-          delegate.setOnPageFinished((_) => pageLoadCompleter.complete()));
-      unawaited(controller.setPlatformNavigationDelegate(delegate));
+      await delegate.setOnPageFinished((_) => pageLoadCompleter.complete());
+      await controller.setPlatformNavigationDelegate(delegate);
       await controller.loadRequest(
         LoadRequestParams(
           uri: Uri.parse(
@@ -1446,8 +1438,8 @@ Future<void> main() async {
       final PlatformNavigationDelegate delegate = PlatformNavigationDelegate(
         const PlatformNavigationDelegateCreationParams(),
       );
-      unawaited(delegate.setOnPageFinished((_) => pageLoaded.complete()));
-      unawaited(controller.setPlatformNavigationDelegate(delegate));
+      await delegate.setOnPageFinished((_) => pageLoaded.complete());
+      await controller.setPlatformNavigationDelegate(delegate);
       await controller
           .loadRequest(LoadRequestParams(uri: Uri.parse(primaryUrl)));
 
@@ -1490,17 +1482,15 @@ Future<void> main() async {
     );
 
     final Completer<String> alertMessage = Completer<String>();
-    unawaited(controller.setOnJavaScriptAlertDialog(
+    await controller.setOnJavaScriptAlertDialog(
       (JavaScriptAlertDialogRequest request) async {
         alertMessage.complete(request.message);
       },
-    ));
-
-    unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-    unawaited(
-      controller.loadRequest(LoadRequestParams(uri: Uri.parse(primaryUrl))),
     );
 
+    await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+    await controller.loadRequest(LoadRequestParams(uri: Uri.parse(primaryUrl)));
+
     await tester.pumpWidget(Builder(
       builder: (BuildContext context) {
         return PlatformWebViewWidget(
@@ -1520,18 +1510,16 @@ Future<void> main() async {
     );
 
     final Completer<String> confirmMessage = Completer<String>();
-    unawaited(controller.setOnJavaScriptConfirmDialog(
+    await controller.setOnJavaScriptConfirmDialog(
       (JavaScriptConfirmDialogRequest request) async {
         confirmMessage.complete(request.message);
         return true;
       },
-    ));
-
-    unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-    unawaited(
-      controller.loadRequest(LoadRequestParams(uri: Uri.parse(primaryUrl))),
     );
 
+    await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+    await controller.loadRequest(LoadRequestParams(uri: Uri.parse(primaryUrl)));
+
     await tester.pumpWidget(Builder(
       builder: (BuildContext context) {
         return PlatformWebViewWidget(
@@ -1550,17 +1538,15 @@ Future<void> main() async {
       const PlatformWebViewControllerCreationParams(),
     );
 
-    unawaited(controller.setOnJavaScriptTextInputDialog(
+    await controller.setOnJavaScriptTextInputDialog(
       (JavaScriptTextInputDialogRequest request) async {
         return 'return message';
       },
-    ));
-
-    unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
-    unawaited(
-      controller.loadRequest(LoadRequestParams(uri: Uri.parse(primaryUrl))),
     );
 
+    await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
+    await controller.loadRequest(LoadRequestParams(uri: Uri.parse(primaryUrl)));
+
     await tester.pumpWidget(Builder(
       builder: (BuildContext context) {
         return PlatformWebViewWidget(
@@ -1594,7 +1580,7 @@ Future<void> main() async {
       final PlatformWebViewController controller = PlatformWebViewController(
         const PlatformWebViewControllerCreationParams(),
       );
-      unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
+      await controller.setJavaScriptMode(JavaScriptMode.unrestricted);
 
       await controller.setOnConsoleMessage((JavaScriptConsoleMessage message) {
         debugMessageReceived
diff --git a/packages/webview_flutter/webview_flutter_android/example/integration_test/legacy/webview_flutter_test.dart b/packages/webview_flutter/webview_flutter_android/example/integration_test/webview_flutter_test_legacy.dart
similarity index 100%
rename from packages/webview_flutter/webview_flutter_android/example/integration_test/legacy/webview_flutter_test.dart
rename to packages/webview_flutter/webview_flutter_android/example/integration_test/webview_flutter_test_legacy.dart
diff --git a/script/configs/still_requires_api_33_avd.yaml b/script/configs/still_requires_api_33_avd.yaml
deleted file mode 100644
index 7368d3d16e0..00000000000
--- a/script/configs/still_requires_api_33_avd.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-# Running the somes tests from these packages on an AVD with Android 34 causes failures.
-- webview_flutter