diff --git a/dwds/test/instances/instance_inspection_common.dart b/dwds/test/instances/common/test_inspector.dart
similarity index 99%
rename from dwds/test/instances/instance_inspection_common.dart
rename to dwds/test/instances/common/test_inspector.dart
index 7d079a8e5..e79240ee9 100644
--- a/dwds/test/instances/instance_inspection_common.dart
+++ b/dwds/test/instances/common/test_inspector.dart
@@ -8,7 +8,7 @@
 import 'package:test/test.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../fixtures/context.dart';
+import '../../fixtures/context.dart';
 
 class TestInspector {
   TestInspector(this.context);
diff --git a/dwds/test/instances/instance_inspection_test.dart b/dwds/test/instances/instance_inspection_test.dart
index db6b9c238..1f18be834 100644
--- a/dwds/test/instances/instance_inspection_test.dart
+++ b/dwds/test/instances/instance_inspection_test.dart
@@ -13,7 +13,7 @@ import 'package:vm_service/vm_service.dart';
 
 import '../fixtures/context.dart';
 import '../fixtures/project.dart';
-import 'instance_inspection_common.dart';
+import 'common/test_inspector.dart';
 
 void main() async {
   // Enable verbose logging for debugging.
diff --git a/dwds/test/instances/patterns_inspection_test.dart b/dwds/test/instances/patterns_inspection_test.dart
index 15f1b505a..9b972366e 100644
--- a/dwds/test/instances/patterns_inspection_test.dart
+++ b/dwds/test/instances/patterns_inspection_test.dart
@@ -16,7 +16,7 @@ import 'package:vm_service/vm_service.dart';
 
 import '../fixtures/context.dart';
 import '../fixtures/project.dart';
-import 'instance_inspection_common.dart';
+import 'common/test_inspector.dart';
 
 void main() async {
   // Enable verbose logging for debugging.
diff --git a/dwds/test/instances/record_inspection_test.dart b/dwds/test/instances/record_inspection_test.dart
index baacf25bd..a9f26ae01 100644
--- a/dwds/test/instances/record_inspection_test.dart
+++ b/dwds/test/instances/record_inspection_test.dart
@@ -13,7 +13,7 @@ import 'package:vm_service/vm_service.dart';
 
 import '../fixtures/context.dart';
 import '../fixtures/project.dart';
-import 'instance_inspection_common.dart';
+import 'common/test_inspector.dart';
 
 void main() async {
   // Enable verbose logging for debugging.
diff --git a/dwds/test/instances/record_type_inspection_test.dart b/dwds/test/instances/record_type_inspection_test.dart
index b5b02d1a2..09a4b2140 100644
--- a/dwds/test/instances/record_type_inspection_test.dart
+++ b/dwds/test/instances/record_type_inspection_test.dart
@@ -13,7 +13,7 @@ import 'package:vm_service/vm_service.dart';
 
 import '../fixtures/context.dart';
 import '../fixtures/project.dart';
-import 'instance_inspection_common.dart';
+import 'common/test_inspector.dart';
 
 void main() async {
   // Enable verbose logging for debugging.
diff --git a/dwds/test/instances/type_inspection_test.dart b/dwds/test/instances/type_inspection_test.dart
index ac770a204..1b09795d5 100644
--- a/dwds/test/instances/type_inspection_test.dart
+++ b/dwds/test/instances/type_inspection_test.dart
@@ -13,7 +13,7 @@ import 'package:vm_service/vm_service.dart';
 
 import '../fixtures/context.dart';
 import '../fixtures/project.dart';
-import 'instance_inspection_common.dart';
+import 'common/test_inspector.dart';
 
 void main() async {
   // Enable verbose logging for debugging.