diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index c4f768b45..7a108d996 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -60,9 +60,20 @@ jobs:
         mkdir -p scripts/ci
         echo "$GS_CREDS_JSON" > scripts/ci/gcp-creds.json
     - name: run tests
-      run: python -m tests -ra --cov-report=xml --cov-report=term
+      run: python -m tests -ra --cov-report=xml --cov-report=term --tap-combined
     - name: upload coverage report
       uses: codecov/codecov-action@v1.0.13
       with:
         file: ./coverage.xml
         fail_ci_if_error: true
+    - name: Post TAP
+      # Running custom fork with an option, that does not fail CI on error
+      uses: skshetry/flaky-service/packages/action@master
+      if: ${{ always() }}
+      with:
+        file-path: ${{github.workspace}}/testresults.tap
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        os: ${{runner.os}}
+        matrix: ${{toJson(matrix)}}
+        repo-description: ${{github.event.repository.description}}
+        fail_ci_if_error: false
diff --git a/setup.py b/setup.py
index 4af5f42a6..861121c9b 100644
--- a/setup.py
+++ b/setup.py
@@ -116,6 +116,7 @@ tests_requirements = [
     "pytest-xdist>=1.26.1",
     "pytest-mock==1.11.2",
     "pytest-lazy-fixture",
+    "pytest-tap",
     "flaky>=3.5.3",
     "mock>=3.0.0",
     "xmltodict>=0.11.0",