diff --git a/apps/user-service/src/test/java/com/gltkorea/icebang/annotation/E2eTest.java b/apps/user-service/src/test/java/com/gltkorea/icebang/annotation/E2eTest.java
index 7af9cf40..43290a4a 100644
--- a/apps/user-service/src/test/java/com/gltkorea/icebang/annotation/E2eTest.java
+++ b/apps/user-service/src/test/java/com/gltkorea/icebang/annotation/E2eTest.java
@@ -5,6 +5,11 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.junit.jupiter.api.Tag;
+import org.springframework.test.context.ActiveProfiles;
+
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
+@Tag("e2e")
+@ActiveProfiles("test-e2e")
 public @interface E2eTest {}
diff --git a/apps/user-service/src/test/java/com/gltkorea/icebang/annotation/UnitTest.java b/apps/user-service/src/test/java/com/gltkorea/icebang/annotation/UnitTest.java
index bace7ed4..1927475a 100644
--- a/apps/user-service/src/test/java/com/gltkorea/icebang/annotation/UnitTest.java
+++ b/apps/user-service/src/test/java/com/gltkorea/icebang/annotation/UnitTest.java
@@ -5,6 +5,11 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.junit.jupiter.api.Tag;
+import org.springframework.test.context.ActiveProfiles;
+
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
+@Tag("unit")
+@ActiveProfiles("test-unit")
 public @interface UnitTest {}
diff --git a/apps/user-service/src/test/java/com/gltkorea/icebang/support/E2eTestSupport.java b/apps/user-service/src/test/java/com/gltkorea/icebang/support/E2eTestSupport.java
index d3492a70..ddb3afd9 100644
--- a/apps/user-service/src/test/java/com/gltkorea/icebang/support/E2eTestSupport.java
+++ b/apps/user-service/src/test/java/com/gltkorea/icebang/support/E2eTestSupport.java
@@ -1,19 +1,17 @@
 package com.gltkorea.icebang.support;
 
-import org.junit.jupiter.api.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.context.annotation.Import;
-import org.springframework.test.context.ActiveProfiles;
 
+import com.gltkorea.icebang.annotation.E2eTest;
 import com.gltkorea.icebang.config.E2eTestConfiguration;
 
-@Tag("e2e")
 @Import(E2eTestConfiguration.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("test-e2e")
+@E2eTest
 public abstract class E2eTestSupport {
 
   @LocalServerPort protected int port;
diff --git a/apps/user-service/src/test/java/com/gltkorea/icebang/support/E2eTestSupportTest.java b/apps/user-service/src/test/java/com/gltkorea/icebang/support/E2eTestSupportTest.java
index 41c24bf0..7fd2deff 100644
--- a/apps/user-service/src/test/java/com/gltkorea/icebang/support/E2eTestSupportTest.java
+++ b/apps/user-service/src/test/java/com/gltkorea/icebang/support/E2eTestSupportTest.java
@@ -5,7 +5,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.test.context.jdbc.Sql;
 
-@Sql(scripts = "classpath:sql/create-users-entity.sql")
+@Sql(scripts = "classpath:sql/schema.sql")
 class E2eTestSupportTest extends E2eTestSupport {
 
   @Test
diff --git a/apps/user-service/src/test/java/com/gltkorea/icebang/support/UnitTestSupport.java b/apps/user-service/src/test/java/com/gltkorea/icebang/support/UnitTestSupport.java
index 07414d89..88c4315e 100644
--- a/apps/user-service/src/test/java/com/gltkorea/icebang/support/UnitTestSupport.java
+++ b/apps/user-service/src/test/java/com/gltkorea/icebang/support/UnitTestSupport.java
@@ -1,12 +1,11 @@
 package com.gltkorea.icebang.support;
 
-import org.junit.jupiter.api.Tag;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
 
-@Tag("unit")
+import com.gltkorea.icebang.annotation.UnitTest;
+
 @SpringBootTest
-@ActiveProfiles("test-unit")
+@UnitTest
 public abstract class UnitTestSupport {
 
   // 공통 유틸리티 메서드들
diff --git a/apps/user-service/src/test/resources/sql/create-users-entity.sql b/apps/user-service/src/test/resources/sql/schema.sql
similarity index 100%
rename from apps/user-service/src/test/resources/sql/create-users-entity.sql
rename to apps/user-service/src/test/resources/sql/schema.sql