diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e21756f..a48fbd9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,8 @@ image: silex/emacs:26.3-alpine-dev
 stages:
   - pre-package-multifile
   - package
-  - test
+  - unit-test
+  - integration-test
   - deploy
 
 package-oni-conf:
@@ -139,53 +140,62 @@ package:
       - bin/
 
 test-oni-alert:
-  stage: test
+  stage: unit-test
   dependencies:
     - package
   script: make test-oni-alert TEST_ARCHIVE=$(realpath bin/)
 
 test-oni-bookmark:
-  stage: test
+  stage: unit-test
   dependencies:
     - package
   script: make test-oni-bookmark TEST_ARCHIVE=$(realpath bin/)
 
 test-oni-conf:
-  stage: test
+  stage: unit-test
   dependencies:
     - package
   script: make test-oni-conf TEST_ARCHIVE=$(realpath bin/)
 
 test-oni-css:
-  stage: test
+  stage: unit-test
   dependencies:
     - package
   script: make test-oni-css TEST_ARCHIVE=$(realpath bin/)
 
 test-oni-elisp:
-  stage: test
+  stage: unit-test
   dependencies:
     - package
   script: make test-oni-elisp TEST_ARCHIVE=$(realpath bin/)
 
 test-oni-grep:
-  stage: test
+  stage: unit-test
   dependencies:
     - package
   script: make test-oni-grep TEST_ARCHIVE=$(realpath bin/)
 
 test-oni-highlight-indent-guides:
-  stage: test
+  stage: unit-test
   dependencies:
     - package
   script: make test-oni-highlight-indent-guides TEST_ARCHIVE=$(realpath bin/)
 
 test-oni-php:
-  stage: test
+  stage: unit-test
   dependencies:
     - package
   script: make test-oni-php TEST_ARCHIVE=$(realpath bin/)
 
+integration-test:
+  stage: integration-test
+  image: registry.gitlab.com/ryuslash/emacs-config
+  dependencies:
+    - package
+  script:
+    - cd test/integration
+    - bats .
+
 deploy:
   only:
     - master