diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 6b2d1b4ef..fb5f68303 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -50,32 +50,7 @@ jobs:
           key: ${{ runner.os }}-${{ github.sha }}-tm-binary
         if: env.GIT_DIFF
 
-#  test_abci_apps:
-#    runs-on: ubuntu-latest
-#    needs: build
-#    timeout-minutes: 5
-#    steps:
-#      - uses: actions/setup-go@v2
-#        with:
-#          go-version: "^1.15.4"
-#      - uses: actions/checkout@v2
-#      - uses: technote-space/get-diff-action@v4
-#        with:
-#          PATTERNS: |
-#            **/**.go
-#            go.mod
-#            go.sum
-#      - uses: actions/cache@v1
-#        with:
-#          path: ~/go/bin
-#          key: ${{ runner.os }}-${{ github.sha }}-tm-binary
-#        if: env.GIT_DIFF
-#      - name: test_abci_apps
-#        run: abci/tests/test_app/test.sh
-#        shell: bash
-#        if: env.GIT_DIFF
-#
-  test_abci_cli:
+  test_abci_apps:
     runs-on: ubuntu-latest
     needs: build
     timeout-minutes: 5
@@ -94,15 +69,44 @@ jobs:
         id: gobin-cache
         with:
           path: ~/go/bin
-          key: ${{ runner.os }}-${{ github.sha }}-tm-binary
+          key: ${{ runner.os }}-${{ github.sha }}-oc-binary
         #if: env.GIT_DIFF
-      - name: Re-install when cannot get cached binary
+      - name: Re-install when cannot get the cached binary
         run: make install install_abci
         if: steps.gobin-cache.outputs.cache-hit != 'true'
-      - run: abci/tests/test_cli/test.sh
+      - name: test_abci_apps
+        run: abci/tests/test_app/test.sh
         shell: bash
         #if: env.GIT_DIFF
 
+  test_abci_cli:
+    runs-on: ubuntu-latest
+    needs: build
+    timeout-minutes: 5
+    steps:
+      - uses: actions/setup-go@v2
+        with:
+          go-version: "^1.15.4"
+      - uses: actions/checkout@v2
+      - uses: technote-space/get-diff-action@v4
+        with:
+          PATTERNS: |
+            **/**.go
+            go.mod
+            go.sum
+      - uses: actions/cache@v1
+        id: gobin-cache
+        with:
+          path: ~/go/bin
+          key: ${{ runner.os }}-${{ github.sha }}-oc-binary
+        if: env.GIT_DIFF
+      - name: Re-install when cannot get the cached binary
+        run: make install install_abci
+        if: steps.gobin-cache.outputs.cache-hit != 'true'
+      - run: abci/tests/test_cli/test.sh
+        shell: bash
+        if: env.GIT_DIFF
+
   test_apps:
     runs-on: ubuntu-latest
     needs: build
@@ -122,9 +126,9 @@ jobs:
         id: gobin-cache
         with:
           path: ~/go/bin
-          key: ${{ runner.os }}-${{ github.sha }}-tm-binary
+          key: ${{ runner.os }}-${{ github.sha }}-oc-binary
         if: env.GIT_DIFF
-      - name: Re-install when cannot get cached binary
+      - name: Re-install when cannot get the cached binary
         run: make install install_abci
         if: steps.gobin-cache.outputs.cache-hit != 'true'
       - name: test_apps