diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 38ce2fa8c..7cbf277c8 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -48,8 +48,3 @@ jobs:
     - name: Build
       run: |
           ./gradlew check -x test -x integTest -x yamlRestTest
-    - name: Upload Coverage Report
-      if: matrix.os == 'ubuntu-latest'
-      uses: codecov/codecov-action@v3
-      with:
-        file: ./build/reports/jacoco/test/jacocoTestReport.xml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 33f6b4616..88c40d5ba 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,22 +18,22 @@ jobs:
         - 17
   test:
     if: github.repository == 'opensearch-project/opensearch-ai-flow-framework'
-      runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
       steps:
         - uses: actions/checkout@v4
         - name: Test
           run: ./gradlew test
-  yamlRestTest:
-    if: github.repository == 'opensearch-project/opensearch-ai-flow-framework'
-      runs-on: ${{ matrix.os }}
-      steps:
-        - uses: actions/checkout@v4
-        - name: Test
-          run: ./gradlew yamlRestTest
-  integTest:
-    if: github.repository == 'opensearch-project/opensearch-ai-flow-framework'
-      runs-on: ${{ matrix.os }}
-      steps:
-        - uses: actions/checkout@v4
-        - name: Test
-          run: ./gradlew integTest
+
+        - name: YamlRestTest
+          run:
+            ./gradlew yamlRestTest
+
+        - name: integTest
+          run:
+             ./gradlew integTest
+
+       - name: Upload Coverage Report
+          if: matrix.os == 'ubuntu-latest'
+          uses: codecov/codecov-action@v3
+          with:
+            file: ./build/reports/jacoco/test/jacocoTestReport.xml