diff --git a/test/layer/tile_layer/tile_provider/network_image_provider_test.dart b/test/layer/tile_layer/tile_provider/network_image_provider_test.dart
index 5852866e2..53b22a30a 100644
--- a/test/layer/tile_layer/tile_provider/network_image_provider_test.dart
+++ b/test/layer/tile_layer/tile_provider/network_image_provider_test.dart
@@ -1,5 +1,3 @@
-// ignore_for_file: avoid_print
-
 import 'dart:async';
 import 'dart:convert';
 import 'dart:typed_data';
@@ -23,11 +21,9 @@ Future<ImageInfo> getImageInfo(ImageProvider provider) {
   stream.addListener(
     ImageStreamListener(
       (imageInfo, _) {
-        print('completer.complete($imageInfo)');
         return completer.complete(imageInfo);
       },
       onError: (exception, stackTrace) {
-        print('completer.completeError($exception)');
         return completer.completeError(exception, stackTrace);
       },
     ),
@@ -67,7 +63,6 @@ void main() {
     final url = randomUrl();
     when(() => mockClient.readBytes(any(), headers: any(named: 'headers')))
         .thenAnswer((_) async {
-      print('1');
       return testWhiteTileBytes;
     });
 
@@ -93,7 +88,6 @@ void main() {
     final url = randomUrl();
     when(() => mockClient.readBytes(any(), headers: any(named: 'headers')))
         .thenAnswer((_) async {
-      print('2');
       throw ClientException(
         'Server error',
       );
diff --git a/test/misc/frame_constraint_test.dart b/test/map/camera/camera_constraint_test.test
similarity index 100%
rename from test/misc/frame_constraint_test.dart
rename to test/map/camera/camera_constraint_test.test
diff --git a/test/flutter_map_controller_test.dart b/test/map/map_controller_test.dart
similarity index 99%
rename from test/flutter_map_controller_test.dart
rename to test/map/map_controller_test.dart
index 3d7c5783b..6e75c7aa2 100644
--- a/test/flutter_map_controller_test.dart
+++ b/test/map/map_controller_test.dart
@@ -5,7 +5,7 @@ import 'package:flutter_map/src/map/map_controller.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:latlong2/latlong.dart';
 
-import 'test_utils/test_app.dart';
+import '../test_utils/test_app.dart';
 
 void main() {
   testWidgets('test fit bounds methods', (tester) async {