diff --git a/packages/flutter/test/material/date_picker_test.dart b/packages/flutter/test/material/date_picker_test.dart
index 43ec31e7cc0..cd583e3285b 100644
--- a/packages/flutter/test/material/date_picker_test.dart
+++ b/packages/flutter/test/material/date_picker_test.dart
@@ -884,6 +884,7 @@ void main() {
   group('Semantics', () {
     testWidgets('calendar day mode', (WidgetTester tester) async {
       final SemanticsHandle semantics = tester.ensureSemantics();
+      addTearDown(semantics.dispose);
 
       await prepareDatePicker(tester, (Future<DateTime> date) async {
         // Header
@@ -1096,12 +1097,11 @@ void main() {
           isFocusable: true,
         ));
       });
-
-      semantics.dispose();
     });
 
     testWidgets('calendar year mode', (WidgetTester tester) async {
       final SemanticsHandle semantics = tester.ensureSemantics();
+      addTearDown(semantics.dispose);
 
       initialCalendarMode = DatePickerMode.year;
       await prepareDatePicker(tester, (Future<DateTime> date) async {
@@ -1153,14 +1153,12 @@ void main() {
           hasEnabledState: true,
           isFocusable: true,
         ));
-
       });
-
-      semantics.dispose();
     });
 
     testWidgets('input mode', (WidgetTester tester) async {
       final SemanticsHandle semantics = tester.ensureSemantics();
+      addTearDown(semantics.dispose);
 
       initialEntryMode = DatePickerEntryMode.input;
       await prepareDatePicker(tester, (Future<DateTime> date) async {
@@ -1211,10 +1209,7 @@ void main() {
           hasEnabledState: true,
           isFocusable: true,
         ));
-
       });
-
-      semantics.dispose();
     });
   });
 
@@ -1416,9 +1411,9 @@ void main() {
 
     Future<void> _showPicker(WidgetTester tester, Size size, [double textScaleFactor = 1.0]) async {
       tester.binding.window.physicalSizeTestValue = size;
+      addTearDown(tester.binding.window.clearPhysicalSizeTestValue);
       tester.binding.window.devicePixelRatioTestValue = 1.0;
-      tester.binding.window.clearPhysicalSizeTestValue();
-      tester.binding.window.clearDevicePixelRatioTestValue();
+      addTearDown(tester.binding.window.clearDevicePixelRatioTestValue);
       await prepareDatePicker(tester, (Future<DateTime> date) async {
         await tester.tap(find.text('OK'));
       });
diff --git a/packages/flutter_localizations/test/material/date_picker_test.dart b/packages/flutter_localizations/test/material/date_picker_test.dart
index 172ea203961..af1cc74e5c9 100644
--- a/packages/flutter_localizations/test/material/date_picker_test.dart
+++ b/packages/flutter_localizations/test/material/date_picker_test.dart
@@ -232,7 +232,9 @@ void main() {
 
     Future<void> _showPicker(WidgetTester tester, Locale locale, Size size) async {
       tester.binding.window.physicalSizeTestValue = size;
+      addTearDown(tester.binding.window.clearPhysicalSizeTestValue);
       tester.binding.window.devicePixelRatioTestValue = 1.0;
+      addTearDown(tester.binding.window.clearDevicePixelRatioTestValue);
       await tester.pumpWidget(
         MaterialApp(
           home: Builder(