diff --git a/.github/workflows/backend-ci.yml b/.github/workflows/backend-ci.yml
new file mode 100644
index 0000000..4f0bed7
--- /dev/null
+++ b/.github/workflows/backend-ci.yml
@@ -0,0 +1,262 @@
+name: Backend CI
+
+on:
+  pull_request:
+    paths:
+      - "motionit/**"
+      - ".github/**"
+  push:
+    branches: [ main, develop ]
+
+permissions:
+  contents: read
+  checks: write
+  pull-requests: write
+
+jobs:
+  backend-test:
+    runs-on: ubuntu-latest
+
+    defaults:
+      run:
+        working-directory: motionit
+
+    # 🔑 여기서 GitHub Secrets → Spring이 참조하는 환경변수명으로 매핑
+    # application.yml 의 ${...} 키와 "정확히 같은 이름"으로 두면 .env 없이도 동작합니다.
+    env:
+      # Spring 실행 프로필: CI/H2용
+      SPRING_PROFILES_ACTIVE: test
+      # H2로 테스트 (필요 시 YourTestConfig에 맞게 조정)
+      SPRING_DATASOURCE_URL: jdbc:h2:mem:testdb;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false
+      SPRING_DATASOURCE_USERNAME: sa
+      SPRING_DATASOURCE_PASSWORD: ""
+
+      # ====== app에서 참조하는 키들 ======
+      AWS_ACCESS_KEY:        ${{ secrets.AWS_ACCESS_KEY }}
+      AWS_SECRET_KEY:        ${{ secrets.AWS_SECRET_KEY }}
+      AWS_S3_BUCKET_NAME:    ${{ secrets.AWS_S3_BUCKET_NAME }}
+      AWS_CLOUDFRONT_DOMAIN: ${{ secrets.AWS_CLOUDFRONT_DOMAIN }}
+      AWS_CLOUDFRONT_KEY_ID: ${{ secrets.AWS_CLOUDFRONT_KEY_ID }}
+      # CloudFront 프라이빗키는 보통 파일 경로가 필요합니다.
+      # 테스트에서는 사용하지 않게 분기하는 편이 안전하지만,
+      # 임시로 /tmp/key.pem 경로에 써두고 경로만 주입해도 됩니다. (아래 "옵션: 키 파일 생성" 참고)
+      AWS_CLOUDFRONT_PRIVATE_KEY_PATH: /tmp/cloudfront_key.pem
+      AWS_CLOUDFRONT_PRIVATE_KEY_PEM: ${{ secrets.AWS_CLOUDFRONT_PRIVATE_KEY_PEM }}
+
+      JWT_SECRET:               ${{ secrets.JWT_SECRET }}
+      JWT_ACCESS_TOKEN_EXPIRATION: "3600"
+      JWT_REFRESH_TOKEN_EXPIRATION: "1209600"
+
+      OPENAI_API_KEY:         ${{ secrets.OPENAI_API_KEY }}
+      YOUTUBE_API_KEY:        ${{ secrets.YOUTUBE_API_KEY }}
+      KAKAO_CLIENT_ID:        ${{ secrets.KAKAO_CLIENT_ID }}
+
+      # 프론트 리다이렉트 주소 등 테스트용 기본값
+      # 필요시 Secrets로 빼도 됨
+      # app.oauth2.redirect-url은 application.yml에 상수로 있으니 보통 불필요
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Java 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 21
+
+      - name: Grant execute permission for Gradle Wrapper
+        run: chmod +x gradlew
+
+      # (옵션) CloudFront 프라이빗 키 파일 생성 — 테스트 코드가 해당 파일을 접근한다면 필요
+      - name: Write CloudFront private key (optional)
+        if: ${{ env.AWS_CLOUDFRONT_PRIVATE_KEY_PATH != '' && env.AWS_CLOUDFRONT_PRIVATE_KEY_PEM != '' }}
+        run: |
+          printf "%s" "$AWS_CLOUDFRONT_PRIVATE_KEY_PEM" > "$AWS_CLOUDFRONT_PRIVATE_KEY_PATH"
+          chmod 600 "$AWS_CLOUDFRONT_PRIVATE_KEY_PATH"
+
+      # 전체(단위+통합) 실행
+      - name: Run Full Test
+        run: ./gradlew clean fullTest
+
+      - name: Generate JaCoCo (fullTest)
+        run: ./gradlew jacocoFullTestReport
+
+      # 실패/성공과 무관하게 리포팅 단계는 진행
+      - name: Publish Unit Test Results (JUnit)
+        if: always()
+        uses: EnricoMi/publish-unit-test-result-action@v2
+        with:
+          files: |
+            motionit/build/test-results/test/*.xml
+            motionit/build/test-results/fullTest/*.xml
+          check_run: true
+          comment_mode: always
+
+      - name: Upload failed-tests.txt (if exists)
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: failed-tests
+          path: motionit/build/reports/tests/failed-tests.txt
+          if-no-files-found: ignore
+
+      - name: Upsert PR comment with failed tests
+        if: always()
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const fs = require('fs');
+            const path = 'motionit/build/reports/tests/failed-tests.txt';
+            const MARK = '<!-- FAILED-TESTS-SUMMARY -->';
+
+            function buildBody(textBlock) {
+              return [
+                MARK,
+                '### ❌ Failed Tests (from Gradle summary)',
+                '',
+                '<details><summary>Expand</summary>',
+                '',
+                '```text',
+                textBlock,
+                '```',
+                '',
+                '</details>'
+              ].join('\n');
+            }
+
+            if (!context.payload.pull_request) {
+              core.info('Not a PR event, skip commenting');
+              return;
+            }
+
+            const { data: comments } = await github.rest.issues.listComments({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.payload.pull_request.number,
+              per_page: 100
+            });
+
+            // 파일이 없거나, No failures면 기존 마커 댓글 삭제
+            if (!fs.existsSync(path)) {
+              const existing = comments.find(c => c.user.type === 'Bot' && c.body.includes(MARK));
+              if (existing) {
+                await github.rest.issues.deleteComment({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  comment_id: existing.id
+                });
+              }
+              return;
+            }
+
+            const content = fs.readFileSync(path, 'utf8').trim();
+            if (!content || content === 'No failures 🎉') {
+              const existing = comments.find(c => c.user.type === 'Bot' && c.body.includes(MARK));
+              if (existing) {
+                await github.rest.issues.deleteComment({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  comment_id: existing.id
+                });
+              }
+              return;
+            }
+
+            const body = buildBody(content);
+            const existing = comments.find(c => c.user.type === 'Bot' && c.body.includes(MARK));
+            if (existing) {
+              await github.rest.issues.updateComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                comment_id: existing.id,
+                body
+              });
+            } else {
+              await github.rest.issues.createComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: context.payload.pull_request.number,
+                body
+              });
+            }
+
+      - name: Upload JaCoCo HTML
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: jacoco-full-html
+          path: motionit/build/reports/jacocoFull/html
+          if-no-files-found: warn
+
+      - name: Install xmllint
+        if: always()
+        run: sudo apt-get update && sudo apt-get install -y libxml2-utils
+
+      - name: Compute coverage & upsert PR comment
+        if: always() && github.event_name == 'pull_request'
+        id: cov
+        run: |
+          # 하나의 리포트로 예: fullTest 기준
+          XML="motionit/build/reports/jacocoFull/xml/jacocoFullTestReport.xml"
+          if [ ! -f "$XML" ]; then
+            echo "XML not found: $XML"
+            echo "pct=0" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          COVERED=$(xmllint --xpath "string(sum(//counter[@type='LINE']/@covered))" "$XML")
+          MISSED=$(xmllint --xpath "string(sum(//counter[@type='LINE']/@missed))" "$XML")
+          TOTAL=$(( ${COVERED%.*} + ${MISSED%.*} ))
+          if [ "$TOTAL" -eq 0 ]; then
+            PCT=0
+          else
+            # 소수점 2자리
+            PCT=$(awk "BEGIN { printf \"%.2f\", ($COVERED/($COVERED+$MISSED))*100 }")
+          fi
+          echo "pct=$PCT" >> $GITHUB_OUTPUT
+        shell: bash
+
+      - name: Upsert PR comment (coverage)
+        if: always() && github.event_name == 'pull_request'
+        uses: actions/github-script@v7
+        env:
+          PCT: ${{ steps.cov.outputs.pct }}
+        with:
+          script: |
+            const MARK = '<!-- JACOCO-COVERAGE-SUMMARY -->';
+            const pct = process.env.PCT || '0';
+            const body = `${MARK}
+            ### 🧪 JaCoCo Coverage
+            **Line Coverage:** ${pct}%`;
+
+            const { data: comments } = await github.rest.issues.listComments({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.payload.pull_request.number,
+              per_page: 100
+            });
+            const existing = comments.find(c => c.user.type === 'Bot' && c.body.includes(MARK));
+            if (existing) {
+              await github.rest.issues.updateComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                comment_id: existing.id,
+                body
+              });
+            } else {
+              await github.rest.issues.createComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: context.payload.pull_request.number,
+                body
+              });
+            }
+
+      - name: Write application-test.yml from secret
+        working-directory: motionit
+        run: |
+          mkdir -p src/test/resources
+          cat > src/test/resources/application-test.yml <<'YAML'
+          ${{ secrets.APPLICATION_TEST_YML }}
+          YAML
\ No newline at end of file
diff --git a/motionit/build.gradle.kts b/motionit/build.gradle.kts
index 0563eae..f4b24a7 100644
--- a/motionit/build.gradle.kts
+++ b/motionit/build.gradle.kts
@@ -3,9 +3,9 @@ plugins {
     id("org.springframework.boot") version "3.5.6"
     id("io.spring.dependency-management") version "1.1.7"
     checkstyle
+    jacoco
 }
 
-
 group = "com.back"
 version = "0.0.1-SNAPSHOT"
 description = "motionit"
@@ -35,28 +35,32 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.boot:spring-boot-starter-oauth2-client")
     implementation("org.springframework.boot:spring-boot-starter-websocket")
+
     compileOnly("org.projectlombok:lombok")
     developmentOnly("org.springframework.boot:spring-boot-devtools")
     runtimeOnly("com.h2database:h2")
     runtimeOnly("com.mysql:mysql-connector-j")
     annotationProcessor("org.projectlombok:lombok")
+
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("org.springframework.batch:spring-batch-test")
     testImplementation("org.springframework.security:spring-security-test")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+
     implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.13")
     testImplementation("net.datafaker:datafaker:2.3.1")
     testImplementation("com.jayway.jsonpath:json-path")
+
     implementation("io.jsonwebtoken:jjwt-api:0.12.6")
     runtimeOnly("io.jsonwebtoken:jjwt-impl:0.12.6")
     runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.12.6")
+
     implementation("com.google.apis:google-api-services-youtube:v3-rev222-1.25.0")
 
     // AWS
     implementation("software.amazon.awssdk:s3:2.27.21")
     implementation("software.amazon.awssdk:auth:2.27.21")
     implementation("software.amazon.awssdk:regions:2.27.21")
-    implementation("software.amazon.awssdk:s3:2.27.21")
     implementation("software.amazon.awssdk:cloudfront:2.27.21")
     implementation("com.amazonaws:aws-java-sdk-cloudfront:1.12.782")
 
@@ -64,7 +68,6 @@ dependencies {
     implementation("com.theokanning.openai-gpt3-java:service:0.18.2")
 }
 
-
 tasks.withType<JavaCompile>().configureEach {
     options.encoding = "UTF-8"
     options.compilerArgs.add("-parameters")
@@ -87,6 +90,171 @@ checkstyle {
     )
 }
 
-tasks.withType<Test> {
+/** -----------------------------
+ *  JaCoCo (한 곳에서만 선언)
+ *  ----------------------------- */
+jacoco {
+    toolVersion = "0.8.12" // Java 21 호환
+}
+
+/** 공통 커버리지 제외 패턴 */
+val coverageExcludes = listOf(
+    "**/*Application*",
+    "**/config/**",
+    "**/dto/**",
+    "**/exception/**",
+    "**/vo/**",
+    "**/Q*.*",                 // Querydsl 생성물
+    "**/*\$*Companion*.*"      // Kotlin 내부 생성물
+)
+
+/** -----------------------------
+ *  Test 공통 설정 (로깅/요약/실패수집)
+ *  ----------------------------- */
+tasks.withType<Test>().configureEach {
+    useJUnitPlatform()
+
+    testLogging {
+        events("PASSED", "FAILED", "SKIPPED")
+        exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
+        showExceptions = true
+        showCauses = true
+        showStackTraces = true
+        showStandardStreams = true
+    }
+
+    val failed = mutableListOf<Triple<String, String, String?>>() // class, method, msg
+    addTestListener(object : org.gradle.api.tasks.testing.TestListener {
+        override fun beforeSuite(suite: TestDescriptor) {}
+        override fun beforeTest(testDescriptor: TestDescriptor) {}
+
+        override fun afterTest(desc: TestDescriptor, result: TestResult) {
+            if (result.resultType == TestResult.ResultType.FAILURE) {
+                val clazz = desc.className ?: "(unknown-class)"
+                val method = desc.name
+                val msg = result.exception?.message?.lineSequence()?.firstOrNull()
+                failed += Triple(clazz, method, msg)
+            }
+        }
+
+        override fun afterSuite(suite: TestDescriptor, result: TestResult) {
+            if (suite.parent == null) {
+                println(
+                    """
+                    ------------------------
+                    ✅ TEST RESULT SUMMARY
+                    Total tests : ${result.testCount}
+                    Passed      : ${result.successfulTestCount}
+                    Failed      : ${result.failedTestCount}
+                    Skipped     : ${result.skippedTestCount}
+                    ------------------------
+                    """.trimIndent()
+                )
+                val out = layout.buildDirectory.file("reports/tests/failed-tests.txt").get().asFile
+                out.parentFile.mkdirs()
+
+                if (failed.isNotEmpty()) {
+                    val RED = "\u001B[31m"
+                    val RESET = "\u001B[0m"
+                    println("❌ FAILED TESTS (${failed.size})")
+                    failed.forEachIndexed { i, (c, m, msg) ->
+                        println("${RED}${i + 1}. $c#$m${if (msg != null) "  —  $msg" else ""}${RESET}")
+                    }
+                    out.printWriter().use { pw ->
+                        pw.println("FAILED TESTS (${failed.size})")
+                        failed.forEach { (c, m, msg) ->
+                            pw.println("$c#$m${if (msg != null) " — $msg" else ""}")
+                        }
+                        pw.println()
+                        pw.println("Patterns for --tests:")
+                        failed.forEach { (c, m, _) -> pw.println("--tests \"$c.$m\"") }
+                    }
+                    println("📄 Saved failed list -> ${out.absolutePath}")
+                } else {
+                    out.writeText("No failures 🎉")
+                }
+            }
+        }
+    })
+}
+
+/** -----------------------------
+ *  기본 test 태스크 (unit 기본, -PincludeIntegration=true 시 통합 포함)
+ *  ----------------------------- */
+tasks.named<Test>("test") {
+    if (project.findProperty("includeIntegration") == "true") {
+        systemProperty("junit.platform.tags.includes", "integration,unit")
+    } else {
+        systemProperty("junit.platform.tags.excludes", "integration")
+    }
+    finalizedBy(tasks.jacocoTestReport)
+}
+
+/** -----------------------------
+ *  fullTest: 단위+통합 모두 실행 (CI에서 사용)
+ *  ----------------------------- */
+tasks.register<Test>("fullTest") {
+    description = "Run unit + integration tests"
+    group = "verification"
+
+    val testSourceSet = sourceSets.named("test").get()
+    testClassesDirs = testSourceSet.output.classesDirs
+    classpath = testSourceSet.runtimeClasspath
+
     useJUnitPlatform()
+    systemProperty("junit.platform.tags.includes", "integration,unit")
+
+    shouldRunAfter(tasks.named("test"))
+    finalizedBy(tasks.named("jacocoFullTestReport"))
 }
+
+/** -----------------------------
+ *  JaCoCo 리포트 (test)
+ *  ----------------------------- */
+tasks.jacocoTestReport {
+    dependsOn(tasks.named("test"))
+    reports {
+        xml.required.set(true)
+        // PR 코멘트 액션에서 사용하기 쉬운 고정 경로
+        xml.outputLocation.set(layout.buildDirectory.file("reports/jacoco/xml/jacocoTestReport.xml"))
+        html.required.set(true)
+        csv.required.set(false)
+        html.outputLocation.set(layout.buildDirectory.dir("reports/jacoco/html"))
+    }
+    classDirectories.setFrom(
+        files(
+            classDirectories.files.map {
+                fileTree(it) { exclude(coverageExcludes) }
+            }
+        )
+    )
+}
+
+/** -----------------------------
+ *  JaCoCo 리포트 (fullTest)
+ *  ----------------------------- */
+tasks.register<JacocoReport>("jacocoFullTestReport") {
+    dependsOn(tasks.named("fullTest"))
+
+    // fullTest의 실행 결과(Exec)를 태스크 참조로 안전하게 수집
+    executionData(tasks.named("fullTest"))
+
+    reports {
+        xml.required.set(true)
+        // PR 코멘트 액션에서 사용하기 쉬운 고정 경로
+        xml.outputLocation.set(layout.buildDirectory.file("reports/jacocoFull/xml/jacocoFullTestReport.xml"))
+        html.required.set(true)
+        csv.required.set(false)
+        html.outputLocation.set(layout.buildDirectory.dir("reports/jacocoFull/html"))
+    }
+
+    val main = sourceSets.named("main").get()
+    sourceDirectories.setFrom(main.allSource.srcDirs)
+    classDirectories.setFrom(
+        files(
+            main.output.classesDirs.files.map {
+                fileTree(it) { exclude(coverageExcludes) }
+            }
+        )
+    )
+}
\ No newline at end of file
diff --git a/motionit/src/main/java/com/back/motionit/global/service/CloudFrontCookieService.java b/motionit/src/main/java/com/back/motionit/global/service/CloudFrontCookieService.java
index 65a7f3f..449acc3 100644
--- a/motionit/src/main/java/com/back/motionit/global/service/CloudFrontCookieService.java
+++ b/motionit/src/main/java/com/back/motionit/global/service/CloudFrontCookieService.java
@@ -8,6 +8,7 @@
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ResourceUtils;
 
@@ -19,6 +20,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 
 @Component
+@Profile("!test")
 public class CloudFrontCookieService {
 	@Value("${aws.cloudfront.domain}")
 	private String cloudFrontDomain;
diff --git a/motionit/src/test/java/com/back/motionit/MotionitApplicationTests.java b/motionit/src/test/java/com/back/motionit/MotionitApplicationTests.java
index c77739e..9f6d900 100644
--- a/motionit/src/test/java/com/back/motionit/MotionitApplicationTests.java
+++ b/motionit/src/test/java/com/back/motionit/MotionitApplicationTests.java
@@ -1,9 +1,11 @@
 package com.back.motionit;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest
+@Disabled("CI에서 불필요한 전체 컨텍스트 부팅 방지")
 class MotionitApplicationTests {
 
 	@Test
diff --git a/motionit/src/test/java/com/back/motionit/domain/auth/service/AuthTokenServiceTest.java b/motionit/src/test/java/com/back/motionit/domain/auth/service/AuthTokenServiceTest.java
index 229d9ca..6a9b627 100644
--- a/motionit/src/test/java/com/back/motionit/domain/auth/service/AuthTokenServiceTest.java
+++ b/motionit/src/test/java/com/back/motionit/domain/auth/service/AuthTokenServiceTest.java
@@ -8,10 +8,11 @@
 
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
 
 import com.back.motionit.domain.auth.dto.TokenRefreshResponse;
 import com.back.motionit.domain.user.entity.User;
@@ -21,20 +22,20 @@
 import com.back.motionit.global.request.RequestContext;
 import com.back.motionit.security.jwt.JwtTokenProvider;
 
-@SpringBootTest
+@ExtendWith(MockitoExtension.class)
 @ActiveProfiles("test")
 class AuthTokenServiceTest {
 
-	@Autowired
+	@InjectMocks
 	private AuthTokenService authTokenService;
 
-	@MockitoBean
+	@Mock
 	private JwtTokenProvider jwtTokenProvider;
 
-	@MockitoBean
+	@Mock
 	private UserRepository userRepository;
 
-	@MockitoBean
+	@Mock
 	private RequestContext requestContext;
 
 	private static final String VALID_RT = "valid_refresh_token";
diff --git a/motionit/src/test/java/com/back/motionit/domain/challenge/comment/controller/CommentControllerTest.java b/motionit/src/test/java/com/back/motionit/domain/challenge/comment/controller/CommentControllerTest.java
index 42ce09d..7f4b15e 100644
--- a/motionit/src/test/java/com/back/motionit/domain/challenge/comment/controller/CommentControllerTest.java
+++ b/motionit/src/test/java/com/back/motionit/domain/challenge/comment/controller/CommentControllerTest.java
@@ -9,6 +9,7 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
@@ -33,6 +34,7 @@
 @SpringBootTest
 @AutoConfigureMockMvc(addFilters = false)
 @ActiveProfiles("test")
+@Tag("integration")
 @TestPropertySource(properties = "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration")
 class CommentControllerIntegrationTest {
 
diff --git a/motionit/src/test/java/com/back/motionit/domain/challenge/like/controller/CommentLikeControllerTest.java b/motionit/src/test/java/com/back/motionit/domain/challenge/like/controller/CommentLikeControllerTest.java
index c875d19..91fe036 100644
--- a/motionit/src/test/java/com/back/motionit/domain/challenge/like/controller/CommentLikeControllerTest.java
+++ b/motionit/src/test/java/com/back/motionit/domain/challenge/like/controller/CommentLikeControllerTest.java
@@ -16,9 +16,11 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -49,6 +51,8 @@
 @SpringBootTest
 @ActiveProfiles("test")
 @AutoConfigureMockMvc(addFilters = false)
+@WebMvcTest(CommentLikeController.class)
+@Tag("integration")
 @Transactional
 public class CommentLikeControllerTest {
 
diff --git a/motionit/src/test/java/com/back/motionit/domain/challenge/participant/controller/ChallengeParticipantControllerTest.java b/motionit/src/test/java/com/back/motionit/domain/challenge/participant/controller/ChallengeParticipantControllerTest.java
index 0edee5a..48ed6c2 100644
--- a/motionit/src/test/java/com/back/motionit/domain/challenge/participant/controller/ChallengeParticipantControllerTest.java
+++ b/motionit/src/test/java/com/back/motionit/domain/challenge/participant/controller/ChallengeParticipantControllerTest.java
@@ -10,9 +10,11 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -38,6 +40,8 @@
 @SpringBootTest
 @ActiveProfiles("test")
 @AutoConfigureMockMvc(addFilters = false)
+@WebMvcTest(ChallengeParticipantController.class)
+@Tag("integration")
 @Transactional
 public class ChallengeParticipantControllerTest {
 
diff --git a/motionit/src/test/java/com/back/motionit/domain/challenge/room/controller/ChallengeRoomControllerTest.java b/motionit/src/test/java/com/back/motionit/domain/challenge/room/controller/ChallengeRoomControllerTest.java
index af517a6..a9d18f5 100644
--- a/motionit/src/test/java/com/back/motionit/domain/challenge/room/controller/ChallengeRoomControllerTest.java
+++ b/motionit/src/test/java/com/back/motionit/domain/challenge/room/controller/ChallengeRoomControllerTest.java
@@ -12,9 +12,11 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -50,6 +52,8 @@
 @SpringBootTest
 @ActiveProfiles("test")
 @AutoConfigureMockMvc(addFilters = false)
+@WebMvcTest(ChallengeRoomController.class)
+@Tag("integration")
 @Transactional
 public class ChallengeRoomControllerTest {
 
diff --git a/motionit/src/test/java/com/back/motionit/domain/challenge/video/controller/ChallengeVideoControllerTest.java b/motionit/src/test/java/com/back/motionit/domain/challenge/video/controller/ChallengeVideoControllerTest.java
index 66582a3..1741d21 100644
--- a/motionit/src/test/java/com/back/motionit/domain/challenge/video/controller/ChallengeVideoControllerTest.java
+++ b/motionit/src/test/java/com/back/motionit/domain/challenge/video/controller/ChallengeVideoControllerTest.java
@@ -8,9 +8,11 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -40,6 +42,8 @@
 @SpringBootTest
 @ActiveProfiles("test")
 @AutoConfigureMockMvc(addFilters = false)
+@WebMvcTest(ChallengeVideoController.class)
+@Tag("integration")
 @Transactional
 class ChallengeVideoControllerTest {