diff --git a/dev/bots/test.dart b/dev/bots/test.dart
index 9bdbef1b9c..db8ded9f17 100644
--- a/dev/bots/test.dart
+++ b/dev/bots/test.dart
@@ -592,7 +592,7 @@ Future<void> _pubRunTest(
       args.addAll(<String>['--exclude-tags', 'integration']);
       break;
     case 'create':
-      args.addAll(<String>[path.join('test', 'commands', 'create_test.dart')]);
+      args.addAll(<String>[path.join('test', 'general.shard', 'commands', 'create_test.dart')]);
       break;
   }
 
diff --git a/packages/flutter_tools/test/analytics_test.dart b/packages/flutter_tools/test/general.shard/analytics_test.dart
similarity index 99%
rename from packages/flutter_tools/test/analytics_test.dart
rename to packages/flutter_tools/test/general.shard/analytics_test.dart
index 79d9c26fd2..4c4cd53ebb 100644
--- a/packages/flutter_tools/test/analytics_test.dart
+++ b/packages/flutter_tools/test/general.shard/analytics_test.dart
@@ -16,8 +16,8 @@ import 'package:flutter_tools/src/runner/flutter_command.dart';
 import 'package:flutter_tools/src/usage.dart';
 import 'package:flutter_tools/src/version.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 void main() {
   group('analytics', () {
diff --git a/packages/flutter_tools/test/android/android_device_test.dart b/packages/flutter_tools/test/general.shard/android/android_device_test.dart
similarity index 99%
rename from packages/flutter_tools/test/android/android_device_test.dart
rename to packages/flutter_tools/test/general.shard/android/android_device_test.dart
index f04ea40258..c43957341d 100644
--- a/packages/flutter_tools/test/android/android_device_test.dart
+++ b/packages/flutter_tools/test/general.shard/android/android_device_test.dart
@@ -19,9 +19,9 @@ import 'package:flutter_tools/src/project.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   group('android_device', () {
diff --git a/packages/flutter_tools/test/android/android_emulator_test.dart b/packages/flutter_tools/test/general.shard/android/android_emulator_test.dart
similarity index 97%
rename from packages/flutter_tools/test/android/android_emulator_test.dart
rename to packages/flutter_tools/test/general.shard/android/android_emulator_test.dart
index c82e9ebffb..cee950b54a 100644
--- a/packages/flutter_tools/test/android/android_emulator_test.dart
+++ b/packages/flutter_tools/test/general.shard/android/android_emulator_test.dart
@@ -5,8 +5,8 @@
 import 'package:flutter_tools/src/android/android_emulator.dart';
 import 'package:flutter_tools/src/device.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group('android_emulator', () {
diff --git a/packages/flutter_tools/test/android/android_sdk_test.dart b/packages/flutter_tools/test/general.shard/android/android_sdk_test.dart
similarity index 99%
rename from packages/flutter_tools/test/android/android_sdk_test.dart
rename to packages/flutter_tools/test/general.shard/android/android_sdk_test.dart
index 0a7578bfd9..e08151bfce 100644
--- a/packages/flutter_tools/test/android/android_sdk_test.dart
+++ b/packages/flutter_tools/test/general.shard/android/android_sdk_test.dart
@@ -11,9 +11,9 @@ import 'package:flutter_tools/src/base/config.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 class MockProcessManager extends Mock implements ProcessManager {}
 
diff --git a/packages/flutter_tools/test/android/android_studio_test.dart b/packages/flutter_tools/test/general.shard/android/android_studio_test.dart
similarity index 99%
rename from packages/flutter_tools/test/android/android_studio_test.dart
rename to packages/flutter_tools/test/general.shard/android/android_studio_test.dart
index 39b99d8adf..69a7a8d938 100644
--- a/packages/flutter_tools/test/android/android_studio_test.dart
+++ b/packages/flutter_tools/test/general.shard/android/android_studio_test.dart
@@ -9,8 +9,8 @@ import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/ios/ios_workflow.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 const String homeLinux = '/home/me';
 const String homeMac = '/Users/me';
diff --git a/packages/flutter_tools/test/android/android_studio_validator_test.dart b/packages/flutter_tools/test/general.shard/android/android_studio_validator_test.dart
similarity index 94%
rename from packages/flutter_tools/test/android/android_studio_validator_test.dart
rename to packages/flutter_tools/test/general.shard/android/android_studio_validator_test.dart
index 138996e274..49d5691a6b 100644
--- a/packages/flutter_tools/test/android/android_studio_validator_test.dart
+++ b/packages/flutter_tools/test/general.shard/android/android_studio_validator_test.dart
@@ -6,8 +6,8 @@ import 'package:flutter_tools/src/doctor.dart';
 import 'package:flutter_tools/src/android/android_studio_validator.dart';
 import 'package:flutter_tools/src/base/platform.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 const String home = '/home/me';
 
diff --git a/packages/flutter_tools/test/android/android_workflow_test.dart b/packages/flutter_tools/test/general.shard/android/android_workflow_test.dart
similarity index 98%
rename from packages/flutter_tools/test/android/android_workflow_test.dart
rename to packages/flutter_tools/test/general.shard/android/android_workflow_test.dart
index 7a5e2c89ed..3ebd229987 100644
--- a/packages/flutter_tools/test/android/android_workflow_test.dart
+++ b/packages/flutter_tools/test/general.shard/android/android_workflow_test.dart
@@ -16,9 +16,9 @@ import 'package:mockito/mockito.dart';
 import 'package:platform/platform.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart' show MockAndroidSdk, MockProcess, MockProcessManager, MockStdio;
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart' show MockAndroidSdk, MockProcess, MockProcessManager, MockStdio;
 
 class MockAndroidSdkVersion extends Mock implements AndroidSdkVersion {}
 
diff --git a/packages/flutter_tools/test/android/gradle_test.dart b/packages/flutter_tools/test/general.shard/android/gradle_test.dart
similarity index 99%
rename from packages/flutter_tools/test/android/gradle_test.dart
rename to packages/flutter_tools/test/general.shard/android/gradle_test.dart
index 36e6146b17..b09f73ffc7 100644
--- a/packages/flutter_tools/test/android/gradle_test.dart
+++ b/packages/flutter_tools/test/general.shard/android/gradle_test.dart
@@ -16,9 +16,9 @@ import 'package:mockito/mockito.dart';
 import 'package:platform/platform.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/pubspec_schema.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/pubspec_schema.dart';
 
 void main() {
   Cache.flutterRoot = getFlutterRoot();
diff --git a/packages/flutter_tools/test/application_package_test.dart b/packages/flutter_tools/test/general.shard/application_package_test.dart
similarity index 99%
rename from packages/flutter_tools/test/application_package_test.dart
rename to packages/flutter_tools/test/general.shard/application_package_test.dart
index 92c65cc74d..620ee3f05f 100644
--- a/packages/flutter_tools/test/application_package_test.dart
+++ b/packages/flutter_tools/test/general.shard/application_package_test.dart
@@ -23,8 +23,8 @@ import 'package:flutter_tools/src/base/os.dart';
 import 'package:flutter_tools/src/ios/ios_workflow.dart';
 import 'package:process/process.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 final Generator _kNoColorTerminalPlatform = () => FakePlatform.fromPlatform(const LocalPlatform())..stdoutSupportsAnsi = false;
 final Map<Type, Generator> noColorTerminalOverride = <Type, Generator>{
diff --git a/packages/flutter_tools/test/artifacts_test.dart b/packages/flutter_tools/test/general.shard/artifacts_test.dart
similarity index 98%
rename from packages/flutter_tools/test/artifacts_test.dart
rename to packages/flutter_tools/test/general.shard/artifacts_test.dart
index fcc6c8f1d8..fc522c8e17 100644
--- a/packages/flutter_tools/test/artifacts_test.dart
+++ b/packages/flutter_tools/test/general.shard/artifacts_test.dart
@@ -8,8 +8,8 @@ import 'package:flutter_tools/src/build_info.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/artifacts.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 void main() {
   group('CachedArtifacts', () {
diff --git a/packages/flutter_tools/test/asset_bundle_package_fonts_test.dart b/packages/flutter_tools/test/general.shard/asset_bundle_package_fonts_test.dart
similarity index 99%
rename from packages/flutter_tools/test/asset_bundle_package_fonts_test.dart
rename to packages/flutter_tools/test/general.shard/asset_bundle_package_fonts_test.dart
index 648a092549..9e505861ee 100644
--- a/packages/flutter_tools/test/asset_bundle_package_fonts_test.dart
+++ b/packages/flutter_tools/test/general.shard/asset_bundle_package_fonts_test.dart
@@ -13,9 +13,9 @@ import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/cache.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
-import 'src/pubspec_schema.dart';
+import '../src/common.dart';
+import '../src/context.dart';
+import '../src/pubspec_schema.dart';
 
 void main() {
   String fixPath(String path) {
diff --git a/packages/flutter_tools/test/asset_bundle_package_test.dart b/packages/flutter_tools/test/general.shard/asset_bundle_package_test.dart
similarity index 99%
rename from packages/flutter_tools/test/asset_bundle_package_test.dart
rename to packages/flutter_tools/test/general.shard/asset_bundle_package_test.dart
index 2ea79460ec..4c48cdadd1 100644
--- a/packages/flutter_tools/test/asset_bundle_package_test.dart
+++ b/packages/flutter_tools/test/general.shard/asset_bundle_package_test.dart
@@ -13,9 +13,9 @@ import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/cache.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
-import 'src/pubspec_schema.dart';
+import '../src/common.dart';
+import '../src/context.dart';
+import '../src/pubspec_schema.dart';
 
 void main() {
   String fixPath(String path) {
diff --git a/packages/flutter_tools/test/asset_bundle_test.dart b/packages/flutter_tools/test/general.shard/asset_bundle_test.dart
similarity index 98%
rename from packages/flutter_tools/test/asset_bundle_test.dart
rename to packages/flutter_tools/test/general.shard/asset_bundle_test.dart
index f4e60c2bed..3ffd01f9ef 100644
--- a/packages/flutter_tools/test/asset_bundle_test.dart
+++ b/packages/flutter_tools/test/general.shard/asset_bundle_test.dart
@@ -13,8 +13,8 @@ import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/cache.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 void main() {
   setUpAll(() {
diff --git a/packages/flutter_tools/test/asset_bundle_variant_test.dart b/packages/flutter_tools/test/general.shard/asset_bundle_variant_test.dart
similarity index 96%
rename from packages/flutter_tools/test/asset_bundle_variant_test.dart
rename to packages/flutter_tools/test/general.shard/asset_bundle_variant_test.dart
index 9a7b9f5335..a2b37f126c 100644
--- a/packages/flutter_tools/test/asset_bundle_variant_test.dart
+++ b/packages/flutter_tools/test/general.shard/asset_bundle_variant_test.dart
@@ -12,9 +12,9 @@ import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/cache.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
-import 'src/pubspec_schema.dart';
+import '../src/common.dart';
+import '../src/context.dart';
+import '../src/pubspec_schema.dart';
 
 void main() {
   String fixPath(String path) {
diff --git a/packages/flutter_tools/test/asset_test.dart b/packages/flutter_tools/test/general.shard/asset_test.dart
similarity index 97%
rename from packages/flutter_tools/test/asset_test.dart
rename to packages/flutter_tools/test/general.shard/asset_test.dart
index bb8f2598e3..65782de542 100644
--- a/packages/flutter_tools/test/asset_test.dart
+++ b/packages/flutter_tools/test/general.shard/asset_test.dart
@@ -8,8 +8,8 @@ import 'package:flutter_tools/src/asset.dart';
 import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/cache.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 void main() {
   group('Assets', () {
diff --git a/packages/flutter_tools/test/base/build_test.dart b/packages/flutter_tools/test/general.shard/base/build_test.dart
similarity index 99%
rename from packages/flutter_tools/test/base/build_test.dart
rename to packages/flutter_tools/test/general.shard/base/build_test.dart
index 956f2713a8..13f96b9e26 100644
--- a/packages/flutter_tools/test/base/build_test.dart
+++ b/packages/flutter_tools/test/general.shard/base/build_test.dart
@@ -18,8 +18,8 @@ import 'package:flutter_tools/src/macos/xcode.dart';
 import 'package:flutter_tools/src/version.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 class MockFlutterVersion extends Mock implements FlutterVersion {}
 class MockAndroidSdk extends Mock implements AndroidSdk {}
diff --git a/packages/flutter_tools/test/base/common_test.dart b/packages/flutter_tools/test/general.shard/base/common_test.dart
similarity index 96%
rename from packages/flutter_tools/test/base/common_test.dart
rename to packages/flutter_tools/test/general.shard/base/common_test.dart
index 91ea07a611..76f9fd70e0 100644
--- a/packages/flutter_tools/test/base/common_test.dart
+++ b/packages/flutter_tools/test/general.shard/base/common_test.dart
@@ -4,7 +4,7 @@
 
 import 'package:flutter_tools/src/base/common.dart';
 
-import '../src/common.dart';
+import '../../src/common.dart';
 
 void main() {
   group('throwToolExit', () {
diff --git a/packages/flutter_tools/test/base/context_test.dart b/packages/flutter_tools/test/general.shard/base/context_test.dart
similarity index 99%
rename from packages/flutter_tools/test/base/context_test.dart
rename to packages/flutter_tools/test/general.shard/base/context_test.dart
index db2692bdcf..c8b46ff1bb 100644
--- a/packages/flutter_tools/test/base/context_test.dart
+++ b/packages/flutter_tools/test/general.shard/base/context_test.dart
@@ -6,7 +6,7 @@ import 'dart:async';
 
 import 'package:flutter_tools/src/base/context.dart';
 
-import '../src/common.dart';
+import '../../src/common.dart';
 
 void main() {
   group('AppContext', () {
diff --git a/packages/flutter_tools/test/base/file_system_test.dart b/packages/flutter_tools/test/general.shard/base/file_system_test.dart
similarity index 98%
rename from packages/flutter_tools/test/base/file_system_test.dart
rename to packages/flutter_tools/test/general.shard/base/file_system_test.dart
index a607e8d6f6..09126acb6d 100644
--- a/packages/flutter_tools/test/base/file_system_test.dart
+++ b/packages/flutter_tools/test/general.shard/base/file_system_test.dart
@@ -6,8 +6,8 @@ import 'package:file/memory.dart';
 import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:platform/platform.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group('ensureDirectoryExists', () {
diff --git a/packages/flutter_tools/test/base/fingerprint_test.dart b/packages/flutter_tools/test/general.shard/base/fingerprint_test.dart
similarity index 99%
rename from packages/flutter_tools/test/base/fingerprint_test.dart
rename to packages/flutter_tools/test/general.shard/base/fingerprint_test.dart
index 2397cfc8ef..9c1f5a8f02 100644
--- a/packages/flutter_tools/test/base/fingerprint_test.dart
+++ b/packages/flutter_tools/test/general.shard/base/fingerprint_test.dart
@@ -12,8 +12,8 @@ import 'package:flutter_tools/src/base/fingerprint.dart';
 import 'package:flutter_tools/src/version.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group('Fingerprinter', () {
diff --git a/packages/flutter_tools/test/base/flags_test.dart b/packages/flutter_tools/test/general.shard/base/flags_test.dart
similarity index 97%
rename from packages/flutter_tools/test/base/flags_test.dart
rename to packages/flutter_tools/test/general.shard/base/flags_test.dart
index 0bea2ab334..b864a07be6 100644
--- a/packages/flutter_tools/test/base/flags_test.dart
+++ b/packages/flutter_tools/test/general.shard/base/flags_test.dart
@@ -8,8 +8,8 @@ import 'package:flutter_tools/src/base/flags.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/runner/flutter_command.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 typedef _TestMethod = FutureOr<void> Function();
 
diff --git a/packages/flutter_tools/test/base/io_test.dart b/packages/flutter_tools/test/general.shard/base/io_test.dart
similarity index 94%
rename from packages/flutter_tools/test/base/io_test.dart
rename to packages/flutter_tools/test/general.shard/base/io_test.dart
index 21013d5829..f70a378527 100644
--- a/packages/flutter_tools/test/base/io_test.dart
+++ b/packages/flutter_tools/test/general.shard/base/io_test.dart
@@ -8,8 +8,8 @@ import 'dart:io' as io;
 import 'package:flutter_tools/src/base/io.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group('ProcessSignal', () {
diff --git a/packages/flutter_tools/test/base/logger_test.dart b/packages/flutter_tools/test/general.shard/base/logger_test.dart
similarity index 99%
rename from packages/flutter_tools/test/base/logger_test.dart
rename to packages/flutter_tools/test/general.shard/base/logger_test.dart
index bc28248220..3e36fee5f6 100644
--- a/packages/flutter_tools/test/base/logger_test.dart
+++ b/packages/flutter_tools/test/general.shard/base/logger_test.dart
@@ -11,9 +11,9 @@ import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/base/terminal.dart';
 import 'package:quiver/testing/async.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 final Generator _kNoAnsiPlatform = () => FakePlatform.fromPlatform(const LocalPlatform())..stdoutSupportsAnsi = false;
 
diff --git a/packages/flutter_tools/test/base/logs_test.dart b/packages/flutter_tools/test/general.shard/base/logs_test.dart
similarity index 87%
rename from packages/flutter_tools/test/base/logs_test.dart
rename to packages/flutter_tools/test/general.shard/base/logs_test.dart
index ab503c66de..f0f3ad0b1c 100644
--- a/packages/flutter_tools/test/base/logs_test.dart
+++ b/packages/flutter_tools/test/general.shard/base/logs_test.dart
@@ -5,9 +5,9 @@
 import 'package:flutter_tools/src/base/common.dart';
 import 'package:flutter_tools/src/commands/logs.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   group('logs', () {
diff --git a/packages/flutter_tools/test/base/net_test.dart b/packages/flutter_tools/test/general.shard/base/net_test.dart
similarity index 99%
rename from packages/flutter_tools/test/base/net_test.dart
rename to packages/flutter_tools/test/general.shard/base/net_test.dart
index 46da5ff3c6..a7dc3c0bc6 100644
--- a/packages/flutter_tools/test/base/net_test.dart
+++ b/packages/flutter_tools/test/general.shard/base/net_test.dart
@@ -9,8 +9,8 @@ import 'package:flutter_tools/src/base/io.dart' as io;
 import 'package:flutter_tools/src/base/net.dart';
 import 'package:quiver/testing/async.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   testUsingContext('retry from 500', () async {
diff --git a/packages/flutter_tools/test/base/os_test.dart b/packages/flutter_tools/test/general.shard/base/os_test.dart
similarity index 98%
rename from packages/flutter_tools/test/base/os_test.dart
rename to packages/flutter_tools/test/general.shard/base/os_test.dart
index dcacba9ee8..04cf9acc18 100644
--- a/packages/flutter_tools/test/base/os_test.dart
+++ b/packages/flutter_tools/test/general.shard/base/os_test.dart
@@ -9,8 +9,8 @@ import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 import 'package:platform/platform.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 const String kExecutable = 'foo';
 const String kPath1 = '/bar/bin/$kExecutable';
diff --git a/packages/flutter_tools/test/base/os_utils_test.dart b/packages/flutter_tools/test/general.shard/base/os_utils_test.dart
similarity index 94%
rename from packages/flutter_tools/test/base/os_utils_test.dart
rename to packages/flutter_tools/test/general.shard/base/os_utils_test.dart
index ddfbefec2e..a3e7714f92 100644
--- a/packages/flutter_tools/test/base/os_utils_test.dart
+++ b/packages/flutter_tools/test/general.shard/base/os_utils_test.dart
@@ -6,8 +6,8 @@ import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/base/os.dart';
 import 'package:flutter_tools/src/base/platform.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group('OperatingSystemUtils', () {
diff --git a/packages/flutter_tools/test/base/process_test.dart b/packages/flutter_tools/test/general.shard/base/process_test.dart
similarity index 96%
rename from packages/flutter_tools/test/base/process_test.dart
rename to packages/flutter_tools/test/general.shard/base/process_test.dart
index c4be308c5a..8ffca5e785 100644
--- a/packages/flutter_tools/test/base/process_test.dart
+++ b/packages/flutter_tools/test/general.shard/base/process_test.dart
@@ -10,9 +10,9 @@ import 'package:flutter_tools/src/base/terminal.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart' show MockProcess, MockProcessManager;
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart' show MockProcess, MockProcessManager;
 
 void main() {
   group('process exceptions', () {
diff --git a/packages/flutter_tools/test/base/terminal_test.dart b/packages/flutter_tools/test/general.shard/base/terminal_test.dart
similarity index 99%
rename from packages/flutter_tools/test/base/terminal_test.dart
rename to packages/flutter_tools/test/general.shard/base/terminal_test.dart
index 61268eaa76..f189d2b170 100644
--- a/packages/flutter_tools/test/base/terminal_test.dart
+++ b/packages/flutter_tools/test/general.shard/base/terminal_test.dart
@@ -8,8 +8,8 @@ import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/base/terminal.dart';
 import 'package:flutter_tools/src/globals.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group('output preferences', () {
diff --git a/packages/flutter_tools/test/base/utils_test.dart b/packages/flutter_tools/test/general.shard/base/utils_test.dart
similarity index 95%
rename from packages/flutter_tools/test/base/utils_test.dart
rename to packages/flutter_tools/test/general.shard/base/utils_test.dart
index 8c1d885531..097d72f6b4 100644
--- a/packages/flutter_tools/test/base/utils_test.dart
+++ b/packages/flutter_tools/test/general.shard/base/utils_test.dart
@@ -7,9 +7,9 @@ import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/base/utils.dart';
 import 'package:platform/platform.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   group('BotDetector', () {
diff --git a/packages/flutter_tools/test/base_utils_test.dart b/packages/flutter_tools/test/general.shard/base_utils_test.dart
similarity index 97%
rename from packages/flutter_tools/test/base_utils_test.dart
rename to packages/flutter_tools/test/general.shard/base_utils_test.dart
index 8cb771aaa4..6e1192dead 100644
--- a/packages/flutter_tools/test/base_utils_test.dart
+++ b/packages/flutter_tools/test/general.shard/base_utils_test.dart
@@ -6,7 +6,7 @@ import 'dart:async';
 
 import 'package:flutter_tools/src/base/utils.dart';
 
-import 'src/common.dart';
+import '../src/common.dart';
 
 void main() {
   group('ItemListNotifier', () {
diff --git a/packages/flutter_tools/test/bug_report_test.dart b/packages/flutter_tools/test/general.shard/bug_report_test.dart
similarity index 94%
rename from packages/flutter_tools/test/bug_report_test.dart
rename to packages/flutter_tools/test/general.shard/bug_report_test.dart
index 86963ebadc..4ee8d33b9b 100644
--- a/packages/flutter_tools/test/bug_report_test.dart
+++ b/packages/flutter_tools/test/general.shard/bug_report_test.dart
@@ -10,8 +10,8 @@ import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/base/io.dart';
 import 'package:flutter_tools/src/base/os.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 void main() {
   Cache.disableLocking();
diff --git a/packages/flutter_tools/test/build_info_test.dart b/packages/flutter_tools/test/general.shard/build_info_test.dart
similarity index 96%
rename from packages/flutter_tools/test/build_info_test.dart
rename to packages/flutter_tools/test/general.shard/build_info_test.dart
index 854030e678..e4bc22af9d 100644
--- a/packages/flutter_tools/test/build_info_test.dart
+++ b/packages/flutter_tools/test/general.shard/build_info_test.dart
@@ -5,8 +5,8 @@
 
 import 'package:flutter_tools/src/build_info.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 void main() {
   setUpAll(() { });
diff --git a/packages/flutter_tools/test/build_runner/multiroot_asset_reader_test.dart b/packages/flutter_tools/test/general.shard/build_runner/multiroot_asset_reader_test.dart
similarity index 97%
rename from packages/flutter_tools/test/build_runner/multiroot_asset_reader_test.dart
rename to packages/flutter_tools/test/general.shard/build_runner/multiroot_asset_reader_test.dart
index 97e420fc74..09656b4843 100644
--- a/packages/flutter_tools/test/build_runner/multiroot_asset_reader_test.dart
+++ b/packages/flutter_tools/test/general.shard/build_runner/multiroot_asset_reader_test.dart
@@ -9,8 +9,8 @@ import 'package:build_runner_core/build_runner_core.dart';
 import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/build_runner/web_compilation_delegate.dart';
 
-import '../src/common.dart';
-import '../src/testbed.dart';
+import '../../src/common.dart';
+import '../../src/testbed.dart';
 
 void main() {
   group('MultirootFileBasedAssetReader', () {
diff --git a/packages/flutter_tools/test/build_system/build_system_test.dart b/packages/flutter_tools/test/general.shard/build_system/build_system_test.dart
similarity index 99%
rename from packages/flutter_tools/test/build_system/build_system_test.dart
rename to packages/flutter_tools/test/general.shard/build_system/build_system_test.dart
index e0c2ffa7ab..95ae9996dd 100644
--- a/packages/flutter_tools/test/build_system/build_system_test.dart
+++ b/packages/flutter_tools/test/general.shard/build_system/build_system_test.dart
@@ -14,9 +14,9 @@ import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/convert.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/testbed.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/testbed.dart';
 
 void main() {
   setUpAll(() {
diff --git a/packages/flutter_tools/test/build_system/exceptions_test.dart b/packages/flutter_tools/test/general.shard/build_system/exceptions_test.dart
similarity index 98%
rename from packages/flutter_tools/test/build_system/exceptions_test.dart
rename to packages/flutter_tools/test/general.shard/build_system/exceptions_test.dart
index 68486141e6..18de1fdeec 100644
--- a/packages/flutter_tools/test/build_system/exceptions_test.dart
+++ b/packages/flutter_tools/test/general.shard/build_system/exceptions_test.dart
@@ -6,7 +6,7 @@ import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/build_system/build_system.dart';
 import 'package:flutter_tools/src/build_system/exceptions.dart';
 
-import '../src/common.dart';
+import '../../src/common.dart';
 
 void main() {
   test('Exceptions', () {
diff --git a/packages/flutter_tools/test/build_system/targets/assets_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/assets_test.dart
similarity index 97%
rename from packages/flutter_tools/test/build_system/targets/assets_test.dart
rename to packages/flutter_tools/test/general.shard/build_system/targets/assets_test.dart
index 4302155803..a5b20345ae 100644
--- a/packages/flutter_tools/test/build_system/targets/assets_test.dart
+++ b/packages/flutter_tools/test/general.shard/build_system/targets/assets_test.dart
@@ -6,8 +6,8 @@ import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/build_system/build_system.dart';
 import 'package:flutter_tools/src/build_system/targets/assets.dart';
 
-import '../../src/common.dart';
-import '../../src/testbed.dart';
+import '../../../src/common.dart';
+import '../../../src/testbed.dart';
 
 void main() {
   group('copy_assets', () {
diff --git a/packages/flutter_tools/test/build_system/targets/dart_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/dart_test.dart
similarity index 98%
rename from packages/flutter_tools/test/build_system/targets/dart_test.dart
rename to packages/flutter_tools/test/general.shard/build_system/targets/dart_test.dart
index 0d742efb3f..585ac4839e 100644
--- a/packages/flutter_tools/test/build_system/targets/dart_test.dart
+++ b/packages/flutter_tools/test/general.shard/build_system/targets/dart_test.dart
@@ -15,9 +15,9 @@ import 'package:flutter_tools/src/project.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../../src/common.dart';
-import '../../src/mocks.dart';
-import '../../src/testbed.dart';
+import '../../../src/common.dart';
+import '../../../src/mocks.dart';
+import '../../../src/testbed.dart';
 
 void main() {
   group('dart rules', () {
diff --git a/packages/flutter_tools/test/build_system/targets/linux_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/linux_test.dart
similarity index 98%
rename from packages/flutter_tools/test/build_system/targets/linux_test.dart
rename to packages/flutter_tools/test/general.shard/build_system/targets/linux_test.dart
index 4b22c9aee7..801f12ac96 100644
--- a/packages/flutter_tools/test/build_system/targets/linux_test.dart
+++ b/packages/flutter_tools/test/general.shard/build_system/targets/linux_test.dart
@@ -9,8 +9,8 @@ import 'package:flutter_tools/src/build_system/targets/linux.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:mockito/mockito.dart';
 
-import '../../src/common.dart';
-import '../../src/testbed.dart';
+import '../../../src/common.dart';
+import '../../../src/testbed.dart';
 
 void main() {
   group('unpack_linux', () {
diff --git a/packages/flutter_tools/test/build_system/targets/macos_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/macos_test.dart
similarity index 98%
rename from packages/flutter_tools/test/build_system/targets/macos_test.dart
rename to packages/flutter_tools/test/general.shard/build_system/targets/macos_test.dart
index 5deadb5342..6d656b3eda 100644
--- a/packages/flutter_tools/test/build_system/targets/macos_test.dart
+++ b/packages/flutter_tools/test/general.shard/build_system/targets/macos_test.dart
@@ -11,8 +11,8 @@ import 'package:flutter_tools/src/build_system/targets/macos.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../../src/common.dart';
-import '../../src/testbed.dart';
+import '../../../src/common.dart';
+import '../../../src/testbed.dart';
 
 void main() {
   group('unpack_macos', () {
diff --git a/packages/flutter_tools/test/build_system/targets/windows_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/windows_test.dart
similarity index 98%
rename from packages/flutter_tools/test/build_system/targets/windows_test.dart
rename to packages/flutter_tools/test/general.shard/build_system/targets/windows_test.dart
index f46896ad4e..c167f4c30f 100644
--- a/packages/flutter_tools/test/build_system/targets/windows_test.dart
+++ b/packages/flutter_tools/test/general.shard/build_system/targets/windows_test.dart
@@ -10,8 +10,8 @@ import 'package:flutter_tools/src/build_system/targets/windows.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:mockito/mockito.dart';
 
-import '../../src/common.dart';
-import '../../src/testbed.dart';
+import '../../../src/common.dart';
+import '../../../src/testbed.dart';
 
 void main() {
   group('unpack_windows', () {
diff --git a/packages/flutter_tools/test/cache_test.dart b/packages/flutter_tools/test/general.shard/cache_test.dart
similarity index 99%
rename from packages/flutter_tools/test/cache_test.dart
rename to packages/flutter_tools/test/general.shard/cache_test.dart
index a95964a551..18b97b6768 100644
--- a/packages/flutter_tools/test/cache_test.dart
+++ b/packages/flutter_tools/test/general.shard/cache_test.dart
@@ -12,8 +12,8 @@ import 'package:platform/platform.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/base/io.dart' show InternetAddress, SocketException;
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 void main() {
   group('$Cache.checkLockAcquired', () {
diff --git a/packages/flutter_tools/test/channel_test.dart b/packages/flutter_tools/test/general.shard/channel_test.dart
similarity index 99%
rename from packages/flutter_tools/test/channel_test.dart
rename to packages/flutter_tools/test/general.shard/channel_test.dart
index 45306ee65e..64dd560979 100644
--- a/packages/flutter_tools/test/channel_test.dart
+++ b/packages/flutter_tools/test/general.shard/channel_test.dart
@@ -15,8 +15,8 @@ import 'package:flutter_tools/src/version.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 Process createMockProcess({ int exitCode = 0, String stdout = '', String stderr = '' }) {
   final Stream<List<int>> stdoutStream = Stream<List<int>>.fromIterable(<List<int>>[
diff --git a/packages/flutter_tools/test/commands/analyze_continuously_test.dart b/packages/flutter_tools/test/general.shard/commands/analyze_continuously_test.dart
similarity index 98%
rename from packages/flutter_tools/test/commands/analyze_continuously_test.dart
rename to packages/flutter_tools/test/general.shard/commands/analyze_continuously_test.dart
index 7fa979af86..05a49bfe4c 100644
--- a/packages/flutter_tools/test/commands/analyze_continuously_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/analyze_continuously_test.dart
@@ -11,8 +11,8 @@ import 'package:flutter_tools/src/dart/pub.dart';
 import 'package:flutter_tools/src/dart/sdk.dart';
 import 'package:flutter_tools/src/runner/flutter_command_runner.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   AnalysisServer server;
diff --git a/packages/flutter_tools/test/commands/analyze_once_test.dart b/packages/flutter_tools/test/general.shard/commands/analyze_once_test.dart
similarity index 99%
rename from packages/flutter_tools/test/commands/analyze_once_test.dart
rename to packages/flutter_tools/test/general.shard/commands/analyze_once_test.dart
index 7c52c4496e..d783d64fa2 100644
--- a/packages/flutter_tools/test/commands/analyze_once_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/analyze_once_test.dart
@@ -12,8 +12,8 @@ import 'package:flutter_tools/src/commands/analyze.dart';
 import 'package:flutter_tools/src/commands/create.dart';
 import 'package:flutter_tools/src/runner/flutter_command.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 /// Test case timeout for tests involving project analysis.
 const Timeout allowForSlowAnalyzeTests = Timeout.factor(5.0);
diff --git a/packages/flutter_tools/test/commands/analyze_test.dart b/packages/flutter_tools/test/general.shard/commands/analyze_test.dart
similarity index 95%
rename from packages/flutter_tools/test/commands/analyze_test.dart
rename to packages/flutter_tools/test/general.shard/commands/analyze_test.dart
index 115a3d0c47..ee246159f7 100644
--- a/packages/flutter_tools/test/commands/analyze_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/analyze_test.dart
@@ -7,8 +7,8 @@ import 'package:file/memory.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/commands/analyze_base.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 const String _kFlutterRoot = '/data/flutter';
 
diff --git a/packages/flutter_tools/test/commands/assemble_test.dart b/packages/flutter_tools/test/general.shard/commands/assemble_test.dart
similarity index 98%
rename from packages/flutter_tools/test/commands/assemble_test.dart
rename to packages/flutter_tools/test/general.shard/commands/assemble_test.dart
index 366eda7780..e18ebb51d1 100644
--- a/packages/flutter_tools/test/commands/assemble_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/assemble_test.dart
@@ -12,8 +12,8 @@ import 'package:flutter_tools/src/commands/assemble.dart';
 import 'package:flutter_tools/src/globals.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/testbed.dart';
+import '../../src/common.dart';
+import '../../src/testbed.dart';
 
 void main() {
   group('Assemble', () {
diff --git a/packages/flutter_tools/test/commands/attach_test.dart b/packages/flutter_tools/test/general.shard/commands/attach_test.dart
similarity index 99%
rename from packages/flutter_tools/test/commands/attach_test.dart
rename to packages/flutter_tools/test/general.shard/commands/attach_test.dart
index ecd9df9b2e..c708f1e573 100644
--- a/packages/flutter_tools/test/commands/attach_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/attach_test.dart
@@ -19,9 +19,9 @@ import 'package:meta/meta.dart';
 import 'package:mockito/mockito.dart';
 import 'package:multicast_dns/multicast_dns.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   group('attach', () {
diff --git a/packages/flutter_tools/test/commands/build_bundle_test.dart b/packages/flutter_tools/test/general.shard/commands/build_bundle_test.dart
similarity index 98%
rename from packages/flutter_tools/test/commands/build_bundle_test.dart
rename to packages/flutter_tools/test/general.shard/commands/build_bundle_test.dart
index 5000eb9d7d..6c6c8ad25c 100644
--- a/packages/flutter_tools/test/commands/build_bundle_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/build_bundle_test.dart
@@ -10,8 +10,8 @@ import 'package:flutter_tools/src/bundle.dart';
 import 'package:flutter_tools/src/usage.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   Cache.disableLocking();
diff --git a/packages/flutter_tools/test/commands/build_fuchsia_test.dart b/packages/flutter_tools/test/general.shard/commands/build_fuchsia_test.dart
similarity index 98%
rename from packages/flutter_tools/test/commands/build_fuchsia_test.dart
rename to packages/flutter_tools/test/general.shard/commands/build_fuchsia_test.dart
index 0914562151..3734d04d19 100644
--- a/packages/flutter_tools/test/commands/build_fuchsia_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/build_fuchsia_test.dart
@@ -16,9 +16,9 @@ import 'package:flutter_tools/src/project.dart';
 import 'package:meta/meta.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   Cache.disableLocking();
diff --git a/packages/flutter_tools/test/commands/build_linux_test.dart b/packages/flutter_tools/test/general.shard/commands/build_linux_test.dart
similarity index 97%
rename from packages/flutter_tools/test/commands/build_linux_test.dart
rename to packages/flutter_tools/test/general.shard/commands/build_linux_test.dart
index 312d1d2ea9..638a20be20 100644
--- a/packages/flutter_tools/test/commands/build_linux_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/build_linux_test.dart
@@ -14,9 +14,9 @@ import 'package:flutter_tools/src/project.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   MockProcessManager mockProcessManager;
diff --git a/packages/flutter_tools/test/commands/build_macos_test.dart b/packages/flutter_tools/test/general.shard/commands/build_macos_test.dart
similarity index 97%
rename from packages/flutter_tools/test/commands/build_macos_test.dart
rename to packages/flutter_tools/test/general.shard/commands/build_macos_test.dart
index a461131ab5..ceb07b86d3 100644
--- a/packages/flutter_tools/test/commands/build_macos_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/build_macos_test.dart
@@ -14,9 +14,9 @@ import 'package:flutter_tools/src/project.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   MockProcessManager mockProcessManager;
diff --git a/packages/flutter_tools/test/commands/build_web_test.dart b/packages/flutter_tools/test/general.shard/commands/build_web_test.dart
similarity index 98%
rename from packages/flutter_tools/test/commands/build_web_test.dart
rename to packages/flutter_tools/test/general.shard/commands/build_web_test.dart
index a33cddbe75..2adb8181f8 100644
--- a/packages/flutter_tools/test/commands/build_web_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/build_web_test.dart
@@ -15,8 +15,8 @@ import 'package:flutter_tools/src/version.dart';
 import 'package:flutter_tools/src/web/compile.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/testbed.dart';
+import '../../src/common.dart';
+import '../../src/testbed.dart';
 
 void main() {
   MockWebCompilationProxy mockWebCompilationProxy;
diff --git a/packages/flutter_tools/test/commands/build_windows_test.dart b/packages/flutter_tools/test/general.shard/commands/build_windows_test.dart
similarity index 98%
rename from packages/flutter_tools/test/commands/build_windows_test.dart
rename to packages/flutter_tools/test/general.shard/commands/build_windows_test.dart
index 7784797e61..301fa7d42a 100644
--- a/packages/flutter_tools/test/commands/build_windows_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/build_windows_test.dart
@@ -14,9 +14,9 @@ import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 import 'package:xml/xml.dart' as xml;
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   MockProcessManager mockProcessManager;
diff --git a/packages/flutter_tools/test/commands/clean_test.dart b/packages/flutter_tools/test/general.shard/commands/clean_test.dart
similarity index 97%
rename from packages/flutter_tools/test/commands/clean_test.dart
rename to packages/flutter_tools/test/general.shard/commands/clean_test.dart
index e01129a9b7..85926c7975 100644
--- a/packages/flutter_tools/test/commands/clean_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/clean_test.dart
@@ -8,8 +8,8 @@ import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/commands/clean.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 
 void main() {
diff --git a/packages/flutter_tools/test/commands/config_test.dart b/packages/flutter_tools/test/general.shard/commands/config_test.dart
similarity index 96%
rename from packages/flutter_tools/test/commands/config_test.dart
rename to packages/flutter_tools/test/general.shard/commands/config_test.dart
index 78828b47a5..b95b4edbf0 100644
--- a/packages/flutter_tools/test/commands/config_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/config_test.dart
@@ -11,8 +11,8 @@ import 'package:flutter_tools/src/base/logger.dart';
 import 'package:flutter_tools/src/commands/config.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   MockAndroidStudio mockAndroidStudio;
diff --git a/packages/flutter_tools/test/commands/create_test.dart b/packages/flutter_tools/test/general.shard/commands/create_test.dart
similarity index 99%
rename from packages/flutter_tools/test/commands/create_test.dart
rename to packages/flutter_tools/test/general.shard/commands/create_test.dart
index c1676101a2..7a8c087ca8 100644
--- a/packages/flutter_tools/test/commands/create_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/create_test.dart
@@ -22,8 +22,8 @@ import 'package:flutter_tools/src/version.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 
 const String frameworkRevision = '12345678';
@@ -1063,7 +1063,7 @@ Future<void> _createProject(
   List<String> expectedPaths, {
   List<String> unexpectedPaths = const <String>[],
 }) async {
-  Cache.flutterRoot = '../..';
+  Cache.flutterRoot = '../../..';
   final CreateCommand command = CreateCommand();
   final CommandRunner<void> runner = createTestCommandRunner(command);
   await runner.run(<String>[
diff --git a/packages/flutter_tools/test/commands/create_usage_test.dart b/packages/flutter_tools/test/general.shard/commands/create_usage_test.dart
similarity index 98%
rename from packages/flutter_tools/test/commands/create_usage_test.dart
rename to packages/flutter_tools/test/general.shard/commands/create_usage_test.dart
index 5cc7bd280e..735cee5a63 100644
--- a/packages/flutter_tools/test/commands/create_usage_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/create_usage_test.dart
@@ -9,8 +9,8 @@ import 'package:flutter_tools/src/commands/create.dart';
 import 'package:flutter_tools/src/doctor.dart';
 import 'package:flutter_tools/src/usage.dart';
 
-import '../src/common.dart';
-import '../src/testbed.dart';
+import '../../src/common.dart';
+import '../../src/testbed.dart';
 
 
 void main() {
diff --git a/packages/flutter_tools/test/commands/daemon_test.dart b/packages/flutter_tools/test/general.shard/commands/daemon_test.dart
similarity index 99%
rename from packages/flutter_tools/test/commands/daemon_test.dart
rename to packages/flutter_tools/test/general.shard/commands/daemon_test.dart
index 0089d7a458..54aebdb6c5 100644
--- a/packages/flutter_tools/test/commands/daemon_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/daemon_test.dart
@@ -12,9 +12,9 @@ import 'package:flutter_tools/src/globals.dart';
 import 'package:flutter_tools/src/ios/ios_workflow.dart';
 import 'package:flutter_tools/src/resident_runner.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   Daemon daemon;
diff --git a/packages/flutter_tools/test/commands/devices_test.dart b/packages/flutter_tools/test/general.shard/commands/devices_test.dart
similarity index 97%
rename from packages/flutter_tools/test/commands/devices_test.dart
rename to packages/flutter_tools/test/general.shard/commands/devices_test.dart
index 86618a4d38..01bbb9a5d5 100644
--- a/packages/flutter_tools/test/commands/devices_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/devices_test.dart
@@ -13,8 +13,8 @@ import 'package:flutter_tools/src/device.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group('devices', () {
diff --git a/packages/flutter_tools/test/commands/doctor_test.dart b/packages/flutter_tools/test/general.shard/commands/doctor_test.dart
similarity index 99%
rename from packages/flutter_tools/test/commands/doctor_test.dart
rename to packages/flutter_tools/test/general.shard/commands/doctor_test.dart
index 3d38d582ec..5aa2a891a7 100644
--- a/packages/flutter_tools/test/commands/doctor_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/doctor_test.dart
@@ -20,8 +20,8 @@ import 'package:flutter_tools/src/vscode/vscode.dart';
 import 'package:flutter_tools/src/vscode/vscode_validator.dart';
 import 'package:flutter_tools/src/usage.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 final Generator _kNoColorOutputPlatform = () => FakePlatform.fromPlatform(const LocalPlatform())..stdoutSupportsAnsi = false;
 final Map<Type, Generator> noColorTerminalOverride = <Type, Generator>{
diff --git a/packages/flutter_tools/test/commands/drive_test.dart b/packages/flutter_tools/test/general.shard/commands/drive_test.dart
similarity index 99%
rename from packages/flutter_tools/test/commands/drive_test.dart
rename to packages/flutter_tools/test/general.shard/commands/drive_test.dart
index d7bf21b893..f6e39edd91 100644
--- a/packages/flutter_tools/test/commands/drive_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/drive_test.dart
@@ -15,9 +15,9 @@ import 'package:flutter_tools/src/commands/drive.dart';
 import 'package:flutter_tools/src/device.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   group('drive', () {
diff --git a/packages/flutter_tools/test/commands/format_test.dart b/packages/flutter_tools/test/general.shard/commands/format_test.dart
similarity index 97%
rename from packages/flutter_tools/test/commands/format_test.dart
rename to packages/flutter_tools/test/general.shard/commands/format_test.dart
index d20c73d14f..1817bbe2eb 100644
--- a/packages/flutter_tools/test/commands/format_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/format_test.dart
@@ -7,8 +7,8 @@ import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/commands/format.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group('format', () {
diff --git a/packages/flutter_tools/test/commands/ide_config_test.dart b/packages/flutter_tools/test/general.shard/commands/ide_config_test.dart
similarity index 99%
rename from packages/flutter_tools/test/commands/ide_config_test.dart
rename to packages/flutter_tools/test/general.shard/commands/ide_config_test.dart
index 0bed2322ad..dd6defa554 100644
--- a/packages/flutter_tools/test/commands/ide_config_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/ide_config_test.dart
@@ -10,8 +10,8 @@ import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/template.dart';
 import 'package:flutter_tools/src/commands/ide_config.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group('ide_config', () {
diff --git a/packages/flutter_tools/test/commands/install_test.dart b/packages/flutter_tools/test/general.shard/commands/install_test.dart
similarity index 94%
rename from packages/flutter_tools/test/commands/install_test.dart
rename to packages/flutter_tools/test/general.shard/commands/install_test.dart
index fa2e217a5e..2883259c6b 100644
--- a/packages/flutter_tools/test/commands/install_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/install_test.dart
@@ -6,9 +6,9 @@ import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/commands/install.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   group('install', () {
diff --git a/packages/flutter_tools/test/commands/packages_test.dart b/packages/flutter_tools/test/general.shard/commands/packages_test.dart
similarity index 99%
rename from packages/flutter_tools/test/commands/packages_test.dart
rename to packages/flutter_tools/test/general.shard/commands/packages_test.dart
index a508acbbd1..8e0269b6b3 100644
--- a/packages/flutter_tools/test/commands/packages_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/packages_test.dart
@@ -13,9 +13,9 @@ import 'package:flutter_tools/src/commands/packages.dart';
 import 'package:flutter_tools/src/usage.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart' show MockProcessManager, MockStdio, PromptingProcess;
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart' show MockProcessManager, MockStdio, PromptingProcess;
 
 class AlwaysTrueBotDetector implements BotDetector {
   const AlwaysTrueBotDetector();
diff --git a/packages/flutter_tools/test/commands/precache_test.dart b/packages/flutter_tools/test/general.shard/commands/precache_test.dart
similarity index 97%
rename from packages/flutter_tools/test/commands/precache_test.dart
rename to packages/flutter_tools/test/general.shard/commands/precache_test.dart
index 02d7ababe0..0308da6b2f 100644
--- a/packages/flutter_tools/test/commands/precache_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/precache_test.dart
@@ -8,9 +8,9 @@ import 'package:flutter_tools/src/runner/flutter_command.dart';
 import 'package:flutter_tools/src/version.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   group('precache', () {
diff --git a/packages/flutter_tools/test/commands/run_test.dart b/packages/flutter_tools/test/general.shard/commands/run_test.dart
similarity index 98%
rename from packages/flutter_tools/test/commands/run_test.dart
rename to packages/flutter_tools/test/general.shard/commands/run_test.dart
index 3e6cdf1836..b743a36c61 100644
--- a/packages/flutter_tools/test/commands/run_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/run_test.dart
@@ -13,9 +13,9 @@ import 'package:flutter_tools/src/runner/flutter_command.dart';
 import 'package:flutter_tools/src/version.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   group('run', () {
diff --git a/packages/flutter_tools/test/commands/shell_completion_test.dart b/packages/flutter_tools/test/general.shard/commands/shell_completion_test.dart
similarity index 97%
rename from packages/flutter_tools/test/commands/shell_completion_test.dart
rename to packages/flutter_tools/test/general.shard/commands/shell_completion_test.dart
index 6b1498be94..00b4aacfc1 100644
--- a/packages/flutter_tools/test/commands/shell_completion_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/shell_completion_test.dart
@@ -10,9 +10,9 @@ import 'package:flutter_tools/src/base/io.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/commands/shell_completion.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   group('shell_completion', () {
diff --git a/packages/flutter_tools/test/commands/test_test.dart b/packages/flutter_tools/test/general.shard/commands/test_test.dart
similarity index 99%
rename from packages/flutter_tools/test/commands/test_test.dart
rename to packages/flutter_tools/test/general.shard/commands/test_test.dart
index d5710fa798..348ce999ad 100644
--- a/packages/flutter_tools/test/commands/test_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/test_test.dart
@@ -10,8 +10,8 @@ import 'package:flutter_tools/src/base/io.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/dart/sdk.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 // This test depends on some files in ///dev/automated_tests/flutter_test/*
 
diff --git a/packages/flutter_tools/test/commands/update_packages_test.dart b/packages/flutter_tools/test/general.shard/commands/update_packages_test.dart
similarity index 89%
rename from packages/flutter_tools/test/commands/update_packages_test.dart
rename to packages/flutter_tools/test/general.shard/commands/update_packages_test.dart
index 0a1867ca7c..6097ba0136 100644
--- a/packages/flutter_tools/test/commands/update_packages_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/update_packages_test.dart
@@ -4,8 +4,8 @@
 
 import 'package:flutter_tools/src/commands/update_packages.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group('UpdatePackagesCommand', () {
diff --git a/packages/flutter_tools/test/commands/upgrade_test.dart b/packages/flutter_tools/test/general.shard/commands/upgrade_test.dart
similarity index 98%
rename from packages/flutter_tools/test/commands/upgrade_test.dart
rename to packages/flutter_tools/test/general.shard/commands/upgrade_test.dart
index 4c3fc8e491..ac9879d9fa 100644
--- a/packages/flutter_tools/test/commands/upgrade_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/upgrade_test.dart
@@ -13,8 +13,8 @@ import 'package:flutter_tools/src/version.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group('UpgradeCommandRunner', () {
diff --git a/packages/flutter_tools/test/commands/version_test.dart b/packages/flutter_tools/test/general.shard/commands/version_test.dart
similarity index 97%
rename from packages/flutter_tools/test/commands/version_test.dart
rename to packages/flutter_tools/test/general.shard/commands/version_test.dart
index 9f00c3dbc5..1e480046eb 100644
--- a/packages/flutter_tools/test/commands/version_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/version_test.dart
@@ -12,9 +12,9 @@ import 'package:flutter_tools/src/commands/version.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart' show MockProcess;
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart' show MockProcess;
 
 void main() {
   group('version', () {
diff --git a/packages/flutter_tools/test/compile_test.dart b/packages/flutter_tools/test/general.shard/compile_test.dart
similarity index 99%
rename from packages/flutter_tools/test/compile_test.dart
rename to packages/flutter_tools/test/general.shard/compile_test.dart
index a47ef0a82e..cb70e7f918 100644
--- a/packages/flutter_tools/test/compile_test.dart
+++ b/packages/flutter_tools/test/general.shard/compile_test.dart
@@ -16,8 +16,8 @@ import 'package:flutter_tools/src/compile.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 final Generator _kNoColorTerminalPlatform = () => FakePlatform.fromPlatform(const LocalPlatform())..stdoutSupportsAnsi = false;
 
diff --git a/packages/flutter_tools/test/config_test.dart b/packages/flutter_tools/test/general.shard/config_test.dart
similarity index 97%
rename from packages/flutter_tools/test/config_test.dart
rename to packages/flutter_tools/test/general.shard/config_test.dart
index 63e1d71980..8217375692 100644
--- a/packages/flutter_tools/test/config_test.dart
+++ b/packages/flutter_tools/test/general.shard/config_test.dart
@@ -5,7 +5,7 @@
 import 'package:flutter_tools/src/base/config.dart';
 import 'package:flutter_tools/src/base/file_system.dart';
 
-import 'src/common.dart';
+import '../src/common.dart';
 
 void main() {
   Config config;
diff --git a/packages/flutter_tools/test/coverage_collector_test.dart b/packages/flutter_tools/test/general.shard/coverage_collector_test.dart
similarity index 98%
rename from packages/flutter_tools/test/coverage_collector_test.dart
rename to packages/flutter_tools/test/general.shard/coverage_collector_test.dart
index ca0c33f3ab..1d277c0b5c 100644
--- a/packages/flutter_tools/test/coverage_collector_test.dart
+++ b/packages/flutter_tools/test/general.shard/coverage_collector_test.dart
@@ -9,7 +9,7 @@ import 'package:flutter_tools/src/test/coverage_collector.dart';
 import 'package:flutter_tools/src/vmservice.dart';
 import 'package:mockito/mockito.dart';
 
-import 'src/common.dart';
+import '../src/common.dart';
 
 void main() {
   MockVMService mockVMService;
@@ -48,4 +48,4 @@ class MockProcess extends Mock implements Process {
 
   @override
   Future<int> get exitCode => completer.future;
-}
\ No newline at end of file
+}
diff --git a/packages/flutter_tools/test/crash_reporting_test.dart b/packages/flutter_tools/test/general.shard/crash_reporting_test.dart
similarity index 99%
rename from packages/flutter_tools/test/crash_reporting_test.dart
rename to packages/flutter_tools/test/general.shard/crash_reporting_test.dart
index a427fd3f73..e9de43fae0 100644
--- a/packages/flutter_tools/test/crash_reporting_test.dart
+++ b/packages/flutter_tools/test/general.shard/crash_reporting_test.dart
@@ -21,8 +21,8 @@ import 'package:flutter_tools/src/crash_reporting.dart';
 import 'package:flutter_tools/src/runner/flutter_command.dart';
 import 'package:pedantic/pedantic.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 void main() {
   group('crash reporting', () {
diff --git a/packages/flutter_tools/test/dart/pub_get_test.dart b/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart
similarity index 99%
rename from packages/flutter_tools/test/dart/pub_get_test.dart
rename to packages/flutter_tools/test/general.shard/dart/pub_get_test.dart
index 67cf5d0aa8..48093cafd8 100644
--- a/packages/flutter_tools/test/dart/pub_get_test.dart
+++ b/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart
@@ -16,8 +16,8 @@ import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 import 'package:quiver/testing/async.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   setUpAll(() {
diff --git a/packages/flutter_tools/test/devfs_test.dart b/packages/flutter_tools/test/general.shard/devfs_test.dart
similarity index 99%
rename from packages/flutter_tools/test/devfs_test.dart
rename to packages/flutter_tools/test/general.shard/devfs_test.dart
index 1ca9a262a7..7a1a1123eb 100644
--- a/packages/flutter_tools/test/devfs_test.dart
+++ b/packages/flutter_tools/test/general.shard/devfs_test.dart
@@ -14,9 +14,9 @@ import 'package:flutter_tools/src/devfs.dart';
 import 'package:flutter_tools/src/vmservice.dart';
 import 'package:json_rpc_2/json_rpc_2.dart' as rpc;
 
-import 'src/common.dart';
-import 'src/context.dart';
-import 'src/mocks.dart';
+import '../src/common.dart';
+import '../src/context.dart';
+import '../src/mocks.dart';
 
 void main() {
   FileSystem fs;
diff --git a/packages/flutter_tools/test/device_test.dart b/packages/flutter_tools/test/general.shard/device_test.dart
similarity index 98%
rename from packages/flutter_tools/test/device_test.dart
rename to packages/flutter_tools/test/general.shard/device_test.dart
index ea8bc0abcf..e63b01c30d 100644
--- a/packages/flutter_tools/test/device_test.dart
+++ b/packages/flutter_tools/test/general.shard/device_test.dart
@@ -8,8 +8,8 @@ import 'package:flutter_tools/src/build_info.dart';
 import 'package:flutter_tools/src/device.dart';
 import 'package:flutter_tools/src/project.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 void main() {
   group('DeviceManager', () {
diff --git a/packages/flutter_tools/test/emulator_test.dart b/packages/flutter_tools/test/general.shard/emulator_test.dart
similarity index 99%
rename from packages/flutter_tools/test/emulator_test.dart
rename to packages/flutter_tools/test/general.shard/emulator_test.dart
index 59f6390b72..7e6d389d57 100644
--- a/packages/flutter_tools/test/emulator_test.dart
+++ b/packages/flutter_tools/test/general.shard/emulator_test.dart
@@ -16,9 +16,9 @@ import 'package:flutter_tools/src/macos/xcode.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
-import 'src/mocks.dart';
+import '../src/common.dart';
+import '../src/context.dart';
+import '../src/mocks.dart';
 
 void main() {
   MockProcessManager mockProcessManager;
diff --git a/packages/flutter_tools/test/flutter_manifest_test.dart b/packages/flutter_tools/test/general.shard/flutter_manifest_test.dart
similarity index 99%
rename from packages/flutter_tools/test/flutter_manifest_test.dart
rename to packages/flutter_tools/test/general.shard/flutter_manifest_test.dart
index 3bc9176620..d3bb870499 100644
--- a/packages/flutter_tools/test/flutter_manifest_test.dart
+++ b/packages/flutter_tools/test/general.shard/flutter_manifest_test.dart
@@ -12,9 +12,9 @@ import 'package:flutter_tools/src/base/logger.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/flutter_manifest.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
-import 'src/pubspec_schema.dart';
+import '../src/common.dart';
+import '../src/context.dart';
+import '../src/pubspec_schema.dart';
 
 void main() {
   setUpAll(() {
diff --git a/packages/flutter_tools/test/flutter_platform_test.dart b/packages/flutter_tools/test/general.shard/flutter_platform_test.dart
similarity index 99%
rename from packages/flutter_tools/test/flutter_platform_test.dart
rename to packages/flutter_tools/test/general.shard/flutter_platform_test.dart
index 1e33201ecb..2b3c0d7bae 100644
--- a/packages/flutter_tools/test/flutter_platform_test.dart
+++ b/packages/flutter_tools/test/general.shard/flutter_platform_test.dart
@@ -12,8 +12,8 @@ import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 import 'package:test_core/backend.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 void main() {
   group('FlutterPlatform', () {
@@ -164,4 +164,4 @@ class TestFlutterPlatform extends FlutterPlatform {
   @override
   @protected
   Future<HttpServer> bind(InternetAddress host, int port) async => MockHttpServer();
-}
\ No newline at end of file
+}
diff --git a/packages/flutter_tools/test/forbidden_imports_test.dart b/packages/flutter_tools/test/general.shard/forbidden_imports_test.dart
similarity index 99%
rename from packages/flutter_tools/test/forbidden_imports_test.dart
rename to packages/flutter_tools/test/general.shard/forbidden_imports_test.dart
index 1eed76191d..1c0e4c5f9b 100644
--- a/packages/flutter_tools/test/forbidden_imports_test.dart
+++ b/packages/flutter_tools/test/general.shard/forbidden_imports_test.dart
@@ -4,7 +4,7 @@
 
 import 'package:flutter_tools/src/base/file_system.dart';
 
-import 'src/common.dart';
+import '../src/common.dart';
 
 void main() {
   final String flutterTools = fs.path.join(getFlutterRoot(), 'packages', 'flutter_tools');
diff --git a/packages/flutter_tools/test/fuchsia/fuchsia_device_test.dart b/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart
similarity index 99%
rename from packages/flutter_tools/test/fuchsia/fuchsia_device_test.dart
rename to packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart
index 4d42573f94..e63ec8484e 100644
--- a/packages/flutter_tools/test/fuchsia/fuchsia_device_test.dart
+++ b/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart
@@ -12,7 +12,6 @@ import 'package:flutter_tools/src/base/common.dart';
 import 'package:flutter_tools/src/base/context.dart';
 import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/base/io.dart';
-import 'package:flutter_tools/src/base/logger.dart';
 import 'package:flutter_tools/src/base/os.dart';
 import 'package:flutter_tools/src/base/time.dart';
 import 'package:flutter_tools/src/build_info.dart';
@@ -31,8 +30,8 @@ import 'package:meta/meta.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group('fuchsia device', () {
@@ -379,8 +378,6 @@ void main() {
       ], expectedIsolateName);
       expect(
           uri.toString(), 'http://${InternetAddress.loopbackIPv4.address}:0/');
-    }, overrides: <Type, Generator>{
-      Logger: () => StdoutLogger(),
     });
 
     testUsingContext('can handle flutter view without matching isolate name',
@@ -391,8 +388,6 @@ void main() {
         MockFlutterView(MockIsolate('wrong name')), // wrong name.
       ], expectedIsolateName);
       expect(uri, throwsException);
-    }, overrides: <Type, Generator>{
-      Logger: () => StdoutLogger(),
     });
 
     testUsingContext('can handle non flutter view', () async {
@@ -401,8 +396,6 @@ void main() {
         MockFlutterView(null), // no ui isolate.
       ], expectedIsolateName);
       expect(uri, throwsException);
-    }, overrides: <Type, Generator>{
-      Logger: () => StdoutLogger(),
     });
   });
 
diff --git a/packages/flutter_tools/test/fuchsia/fuchsia_workflow_test.dart b/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_workflow_test.dart
similarity index 96%
rename from packages/flutter_tools/test/fuchsia/fuchsia_workflow_test.dart
rename to packages/flutter_tools/test/general.shard/fuchsia/fuchsia_workflow_test.dart
index 7c456da791..6b6c9732d1 100644
--- a/packages/flutter_tools/test/fuchsia/fuchsia_workflow_test.dart
+++ b/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_workflow_test.dart
@@ -8,8 +8,8 @@ import 'package:flutter_tools/src/fuchsia/fuchsia_sdk.dart';
 import 'package:flutter_tools/src/fuchsia/fuchsia_workflow.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 class MockOperatingSystemUtils extends Mock implements OperatingSystemUtils {}
 
diff --git a/packages/flutter_tools/test/hot_test.dart b/packages/flutter_tools/test/general.shard/hot_test.dart
similarity index 99%
rename from packages/flutter_tools/test/hot_test.dart
rename to packages/flutter_tools/test/general.shard/hot_test.dart
index 4462f31e5a..2561daf132 100644
--- a/packages/flutter_tools/test/hot_test.dart
+++ b/packages/flutter_tools/test/general.shard/hot_test.dart
@@ -13,9 +13,9 @@ import 'package:flutter_tools/src/run_hot.dart';
 import 'package:meta/meta.dart';
 import 'package:mockito/mockito.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
-import 'src/mocks.dart';
+import '../src/common.dart';
+import '../src/context.dart';
+import '../src/mocks.dart';
 
 void main() {
   group('validateReloadReport', () {
diff --git a/packages/flutter_tools/test/intellij/intellij_test.dart b/packages/flutter_tools/test/general.shard/intellij/intellij_test.dart
similarity index 98%
rename from packages/flutter_tools/test/intellij/intellij_test.dart
rename to packages/flutter_tools/test/general.shard/intellij/intellij_test.dart
index 2da197ff6d..181141c336 100644
--- a/packages/flutter_tools/test/intellij/intellij_test.dart
+++ b/packages/flutter_tools/test/general.shard/intellij/intellij_test.dart
@@ -10,8 +10,8 @@ import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/doctor.dart';
 import 'package:flutter_tools/src/intellij/intellij.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   FileSystem fs;
diff --git a/packages/flutter_tools/test/ios/code_signing_test.dart b/packages/flutter_tools/test/general.shard/ios/code_signing_test.dart
similarity index 99%
rename from packages/flutter_tools/test/ios/code_signing_test.dart
rename to packages/flutter_tools/test/general.shard/ios/code_signing_test.dart
index 9d381a054a..c9a54b351d 100644
--- a/packages/flutter_tools/test/ios/code_signing_test.dart
+++ b/packages/flutter_tools/test/general.shard/ios/code_signing_test.dart
@@ -15,9 +15,9 @@ import 'package:flutter_tools/src/ios/code_signing.dart';
 import 'package:flutter_tools/src/globals.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   group('Auto signing', () {
diff --git a/packages/flutter_tools/test/ios/devices_test.dart b/packages/flutter_tools/test/general.shard/ios/devices_test.dart
similarity index 99%
rename from packages/flutter_tools/test/ios/devices_test.dart
rename to packages/flutter_tools/test/general.shard/ios/devices_test.dart
index 9b5f30ffaa..0716212deb 100644
--- a/packages/flutter_tools/test/ios/devices_test.dart
+++ b/packages/flutter_tools/test/general.shard/ios/devices_test.dart
@@ -18,9 +18,9 @@ import 'package:mockito/mockito.dart';
 import 'package:platform/platform.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 class MockIMobileDevice extends Mock implements IMobileDevice {}
 class MockProcessManager extends Mock implements ProcessManager {}
diff --git a/packages/flutter_tools/test/ios/ios_workflow_test.dart b/packages/flutter_tools/test/general.shard/ios/ios_workflow_test.dart
similarity index 99%
rename from packages/flutter_tools/test/ios/ios_workflow_test.dart
rename to packages/flutter_tools/test/general.shard/ios/ios_workflow_test.dart
index a2e3745306..2ac101980f 100644
--- a/packages/flutter_tools/test/ios/ios_workflow_test.dart
+++ b/packages/flutter_tools/test/general.shard/ios/ios_workflow_test.dart
@@ -13,8 +13,8 @@ import 'package:flutter_tools/src/ios/mac.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group('iOS Workflow validation', () {
diff --git a/packages/flutter_tools/test/ios/mac_test.dart b/packages/flutter_tools/test/general.shard/ios/mac_test.dart
similarity index 99%
rename from packages/flutter_tools/test/ios/mac_test.dart
rename to packages/flutter_tools/test/general.shard/ios/mac_test.dart
index 8124ed8e21..e9f88c799b 100644
--- a/packages/flutter_tools/test/ios/mac_test.dart
+++ b/packages/flutter_tools/test/general.shard/ios/mac_test.dart
@@ -14,8 +14,8 @@ import 'package:mockito/mockito.dart';
 import 'package:platform/platform.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 final Generator _kNoColorTerminalPlatform = () => FakePlatform.fromPlatform(const LocalPlatform())..stdoutSupportsAnsi = false;
 final Map<Type, Generator> noColorTerminalOverride = <Type, Generator>{
diff --git a/packages/flutter_tools/test/ios/simulators_test.dart b/packages/flutter_tools/test/general.shard/ios/simulators_test.dart
similarity index 99%
rename from packages/flutter_tools/test/ios/simulators_test.dart
rename to packages/flutter_tools/test/general.shard/ios/simulators_test.dart
index 8cff8c68cd..59aca13ac5 100644
--- a/packages/flutter_tools/test/ios/simulators_test.dart
+++ b/packages/flutter_tools/test/general.shard/ios/simulators_test.dart
@@ -20,9 +20,9 @@ import 'package:mockito/mockito.dart';
 import 'package:platform/platform.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 class MockFile extends Mock implements File {}
 class MockIMobileDevice extends Mock implements IMobileDevice {}
diff --git a/packages/flutter_tools/test/ios/xcode_backend_test.dart b/packages/flutter_tools/test/general.shard/ios/xcode_backend_test.dart
similarity index 92%
rename from packages/flutter_tools/test/ios/xcode_backend_test.dart
rename to packages/flutter_tools/test/general.shard/ios/xcode_backend_test.dart
index 551f7a6212..692cced78b 100644
--- a/packages/flutter_tools/test/ios/xcode_backend_test.dart
+++ b/packages/flutter_tools/test/general.shard/ios/xcode_backend_test.dart
@@ -4,7 +4,7 @@
 
 import 'package:flutter_tools/src/base/io.dart';
 
-import '../src/common.dart';
+import '../../src/common.dart';
 
 const String xcodeBackendPath = 'bin/xcode_backend.sh';
 const String xcodeBackendErrorHeader = '========================================================================';
@@ -28,8 +28,8 @@ const Map<String, String> installWithoutRelease = <String, String>{
 
 // Can't use a debug engine build with a release build.
 const Map<String, String> localEngineDebugBuildModeRelease = <String, String>{
-  'SOURCE_ROOT': '../../examples/hello_world',
-  'FLUTTER_ROOT': '../..',
+  'SOURCE_ROOT': '../../../examples/hello_world',
+  'FLUTTER_ROOT': '../../..',
   'LOCAL_ENGINE': '/engine/src/out/ios_debug_unopt',
   'CONFIGURATION': 'Release',
 };
@@ -37,8 +37,8 @@ const Map<String, String> localEngineDebugBuildModeRelease = <String, String>{
 // Can't use a debug build with a profile engine.
 const Map<String, String> localEngineProfileBuildeModeRelease =
     <String, String>{
-  'SOURCE_ROOT': '../../examples/hello_world',
-  'FLUTTER_ROOT': '../..',
+  'SOURCE_ROOT': '../../../examples/hello_world',
+  'FLUTTER_ROOT': '../../..',
   'LOCAL_ENGINE': '/engine/src/out/ios_profile',
   'CONFIGURATION': 'Debug',
   'FLUTTER_BUILD_MODE': 'Debug',
diff --git a/packages/flutter_tools/test/ios/xcodeproj_test.dart b/packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart
similarity index 99%
rename from packages/flutter_tools/test/ios/xcodeproj_test.dart
rename to packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart
index 6a421627d6..9026ec0314 100644
--- a/packages/flutter_tools/test/ios/xcodeproj_test.dart
+++ b/packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart
@@ -15,9 +15,9 @@ import 'package:mockito/mockito.dart';
 import 'package:platform/platform.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/pubspec_schema.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/pubspec_schema.dart';
 
 const String xcodebuild = '/usr/bin/xcodebuild';
 
diff --git a/packages/flutter_tools/test/linux/linux_device_test.dart b/packages/flutter_tools/test/general.shard/linux/linux_device_test.dart
similarity index 98%
rename from packages/flutter_tools/test/linux/linux_device_test.dart
rename to packages/flutter_tools/test/general.shard/linux/linux_device_test.dart
index 323fa7ceaa..29a56131f2 100644
--- a/packages/flutter_tools/test/linux/linux_device_test.dart
+++ b/packages/flutter_tools/test/general.shard/linux/linux_device_test.dart
@@ -14,8 +14,8 @@ import 'package:flutter_tools/src/project.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group(LinuxDevice, () {
diff --git a/packages/flutter_tools/test/linux/linux_doctor_test.dart b/packages/flutter_tools/test/general.shard/linux/linux_doctor_test.dart
similarity index 98%
rename from packages/flutter_tools/test/linux/linux_doctor_test.dart
rename to packages/flutter_tools/test/general.shard/linux/linux_doctor_test.dart
index 15afc82600..230208902f 100644
--- a/packages/flutter_tools/test/linux/linux_doctor_test.dart
+++ b/packages/flutter_tools/test/general.shard/linux/linux_doctor_test.dart
@@ -7,9 +7,9 @@ import 'package:flutter_tools/src/linux/linux_doctor.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   group(LinuxDoctorValidator, () {
diff --git a/packages/flutter_tools/test/linux/linux_workflow_test.dart b/packages/flutter_tools/test/general.shard/linux/linux_workflow_test.dart
similarity index 95%
rename from packages/flutter_tools/test/linux/linux_workflow_test.dart
rename to packages/flutter_tools/test/general.shard/linux/linux_workflow_test.dart
index d111ffced8..1445cff26d 100644
--- a/packages/flutter_tools/test/linux/linux_workflow_test.dart
+++ b/packages/flutter_tools/test/general.shard/linux/linux_workflow_test.dart
@@ -6,8 +6,8 @@ import 'package:mockito/mockito.dart';
 import 'package:flutter_tools/src/linux/linux_workflow.dart';
 import 'package:flutter_tools/src/base/platform.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group(LinuxWorkflow, () {
diff --git a/packages/flutter_tools/test/macos/cocoapods_test.dart b/packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart
similarity index 99%
rename from packages/flutter_tools/test/macos/cocoapods_test.dart
rename to packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart
index bc2afa6f43..068b87a015 100644
--- a/packages/flutter_tools/test/macos/cocoapods_test.dart
+++ b/packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart
@@ -17,8 +17,8 @@ import 'package:flutter_tools/src/project.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 typedef InvokeProcess = Future<ProcessResult> Function();
 
diff --git a/packages/flutter_tools/test/macos/cocoapods_validator_test.dart b/packages/flutter_tools/test/general.shard/macos/cocoapods_validator_test.dart
similarity index 98%
rename from packages/flutter_tools/test/macos/cocoapods_validator_test.dart
rename to packages/flutter_tools/test/general.shard/macos/cocoapods_validator_test.dart
index bd49fc148b..2dc88945b4 100644
--- a/packages/flutter_tools/test/macos/cocoapods_validator_test.dart
+++ b/packages/flutter_tools/test/general.shard/macos/cocoapods_validator_test.dart
@@ -7,8 +7,8 @@ import 'package:flutter_tools/src/macos/cocoapods.dart';
 import 'package:flutter_tools/src/macos/cocoapods_validator.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group('CocoaPods validation', () {
diff --git a/packages/flutter_tools/test/macos/macos_device_test.dart b/packages/flutter_tools/test/general.shard/macos/macos_device_test.dart
similarity index 98%
rename from packages/flutter_tools/test/macos/macos_device_test.dart
rename to packages/flutter_tools/test/general.shard/macos/macos_device_test.dart
index 6a1b651735..2dcb59edd7 100644
--- a/packages/flutter_tools/test/macos/macos_device_test.dart
+++ b/packages/flutter_tools/test/general.shard/macos/macos_device_test.dart
@@ -19,9 +19,9 @@ import 'package:flutter_tools/src/device.dart';
 import 'package:flutter_tools/src/macos/application_package.dart';
 import 'package:flutter_tools/src/macos/macos_device.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   group(MacOSDevice, () {
diff --git a/packages/flutter_tools/test/macos/macos_workflow_test.dart b/packages/flutter_tools/test/general.shard/macos/macos_workflow_test.dart
similarity index 96%
rename from packages/flutter_tools/test/macos/macos_workflow_test.dart
rename to packages/flutter_tools/test/general.shard/macos/macos_workflow_test.dart
index 532ed724db..b63bdde561 100644
--- a/packages/flutter_tools/test/macos/macos_workflow_test.dart
+++ b/packages/flutter_tools/test/general.shard/macos/macos_workflow_test.dart
@@ -9,8 +9,8 @@ import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/macos/macos_workflow.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group(MacOSWorkflow, () {
diff --git a/packages/flutter_tools/test/macos/xcode_test.dart b/packages/flutter_tools/test/general.shard/macos/xcode_test.dart
similarity index 98%
rename from packages/flutter_tools/test/macos/xcode_test.dart
rename to packages/flutter_tools/test/general.shard/macos/xcode_test.dart
index a0e11e093d..ece4fd786a 100644
--- a/packages/flutter_tools/test/macos/xcode_test.dart
+++ b/packages/flutter_tools/test/general.shard/macos/xcode_test.dart
@@ -8,8 +8,8 @@ import 'package:flutter_tools/src/macos/xcode.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 class MockProcessManager extends Mock implements ProcessManager {}
 class MockXcodeProjectInterpreter extends Mock implements XcodeProjectInterpreter {}
diff --git a/packages/flutter_tools/test/macos/xcode_validator_test.dart b/packages/flutter_tools/test/general.shard/macos/xcode_validator_test.dart
similarity index 98%
rename from packages/flutter_tools/test/macos/xcode_validator_test.dart
rename to packages/flutter_tools/test/general.shard/macos/xcode_validator_test.dart
index d3dc9296fe..e461facd1d 100644
--- a/packages/flutter_tools/test/macos/xcode_validator_test.dart
+++ b/packages/flutter_tools/test/general.shard/macos/xcode_validator_test.dart
@@ -8,8 +8,8 @@ import 'package:flutter_tools/src/macos/xcode_validator.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 class MockProcessManager extends Mock implements ProcessManager {}
 class MockXcode extends Mock implements Xcode {}
diff --git a/packages/flutter_tools/test/project_file_invalidator_test.dart b/packages/flutter_tools/test/general.shard/project_file_invalidator_test.dart
similarity index 94%
rename from packages/flutter_tools/test/project_file_invalidator_test.dart
rename to packages/flutter_tools/test/general.shard/project_file_invalidator_test.dart
index c13a38da20..d25ef6d4d5 100644
--- a/packages/flutter_tools/test/project_file_invalidator_test.dart
+++ b/packages/flutter_tools/test/general.shard/project_file_invalidator_test.dart
@@ -6,8 +6,8 @@ import 'package:file/memory.dart';
 import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/run_hot.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 void main() {
   group('ProjectFileInvalidator', () {
diff --git a/packages/flutter_tools/test/project_test.dart b/packages/flutter_tools/test/general.shard/project_test.dart
similarity index 99%
rename from packages/flutter_tools/test/project_test.dart
rename to packages/flutter_tools/test/general.shard/project_test.dart
index ad984a0a71..acc91e8d58 100644
--- a/packages/flutter_tools/test/project_test.dart
+++ b/packages/flutter_tools/test/general.shard/project_test.dart
@@ -18,9 +18,9 @@ import 'package:file/memory.dart';
 import 'package:meta/meta.dart';
 import 'package:mockito/mockito.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
-import 'src/testbed.dart';
+import '../src/common.dart';
+import '../src/context.dart';
+import '../src/testbed.dart';
 
 void main() {
   group('Project', () {
diff --git a/packages/flutter_tools/test/protocol_discovery_test.dart b/packages/flutter_tools/test/general.shard/protocol_discovery_test.dart
similarity index 99%
rename from packages/flutter_tools/test/protocol_discovery_test.dart
rename to packages/flutter_tools/test/general.shard/protocol_discovery_test.dart
index aaeadf808a..6ad073f495 100644
--- a/packages/flutter_tools/test/protocol_discovery_test.dart
+++ b/packages/flutter_tools/test/general.shard/protocol_discovery_test.dart
@@ -7,9 +7,9 @@ import 'dart:async';
 import 'package:flutter_tools/src/device.dart';
 import 'package:flutter_tools/src/protocol_discovery.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
-import 'src/mocks.dart';
+import '../src/common.dart';
+import '../src/context.dart';
+import '../src/mocks.dart';
 
 void main() {
   group('service_protocol discovery', () {
diff --git a/packages/flutter_tools/test/resident_runner_test.dart b/packages/flutter_tools/test/general.shard/resident_runner_test.dart
similarity index 98%
rename from packages/flutter_tools/test/resident_runner_test.dart
rename to packages/flutter_tools/test/general.shard/resident_runner_test.dart
index 024d08a847..26b81128bb 100644
--- a/packages/flutter_tools/test/resident_runner_test.dart
+++ b/packages/flutter_tools/test/general.shard/resident_runner_test.dart
@@ -12,8 +12,8 @@ import 'package:flutter_tools/src/run_hot.dart';
 import 'package:flutter_tools/src/vmservice.dart';
 import 'package:mockito/mockito.dart';
 
-import 'src/common.dart';
-import 'src/testbed.dart';
+import '../src/common.dart';
+import '../src/testbed.dart';
 
 void main() {
   group('ResidentRunner', () {
diff --git a/packages/flutter_tools/test/runner/flutter_command_runner_test.dart b/packages/flutter_tools/test/general.shard/runner/flutter_command_runner_test.dart
similarity index 99%
rename from packages/flutter_tools/test/runner/flutter_command_runner_test.dart
rename to packages/flutter_tools/test/general.shard/runner/flutter_command_runner_test.dart
index f00c8665a1..3680746868 100644
--- a/packages/flutter_tools/test/runner/flutter_command_runner_test.dart
+++ b/packages/flutter_tools/test/general.shard/runner/flutter_command_runner_test.dart
@@ -15,8 +15,8 @@ import 'package:mockito/mockito.dart';
 import 'package:platform/platform.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 import 'utils.dart';
 
 const String _kFlutterRoot = '/flutter/flutter';
diff --git a/packages/flutter_tools/test/runner/flutter_command_test.dart b/packages/flutter_tools/test/general.shard/runner/flutter_command_test.dart
similarity index 99%
rename from packages/flutter_tools/test/runner/flutter_command_test.dart
rename to packages/flutter_tools/test/general.shard/runner/flutter_command_test.dart
index 7c4ea0ac8a..86ee99d033 100644
--- a/packages/flutter_tools/test/runner/flutter_command_test.dart
+++ b/packages/flutter_tools/test/general.shard/runner/flutter_command_test.dart
@@ -10,8 +10,8 @@ import 'package:flutter_tools/src/runner/flutter_command.dart';
 import 'package:flutter_tools/src/version.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 import 'utils.dart';
 
 void main() {
diff --git a/packages/flutter_tools/test/runner/utils.dart b/packages/flutter_tools/test/general.shard/runner/utils.dart
similarity index 100%
rename from packages/flutter_tools/test/runner/utils.dart
rename to packages/flutter_tools/test/general.shard/runner/utils.dart
diff --git a/packages/flutter_tools/test/terminal_handler_test.dart b/packages/flutter_tools/test/general.shard/terminal_handler_test.dart
similarity index 99%
rename from packages/flutter_tools/test/terminal_handler_test.dart
rename to packages/flutter_tools/test/general.shard/terminal_handler_test.dart
index 6e182ba605..7f4a2f4a66 100644
--- a/packages/flutter_tools/test/terminal_handler_test.dart
+++ b/packages/flutter_tools/test/general.shard/terminal_handler_test.dart
@@ -11,8 +11,8 @@ import 'package:flutter_tools/src/resident_runner.dart';
 import 'package:flutter_tools/src/vmservice.dart';
 import 'package:mockito/mockito.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 void main() {
   TestRunner createTestRunner() {
diff --git a/packages/flutter_tools/test/test_compiler_test.dart b/packages/flutter_tools/test/general.shard/test_compiler_test.dart
similarity index 98%
rename from packages/flutter_tools/test/test_compiler_test.dart
rename to packages/flutter_tools/test/general.shard/test_compiler_test.dart
index 0e6259b3c1..2158adff92 100644
--- a/packages/flutter_tools/test/test_compiler_test.dart
+++ b/packages/flutter_tools/test/general.shard/test_compiler_test.dart
@@ -8,8 +8,8 @@ import 'package:flutter_tools/src/project.dart';
 import 'package:flutter_tools/src/test/test_compiler.dart';
 import 'package:mockito/mockito.dart';
 
-import 'src/common.dart';
-import 'src/testbed.dart';
+import '../src/common.dart';
+import '../src/testbed.dart';
 
 void main() {
   group(TestCompiler, () {
diff --git a/packages/flutter_tools/test/testbed_test.dart b/packages/flutter_tools/test/general.shard/testbed_test.dart
similarity index 97%
rename from packages/flutter_tools/test/testbed_test.dart
rename to packages/flutter_tools/test/general.shard/testbed_test.dart
index 33c3bc88f9..814bdeea04 100644
--- a/packages/flutter_tools/test/testbed_test.dart
+++ b/packages/flutter_tools/test/general.shard/testbed_test.dart
@@ -9,8 +9,8 @@ import 'package:file/memory.dart';
 import 'package:flutter_tools/src/base/context.dart';
 import 'package:flutter_tools/src/base/file_system.dart';
 
-import 'src/common.dart';
-import 'src/testbed.dart';
+import '../src/common.dart';
+import '../src/testbed.dart';
 
 void main() {
   group('Testbed', () {
diff --git a/packages/flutter_tools/test/tester/flutter_tester_test.dart b/packages/flutter_tools/test/general.shard/tester/flutter_tester_test.dart
similarity index 98%
rename from packages/flutter_tools/test/tester/flutter_tester_test.dart
rename to packages/flutter_tools/test/general.shard/tester/flutter_tester_test.dart
index 9c0dff9edb..614df14694 100644
--- a/packages/flutter_tools/test/tester/flutter_tester_test.dart
+++ b/packages/flutter_tools/test/general.shard/tester/flutter_tester_test.dart
@@ -17,9 +17,9 @@ import 'package:flutter_tools/src/tester/flutter_tester.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   MemoryFileSystem fs;
diff --git a/packages/flutter_tools/test/time_test.dart b/packages/flutter_tools/test/general.shard/time_test.dart
similarity index 95%
rename from packages/flutter_tools/test/time_test.dart
rename to packages/flutter_tools/test/general.shard/time_test.dart
index 289b0b67c6..e5e53e9e0d 100644
--- a/packages/flutter_tools/test/time_test.dart
+++ b/packages/flutter_tools/test/general.shard/time_test.dart
@@ -4,7 +4,7 @@
 
 import 'package:flutter_tools/src/base/time.dart';
 
-import 'src/common.dart';
+import '../src/common.dart';
 
 void main() {
   group(SystemClock, () {
diff --git a/packages/flutter_tools/test/utils_test.dart b/packages/flutter_tools/test/general.shard/utils_test.dart
similarity index 99%
rename from packages/flutter_tools/test/utils_test.dart
rename to packages/flutter_tools/test/general.shard/utils_test.dart
index cbbe16ef00..9a2cb3368e 100644
--- a/packages/flutter_tools/test/utils_test.dart
+++ b/packages/flutter_tools/test/general.shard/utils_test.dart
@@ -9,8 +9,8 @@ import 'package:flutter_tools/src/base/utils.dart';
 import 'package:flutter_tools/src/base/version.dart';
 import 'package:flutter_tools/src/base/terminal.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 void main() {
   group('SettingsFile', () {
diff --git a/packages/flutter_tools/test/version_test.dart b/packages/flutter_tools/test/general.shard/version_test.dart
similarity index 99%
rename from packages/flutter_tools/test/version_test.dart
rename to packages/flutter_tools/test/general.shard/version_test.dart
index 9ec8b58f35..1a94470534 100644
--- a/packages/flutter_tools/test/version_test.dart
+++ b/packages/flutter_tools/test/general.shard/version_test.dart
@@ -15,8 +15,8 @@ import 'package:flutter_tools/src/base/logger.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/version.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 final SystemClock _testClock = SystemClock.fixed(DateTime(2015, 1, 1));
 final DateTime _stampUpToDate = _testClock.ago(FlutterVersion.checkAgeConsideredUpToDate ~/ 2);
diff --git a/packages/flutter_tools/test/vmservice_test.dart b/packages/flutter_tools/test/general.shard/vmservice_test.dart
similarity index 99%
rename from packages/flutter_tools/test/vmservice_test.dart
rename to packages/flutter_tools/test/general.shard/vmservice_test.dart
index ca4c15f4cf..ccf816b698 100644
--- a/packages/flutter_tools/test/vmservice_test.dart
+++ b/packages/flutter_tools/test/general.shard/vmservice_test.dart
@@ -11,9 +11,9 @@ import 'package:flutter_tools/src/vmservice.dart';
 import 'package:json_rpc_2/json_rpc_2.dart' as rpc;
 import 'package:quiver/testing/async.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
-import 'src/mocks.dart';
+import '../src/common.dart';
+import '../src/context.dart';
+import '../src/mocks.dart';
 
 class MockPeer implements rpc.Peer {
 
diff --git a/packages/flutter_tools/test/web/devices_test.dart b/packages/flutter_tools/test/general.shard/web/devices_test.dart
similarity index 98%
rename from packages/flutter_tools/test/web/devices_test.dart
rename to packages/flutter_tools/test/general.shard/web/devices_test.dart
index fd6cced9bf..31ca493053 100644
--- a/packages/flutter_tools/test/web/devices_test.dart
+++ b/packages/flutter_tools/test/general.shard/web/devices_test.dart
@@ -9,8 +9,8 @@ import 'package:flutter_tools/src/web/web_device.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group(ChromeDevice, () {
diff --git a/packages/flutter_tools/test/web/web_validator_test.dart b/packages/flutter_tools/test/general.shard/web/web_validator_test.dart
similarity index 97%
rename from packages/flutter_tools/test/web/web_validator_test.dart
rename to packages/flutter_tools/test/general.shard/web/web_validator_test.dart
index 1765028a2b..c95972d628 100644
--- a/packages/flutter_tools/test/web/web_validator_test.dart
+++ b/packages/flutter_tools/test/general.shard/web/web_validator_test.dart
@@ -9,8 +9,8 @@ import 'package:flutter_tools/src/web/web_validator.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/testbed.dart';
+import '../../src/common.dart';
+import '../../src/testbed.dart';
 
 void main() {
   group('WebValidator', () {
@@ -62,4 +62,4 @@ class MockPlatform extends Mock implements Platform  {
   Map<String, String> get environment => const <String, String>{};
 }
 
-class MockProcessManager extends Mock implements ProcessManager {}
\ No newline at end of file
+class MockProcessManager extends Mock implements ProcessManager {}
diff --git a/packages/flutter_tools/test/web/workflow_test.dart b/packages/flutter_tools/test/general.shard/web/workflow_test.dart
similarity index 97%
rename from packages/flutter_tools/test/web/workflow_test.dart
rename to packages/flutter_tools/test/general.shard/web/workflow_test.dart
index cd6854f6de..86a8d6b369 100644
--- a/packages/flutter_tools/test/web/workflow_test.dart
+++ b/packages/flutter_tools/test/general.shard/web/workflow_test.dart
@@ -10,9 +10,9 @@ import 'package:flutter_tools/src/web/workflow.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/testbed.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/testbed.dart';
 
 void main() {
   group('WebWorkflow', () {
diff --git a/packages/flutter_tools/test/windows/visual_studio_test.dart b/packages/flutter_tools/test/general.shard/windows/visual_studio_test.dart
similarity index 99%
rename from packages/flutter_tools/test/windows/visual_studio_test.dart
rename to packages/flutter_tools/test/general.shard/windows/visual_studio_test.dart
index 0969f16ab2..8d82bac851 100644
--- a/packages/flutter_tools/test/windows/visual_studio_test.dart
+++ b/packages/flutter_tools/test/general.shard/windows/visual_studio_test.dart
@@ -11,8 +11,8 @@ import 'package:flutter_tools/src/windows/visual_studio.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 class MockPlatform extends Mock implements Platform {
   @override
diff --git a/packages/flutter_tools/test/windows/visual_studio_validator_test.dart b/packages/flutter_tools/test/general.shard/windows/visual_studio_validator_test.dart
similarity index 97%
rename from packages/flutter_tools/test/windows/visual_studio_validator_test.dart
rename to packages/flutter_tools/test/general.shard/windows/visual_studio_validator_test.dart
index 5f51431342..f3717b1105 100644
--- a/packages/flutter_tools/test/windows/visual_studio_validator_test.dart
+++ b/packages/flutter_tools/test/general.shard/windows/visual_studio_validator_test.dart
@@ -7,8 +7,8 @@ import 'package:flutter_tools/src/windows/visual_studio.dart';
 import 'package:flutter_tools/src/windows/visual_studio_validator.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 class MockVisualStudio extends Mock implements VisualStudio {}
 
diff --git a/packages/flutter_tools/test/windows/windows_device_test.dart b/packages/flutter_tools/test/general.shard/windows/windows_device_test.dart
similarity index 98%
rename from packages/flutter_tools/test/windows/windows_device_test.dart
rename to packages/flutter_tools/test/general.shard/windows/windows_device_test.dart
index e1dc10b687..29fa6796b3 100644
--- a/packages/flutter_tools/test/windows/windows_device_test.dart
+++ b/packages/flutter_tools/test/general.shard/windows/windows_device_test.dart
@@ -14,8 +14,8 @@ import 'package:flutter_tools/src/device.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group(WindowsDevice, () {
diff --git a/packages/flutter_tools/test/windows/windows_workflow_test.dart b/packages/flutter_tools/test/general.shard/windows/windows_workflow_test.dart
similarity index 95%
rename from packages/flutter_tools/test/windows/windows_workflow_test.dart
rename to packages/flutter_tools/test/general.shard/windows/windows_workflow_test.dart
index 5530a5c5cc..4c9d202189 100644
--- a/packages/flutter_tools/test/windows/windows_workflow_test.dart
+++ b/packages/flutter_tools/test/general.shard/windows/windows_workflow_test.dart
@@ -7,8 +7,8 @@ import 'package:mockito/mockito.dart';
 import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/windows/windows_workflow.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group(WindowsWorkflow, () {
diff --git a/packages/flutter_tools/test/integration/README.md b/packages/flutter_tools/test/integration.shard/README.md
similarity index 100%
rename from packages/flutter_tools/test/integration/README.md
rename to packages/flutter_tools/test/integration.shard/README.md
diff --git a/packages/flutter_tools/test/integration/daemon_mode_test.dart b/packages/flutter_tools/test/integration.shard/daemon_mode_test.dart
similarity index 100%
rename from packages/flutter_tools/test/integration/daemon_mode_test.dart
rename to packages/flutter_tools/test/integration.shard/daemon_mode_test.dart
diff --git a/packages/flutter_tools/test/integration/debugger_stepping_test.dart b/packages/flutter_tools/test/integration.shard/debugger_stepping_test.dart
similarity index 100%
rename from packages/flutter_tools/test/integration/debugger_stepping_test.dart
rename to packages/flutter_tools/test/integration.shard/debugger_stepping_test.dart
diff --git a/packages/flutter_tools/test/integration/expression_evaluation_test.dart b/packages/flutter_tools/test/integration.shard/expression_evaluation_test.dart
similarity index 100%
rename from packages/flutter_tools/test/integration/expression_evaluation_test.dart
rename to packages/flutter_tools/test/integration.shard/expression_evaluation_test.dart
diff --git a/packages/flutter_tools/test/integration/flutter_attach_test.dart b/packages/flutter_tools/test/integration.shard/flutter_attach_test.dart
similarity index 100%
rename from packages/flutter_tools/test/integration/flutter_attach_test.dart
rename to packages/flutter_tools/test/integration.shard/flutter_attach_test.dart
diff --git a/packages/flutter_tools/test/integration/flutter_run_test.dart b/packages/flutter_tools/test/integration.shard/flutter_run_test.dart
similarity index 100%
rename from packages/flutter_tools/test/integration/flutter_run_test.dart
rename to packages/flutter_tools/test/integration.shard/flutter_run_test.dart
diff --git a/packages/flutter_tools/test/integration/hot_reload_test.dart b/packages/flutter_tools/test/integration.shard/hot_reload_test.dart
similarity index 100%
rename from packages/flutter_tools/test/integration/hot_reload_test.dart
rename to packages/flutter_tools/test/integration.shard/hot_reload_test.dart
diff --git a/packages/flutter_tools/test/integration/lifetime_test.dart b/packages/flutter_tools/test/integration.shard/lifetime_test.dart
similarity index 100%
rename from packages/flutter_tools/test/integration/lifetime_test.dart
rename to packages/flutter_tools/test/integration.shard/lifetime_test.dart
diff --git a/packages/flutter_tools/test/integration/test_data/basic_project.dart b/packages/flutter_tools/test/integration.shard/test_data/basic_project.dart
similarity index 100%
rename from packages/flutter_tools/test/integration/test_data/basic_project.dart
rename to packages/flutter_tools/test/integration.shard/test_data/basic_project.dart
diff --git a/packages/flutter_tools/test/integration/test_data/hot_reload_project.dart b/packages/flutter_tools/test/integration.shard/test_data/hot_reload_project.dart
similarity index 100%
rename from packages/flutter_tools/test/integration/test_data/hot_reload_project.dart
rename to packages/flutter_tools/test/integration.shard/test_data/hot_reload_project.dart
diff --git a/packages/flutter_tools/test/integration/test_data/project.dart b/packages/flutter_tools/test/integration.shard/test_data/project.dart
similarity index 100%
rename from packages/flutter_tools/test/integration/test_data/project.dart
rename to packages/flutter_tools/test/integration.shard/test_data/project.dart
diff --git a/packages/flutter_tools/test/integration/test_data/stepping_project.dart b/packages/flutter_tools/test/integration.shard/test_data/stepping_project.dart
similarity index 100%
rename from packages/flutter_tools/test/integration/test_data/stepping_project.dart
rename to packages/flutter_tools/test/integration.shard/test_data/stepping_project.dart
diff --git a/packages/flutter_tools/test/integration/test_data/tests_project.dart b/packages/flutter_tools/test/integration.shard/test_data/tests_project.dart
similarity index 100%
rename from packages/flutter_tools/test/integration/test_data/tests_project.dart
rename to packages/flutter_tools/test/integration.shard/test_data/tests_project.dart
diff --git a/packages/flutter_tools/test/integration/test_driver.dart b/packages/flutter_tools/test/integration.shard/test_driver.dart
similarity index 100%
rename from packages/flutter_tools/test/integration/test_driver.dart
rename to packages/flutter_tools/test/integration.shard/test_driver.dart
diff --git a/packages/flutter_tools/test/integration/test_utils.dart b/packages/flutter_tools/test/integration.shard/test_utils.dart
similarity index 100%
rename from packages/flutter_tools/test/integration/test_utils.dart
rename to packages/flutter_tools/test/integration.shard/test_utils.dart