diff --git a/.gitignore b/.gitignore
index 364e2e7d..cb4d6f0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 .idea/
 .DS_Store
 .vscode/
-/client/test/**/*_test.mocks.dart
+/client/test/**/*.mocks.dart
 .devcontainer/
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 90e2a591..8d624989 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,9 @@ else ifeq ($(UNAME), Windows)
 	PROTOC_FILE := $(PROTOC_ZIP_WINDOWS)
 endif
 
-DART_MOCK_FILES := $(shell find client -name "*.mocks.dart" -type f)
+# Mock 이 필요한 파일
+DART_MOCK_SRCS := $(shell find client -name "*_with_mocks.dart" -type f)
+DART_MOCK_TARGETS := $(DART_MOCK_SRCS:%_with_mocks.dart=%_with_mocks.mocks.dart)
 
 .PHONY: install
 install:
@@ -60,10 +62,10 @@ gen.dart:
 test: test.go test.dart
 
 .PHONY: test.dart
-test.dart: $(DART_MOCK_FILES)
+test.dart: $(DART_MOCK_TARGETS)
 	cd client && flutter analyze && flutter test
 
-$(DART_MOCK_FILES): $(DART_MOCK_FILES:.mocks.dart=.dart)
+$(DART_MOCK_TARGETS): $(DART_MOCK_SRCS)
 	cd client && flutter pub run build_runner build
 
 .PHONY: test.dart-e2e
diff --git a/client/test/screens/main_screen_test.dart b/client/test/screens/main_screen_test_with_mocks.dart
similarity index 97%
rename from client/test/screens/main_screen_test.dart
rename to client/test/screens/main_screen_test_with_mocks.dart
index 8a10f222..9209c1f5 100644
--- a/client/test/screens/main_screen_test.dart
+++ b/client/test/screens/main_screen_test_with_mocks.dart
@@ -7,7 +7,7 @@ import 'package:pr12er/screens/main_screen.dart';
 import 'package:pr12er/service.dart';
 import 'package:provider/provider.dart';
 
-import 'main_screen_test.mocks.dart';
+import 'main_screen_test_with_mocks.mocks.dart';
 
 Widget setup(Widget widget, GrpcClient grpcClient) {
   return Provider(