diff --git a/apps/cic-eth/.gitlab-ci.yml b/apps/cic-eth/.gitlab-ci.yml
index 607fec9c..5491260b 100644
--- a/apps/cic-eth/.gitlab-ci.yml
+++ b/apps/cic-eth/.gitlab-ci.yml
@@ -8,18 +8,24 @@
         - changes:
             - $CONTEXT/$APP_NAME/*
 
-build-mr-cic-eth:
+# build-mr-cic-eth:
+#     extends:
+#         - .cic_eth_changes_target
+#         - .py_build_merge_request
+#         - .cic_eth_variables
+
+build-mr-unittest-cic-eth:
     extends:
         - .cic_eth_changes_target
-        - .py_build_merge_request
         - .cic_eth_variables
-    variables:
-        PYTHONPATH: .
-    after_script:
-        - pip install -r test_requirements.txt
-        - pytest tests/unit/
-        - pytest tests/task/
-        - pytest tests/filters/
+        - .py_build_unittest_merge_request
+
+test-mr-unittest-cic-eth:
+    extends:
+        - .cic_eth_changes_target
+        - .cic_eth_variables
+        - .py_unittest_merge_request
+    
 
 build-push-cic-eth:
     extends:
diff --git a/ci_templates/.cic-template.yml b/ci_templates/.cic-template.yml
index 3fda149a..6e0fc791 100644
--- a/ci_templates/.cic-template.yml
+++ b/ci_templates/.cic-template.yml
@@ -9,7 +9,7 @@ variables:
 .py_build_merge_request:
   stage: build
   variables:
-    - CI_DEBUG_TRACE: "true"
+    CI_DEBUG_TRACE: "true"
   script:
     - mkdir -p /kaniko/.docker
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > "/kaniko/.docker/config.json"
@@ -18,6 +18,33 @@ variables:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       when: always
 
+.py_build_unittest_merge_request:
+  stage: build
+  variables:
+    CI_DEBUG_TRACE: "true"
+  artifacts:
+    paths:
+      - $APP-test-image.tar
+    expire_in: 1 week
+    when: on_success
+  script:
+    - mkdir -p /kaniko/.docker
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > "/kaniko/.docker/config.json"
+    - /kaniko/executor --context $CONTEXT --dockerfile $DOCKERFILE_PATH $KANIKO_CACHE_ARGS --cache-repo $CI_REGISTRY_IMAGE --target test --tarPath $APP-test-image.tar --no-push
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      when: always
+
+
+.py_unittest_merge_request:
+  stage: test
+  script:
+    - docker load -i $APP-test-image.tar
+    - docker images
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      when: always
+
 .py_build_push:
   stage: build
   variables: