diff --git a/test/unit/comment_processable_test.dart b/test/comment_processable_test.dart
similarity index 100%
rename from test/unit/comment_processable_test.dart
rename to test/comment_processable_test.dart
diff --git a/test/dartdoc_integration_test.dart b/test/end2end/dartdoc_integration_test.dart
similarity index 95%
rename from test/dartdoc_integration_test.dart
rename to test/end2end/dartdoc_integration_test.dart
index e12beff778..3114e120e8 100644
--- a/test/dartdoc_integration_test.dart
+++ b/test/end2end/dartdoc_integration_test.dart
@@ -12,15 +12,15 @@ import 'package:dartdoc/dartdoc.dart';
 import 'package:path/path.dart' as path;
 import 'package:test/test.dart';
 
-import '../tool/subprocess_launcher.dart';
-import 'src/utils.dart';
+import '../../tool/subprocess_launcher.dart';
+import '../src/utils.dart';
 
 Uri get _currentFileUri =>
     (reflect(main) as ClosureMirror).function.location.sourceUri;
 String get _testPackagePath =>
-    path.fromUri(_currentFileUri.resolve('../testing/test_package'));
-String get _testPackageFlutterPluginPath => path
-    .fromUri(_currentFileUri.resolve('../testing/test_package_flutter_plugin'));
+    path.fromUri(_currentFileUri.resolve('../../testing/test_package'));
+String get _testPackageFlutterPluginPath => path.fromUri(
+    _currentFileUri.resolve('../../testing/test_package_flutter_plugin'));
 
 void main() {
   group('Invoking command-line dartdoc', () {
@@ -210,8 +210,8 @@ void main() {
     }, timeout: Timeout.factor(2));
 
     test('--footer-text excludes version', () async {
-      var _testPackagePath = path
-          .fromUri(_currentFileUri.resolve('../testing/test_package_options'));
+      var _testPackagePath = path.fromUri(
+          _currentFileUri.resolve('../../testing/test_package_options'));
 
       var args = <String>[dartdocPath, '--output', tempDir.path];
 
diff --git a/test/dartdoc_test.dart b/test/end2end/dartdoc_test.dart
similarity index 99%
rename from test/dartdoc_test.dart
rename to test/end2end/dartdoc_test.dart
index d466973b7c..012a7bec11 100644
--- a/test/dartdoc_test.dart
+++ b/test/end2end/dartdoc_test.dart
@@ -17,7 +17,7 @@ import 'package:dartdoc/src/warnings.dart';
 import 'package:path/path.dart' as path;
 import 'package:test/test.dart';
 
-import 'src/utils.dart';
+import '../src/utils.dart';
 
 final _resourceProvider = pubPackageMetaProvider.resourceProvider;
 final _pathContext = _resourceProvider.pathContext;
diff --git a/test/html_generator_test.dart b/test/end2end/html_generator_test.dart
similarity index 99%
rename from test/html_generator_test.dart
rename to test/end2end/html_generator_test.dart
index 0a55d1c217..fa5059bec3 100644
--- a/test/html_generator_test.dart
+++ b/test/end2end/html_generator_test.dart
@@ -16,7 +16,7 @@ import 'package:dartdoc/src/warnings.dart';
 import 'package:path/path.dart' as path;
 import 'package:test/test.dart';
 
-import 'src/utils.dart' as utils;
+import '../src/utils.dart' as utils;
 
 // Init a generator without a GeneratorContext and with the default file writer.
 Future<Generator> _initGeneratorForTest() async {
diff --git a/test/model_special_cases_test.dart b/test/end2end/model_special_cases_test.dart
similarity index 99%
rename from test/model_special_cases_test.dart
rename to test/end2end/model_special_cases_test.dart
index 9d5ea1f698..ac6d4bb445 100644
--- a/test/model_special_cases_test.dart
+++ b/test/end2end/model_special_cases_test.dart
@@ -19,7 +19,7 @@ import 'package:dartdoc/src/special_elements.dart';
 import 'package:pub_semver/pub_semver.dart';
 import 'package:test/test.dart';
 
-import 'src/utils.dart' as utils;
+import '../src/utils.dart' as utils;
 
 final String _platformVersionString = Platform.version.split(' ').first;
 final Version _platformVersion = Version.parse(_platformVersionString);
diff --git a/test/model_test.dart b/test/end2end/model_test.dart
similarity index 99%
rename from test/model_test.dart
rename to test/end2end/model_test.dart
index a08f6c9be3..37b4d528d2 100644
--- a/test/model_test.dart
+++ b/test/end2end/model_test.dart
@@ -19,7 +19,7 @@ import 'package:dartdoc/src/special_elements.dart';
 import 'package:dartdoc/src/warnings.dart';
 import 'package:test/test.dart';
 
-import 'src/utils.dart' as utils;
+import '../src/utils.dart' as utils;
 
 final _testPackageGraphMemo = AsyncMemoizer<PackageGraph>();
 Future<PackageGraph> get _testPackageGraph =>