diff --git a/test/app_config_test.dart b/test/config/app_config_test.dart
similarity index 100%
rename from test/app_config_test.dart
rename to test/config/app_config_test.dart
diff --git a/test/app_logger_test.dart b/test/config/app_logger_test.dart
similarity index 100%
rename from test/app_logger_test.dart
rename to test/config/app_logger_test.dart
diff --git a/test/init_config_cli_test.dart b/test/config/init_config_cli_test.dart
similarity index 100%
rename from test/init_config_cli_test.dart
rename to test/config/init_config_cli_test.dart
diff --git a/test/concurrency_test.dart b/test/core/concurrency_test.dart
similarity index 99%
rename from test/concurrency_test.dart
rename to test/core/concurrency_test.dart
index 2962bb7..42995de 100644
--- a/test/concurrency_test.dart
+++ b/test/core/concurrency_test.dart
@@ -5,7 +5,7 @@ import 'package:drift/drift.dart' show driftRuntimeOptions;
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 
-import 'test_support.dart';
+import '../test_support.dart';
 
 void registerIssueAssistantAppRunOnceConcurrencyTests() {
   /// ```gherkin
diff --git a/test/core_test.dart b/test/core/core_test.dart
similarity index 99%
rename from test/core_test.dart
rename to test/core/core_test.dart
index 38dbccc..85d0abd 100644
--- a/test/core_test.dart
+++ b/test/core/core_test.dart
@@ -5,7 +5,7 @@ import 'package:drift/drift.dart' show driftRuntimeOptions;
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 
-import 'test_support.dart';
+import '../test_support.dart';
 
 void registerIssueAssistantAppRunOnceCoreTests() {
   /// ```gherkin
diff --git a/test/multi_project_test.dart b/test/core/multi_project_test.dart
similarity index 99%
rename from test/multi_project_test.dart
rename to test/core/multi_project_test.dart
index 168558a..166d186 100644
--- a/test/multi_project_test.dart
+++ b/test/core/multi_project_test.dart
@@ -5,7 +5,7 @@ import 'package:drift/drift.dart' show driftRuntimeOptions;
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 
-import 'test_support.dart';
+import '../test_support.dart';
 
 void registerIssueAssistantAppRunOnceMultiProjectTests() {
   /// ```gherkin
diff --git a/test/retry_test.dart b/test/core/retry_test.dart
similarity index 99%
rename from test/retry_test.dart
rename to test/core/retry_test.dart
index f6ed8e4..542a012 100644
--- a/test/retry_test.dart
+++ b/test/core/retry_test.dart
@@ -6,7 +6,7 @@ import 'package:drift/drift.dart' show driftRuntimeOptions;
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 
-import 'test_support.dart';
+import '../test_support.dart';
 
 void registerIssueAssistantAppRunRetryTests() {
   /// ```gherkin
diff --git a/test/routed_issue_event_source_test.dart b/test/issue_event_source/routed_issue_event_source_test.dart
similarity index 100%
rename from test/routed_issue_event_source_test.dart
rename to test/issue_event_source/routed_issue_event_source_test.dart
diff --git a/test/notifications_test.dart b/test/notifier/notifications_test.dart
similarity index 99%
rename from test/notifications_test.dart
rename to test/notifier/notifications_test.dart
index 2dfa294..1999c11 100644
--- a/test/notifications_test.dart
+++ b/test/notifier/notifications_test.dart
@@ -7,7 +7,7 @@ import 'package:drift/drift.dart' show driftRuntimeOptions;
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 
-import 'test_support.dart';
+import '../test_support.dart';
 
 void registerIssueAssistantAppRunOnceNotificationTests() {
   /// ```gherkin
diff --git a/test/notifier_test.dart b/test/notifier/notifier_test.dart
similarity index 100%
rename from test/notifier_test.dart
rename to test/notifier/notifier_test.dart
diff --git a/test/workspace_manager_test.dart b/test/workspace/workspace_manager_test.dart
similarity index 98%
rename from test/workspace_manager_test.dart
rename to test/workspace/workspace_manager_test.dart
index c89de68..ad384c8 100644
--- a/test/workspace_manager_test.dart
+++ b/test/workspace/workspace_manager_test.dart
@@ -4,7 +4,7 @@ import 'package:code_work_spawner/code_work_spawner.dart';
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 
-import 'test_support.dart';
+import '../test_support.dart';
 
 void main() {
   /// ```gherkin
diff --git a/test/worktree_test.dart b/test/workspace/worktree_test.dart
similarity index 99%
rename from test/worktree_test.dart
rename to test/workspace/worktree_test.dart
index 5c83cab..72729d5 100644
--- a/test/worktree_test.dart
+++ b/test/workspace/worktree_test.dart
@@ -5,7 +5,7 @@ import 'package:drift/drift.dart' show driftRuntimeOptions;
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 
-import 'test_support.dart';
+import '../test_support.dart';
 
 void registerIssueAssistantAppRunOnceWorktreeTests() {
   /// ```gherkin