diff --git a/packages/video_player/video_player/CHANGELOG.md b/packages/video_player/video_player/CHANGELOG.md
index f9031685b583..9d4e36d72017 100644
--- a/packages/video_player/video_player/CHANGELOG.md
+++ b/packages/video_player/video_player/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 * Fixes integration tests.
 * Updates Android compileSdkVersion to 31.
+* Fixes a flaky integration test.
 
 ## 2.2.7
 
diff --git a/packages/video_player/video_player/example/integration_test/video_player_test.dart b/packages/video_player/video_player/example/integration_test/video_player_test.dart
index 866b5bce0a8d..63a38290a613 100644
--- a/packages/video_player/video_player/example/integration_test/video_player_test.dart
+++ b/packages/video_player/video_player/example/integration_test/video_player_test.dart
@@ -48,17 +48,13 @@ void main() {
         await networkController.setVolume(0);
         final Completer<void> started = Completer();
         final Completer<void> ended = Completer();
-        bool startedBuffering = false;
-        bool endedBuffering = false;
         networkController.addListener(() {
-          if (networkController.value.isBuffering && !startedBuffering) {
-            startedBuffering = true;
+          if (!started.isCompleted && networkController.value.isBuffering) {
             started.complete();
           }
-          if (startedBuffering &&
+          if (started.isCompleted &&
               !networkController.value.isBuffering &&
-              !endedBuffering) {
-            endedBuffering = true;
+              !ended.isCompleted) {
             ended.complete();
           }
         });
@@ -72,11 +68,8 @@ void main() {
         expect(networkController.value.position,
             (Duration position) => position > const Duration(seconds: 0));
 
-        await started;
-        expect(startedBuffering, true);
-
-        await ended;
-        expect(endedBuffering, true);
+        await expectLater(started.future, completes);
+        await expectLater(ended.future, completes);
       },
       skip: !(kIsWeb || defaultTargetPlatform == TargetPlatform.android),
     );