diff --git a/.gitea/workflows/container-image.yml b/.gitea/workflows/container-image.yml
index 4a70f2b..f15f1aa 100644
--- a/.gitea/workflows/container-image.yml
+++ b/.gitea/workflows/container-image.yml
@@ -26,14 +26,7 @@ jobs:
           git fetch --depth=1 origin "${{ gitea.sha }}"
           git checkout --detach FETCH_HEAD
 
-      - name: Build test stage
-        run: |
-          docker build \
-            --target test \
-            --tag "${IMAGE_NAME}:test-${{ gitea.sha }}" \
-            .
-
-      - name: Build runtime image
+      - name: Test and build runtime image
         run: |
           docker build \
             --target runtime \
diff --git a/Dockerfile b/Dockerfile
index cda5512..7362a28 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,13 +19,16 @@ COPY app.py .
 FROM base AS test
 COPY docker-compose.yml docker-compose.local.yml ./
 COPY tests ./tests
-RUN python -m unittest discover -s tests -v
+RUN python -m unittest discover -s tests -v \
+    && touch /tmp/tests-passed
 
 # 実行用ステージ
 FROM base AS runtime
 
 # 非rootユーザーを作成
-RUN useradd --create-home --shell /bin/bash appuser \
+COPY --from=test /tmp/tests-passed /tmp/tests-passed
+RUN rm /tmp/tests-passed \
+    && useradd --create-home --shell /bin/bash appuser \
     && chown -R appuser:appuser /app
 USER appuser