diff --git a/.github/checkgroup.yml b/.github/checkgroup.yml
index e1f6b0c3735..c4e8ac88493 100644
--- a/.github/checkgroup.yml
+++ b/.github/checkgroup.yml
@@ -30,6 +30,40 @@ subprojects:
       - "optimize-unit-test-PR-test"
       - "Genreate-OptimizeUT-Report"
 
+  # - id: "NeuralChat Unit Test"
+  #   paths:
+  #     - ".github/workflows/unit-test-neuralchat.yml"
+  #     - ".github/workflows/script/unitTest/run_unit_test_neuralchat.sh"
+  #     - "intel_extension_for_transformers/neural_chat/**"
+  #     - "requirements.txt"
+  #     - "setup.py"
+  #     - "intel_extension_for_transformers/transformers/llm/finetuning/**"
+  #     - "intel_extension_for_transformers/transformers/llm/quantization/**"
+  #     - "intel_extension_for_transformers/transformers/**"
+  #     - "intel_extension_for_transformers/langchain/**"
+  #     - "!intel_extension_for_transformers/neural_chat/docs/**"
+  #     - "!intel_extension_for_transformers/neural_chat/examples/**"
+  #     - "!intel_extension_for_transformers/neural_chat/assets/**"
+  #     - "!intel_extension_for_transformers/neural_chat/README.md"
+  #   checks:
+  #     - "neuralchat-unit-test-baseline"
+  #     - "neuralchat-unit-test-PR-test"
+  #     - "Generate-NeuralChat-Report"
+
+  - id: "Engine Unit Test workflow"
+    paths:
+      - ".github/workflows/unit-test-engine.yml"
+      - "requirements.txt"
+      - "setup.py"
+      - intel_extension_for_transformers/transformers/**
+      - "intel_extension_for_transformers/transformers/runtime/**"
+      - "!intel_extension_for_transformers/transformers/runtime/kernels/**"
+      - "!intel_extension_for_transformers/transformers/runtime/third_party/**"
+      - "!intel_extension_for_transformers/transformers/runtime/docs/**"
+    checks:
+      - "engine-unit-test-baseline"
+      - "engine-unit-test-PR-test"
+      - "Genreate-Engine-Report"
 
   # - id: "Windows Binary Test"
   #   paths:
diff --git a/.github/workflows/script/unitTest/env_setup.sh b/.github/workflows/script/unitTest/env_setup.sh
index 4afbf606c32..bdf1e44b5bd 100644
--- a/.github/workflows/script/unitTest/env_setup.sh
+++ b/.github/workflows/script/unitTest/env_setup.sh
@@ -1,6 +1,6 @@
 pip list
 
-inc=$(pip list | grep -c 'neural-compressor') || true # Prevent from exiting when 'inc' not found
+inc=$(pip list | grep -c 'neural[-_]compressor') || true # Prevent from exiting when 'inc' not found
 if [ ${inc} != 0 ]; then
     pip uninstall neural-compressor -y
     pip list
diff --git a/.github/workflows/unit-test-engine.yml b/.github/workflows/unit-test-engine.yml
index d0045bac863..7693dc8ab39 100644
--- a/.github/workflows/unit-test-engine.yml
+++ b/.github/workflows/unit-test-engine.yml
@@ -35,6 +35,7 @@ jobs:
   engine-unit-test:
     runs-on: [self-hosted, linux, X64, itrex-node]
     strategy:
+      fail-fast: true
       matrix:
         include:
           - test_branch: ${{ github.ref }}
@@ -62,7 +63,7 @@ jobs:
         with:
           submodules: "recursive"
           ref: ${{ matrix.test_branch }}
-          fetch-tags: true
+          fetch-depth: 0
 
       - name: Docker Build
         run: |
diff --git a/.github/workflows/unit-test-neuralchat.yml b/.github/workflows/unit-test-neuralchat.yml
index f2a6e15b2ac..954ddd4726a 100644
--- a/.github/workflows/unit-test-neuralchat.yml
+++ b/.github/workflows/unit-test-neuralchat.yml
@@ -42,6 +42,7 @@ jobs:
   neuralchat-unit-test:
     runs-on: [self-hosted, Linux, X64, itrex-node]
     strategy:
+      fail-fast: true
       matrix:
         include:
           - test_branch: ${{ github.ref }}
@@ -69,7 +70,7 @@ jobs:
         with:
           submodules: "recursive"
           ref: ${{ matrix.test_branch }}
-          fetch-tags: true
+          fetch-depth: 0
 
       - name: docker Build
         run: |
diff --git a/intel_extension_for_transformers/transformers/runtime/test/pytest/requirements.txt b/intel_extension_for_transformers/transformers/runtime/test/pytest/requirements.txt
index 38800269c84..c3797db1c03 100644
--- a/intel_extension_for_transformers/transformers/runtime/test/pytest/requirements.txt
+++ b/intel_extension_for_transformers/transformers/runtime/test/pytest/requirements.txt
@@ -1,6 +1,7 @@
 --extra-index-url https://download.pytorch.org/whl/cpu
 accelerate
 datasets
+git+https://github.com/huggingface/optimum-intel.git@50d867c13b22c22eda451ddb67bddb8159670f85
 intel-extension-for-pytorch==2.3.0
 intel-tensorflow==2.12.0
 onnx