diff --git a/dev/integration_tests/flutter_gallery/lib/gallery/app.dart b/dev/integration_tests/flutter_gallery/lib/gallery/app.dart
index d639fb1956..4e21db42ae 100644
--- a/dev/integration_tests/flutter_gallery/lib/gallery/app.dart
+++ b/dev/integration_tests/flutter_gallery/lib/gallery/app.dart
@@ -138,6 +138,11 @@ class _GalleryAppState extends State<GalleryApp> {
     return ScopedModel<AppStateModel>(
       model: model,
       child: MaterialApp(
+        // The automatically applied scrollbars on desktop can cause a crash for
+        // demos where many scrollables are all attached to the same
+        // PrimaryScrollController. The gallery needs to be migrated before
+        // enabling this. https://github.com/flutter/gallery/issues/523
+        scrollBehavior: const MaterialScrollBehavior().copyWith(scrollbars: false),
         theme: kLightGalleryTheme.copyWith(platform: _options!.platform, visualDensity: _options!.visualDensity!.visualDensity),
         darkTheme: kDarkGalleryTheme.copyWith(platform: _options!.platform, visualDensity: _options!.visualDensity!.visualDensity),
         themeMode: _options!.themeMode,
diff --git a/dev/integration_tests/flutter_gallery/test/simple_smoke_test.dart b/dev/integration_tests/flutter_gallery/test/simple_smoke_test.dart
index d6f5c31576..9658321606 100644
--- a/dev/integration_tests/flutter_gallery/test/simple_smoke_test.dart
+++ b/dev/integration_tests/flutter_gallery/test/simple_smoke_test.dart
@@ -55,5 +55,5 @@ void main() {
     await tester.pump(const Duration(milliseconds: 200));
 
     await tester.pump(const Duration(hours: 100)); // for testing
-  });
+  }, variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.android, TargetPlatform.macOS }));
 }