diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index fd5f8914df..c77ff456b1 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -210,13 +210,29 @@ jobs:
         with:
           DEBUG: true
 
-      - name: "Test Docstrings"
-        if: (inputs.DOCSTRING == 'true') && !((inputs.test_any == 'true') && (matrix.os == 'ubuntu-latest'))
-        uses: ansys/pydpf-actions/test_docstrings@v2.3
+      - name: "List installed packages"
+        shell: bash
+        run: pip list
+
+      - name: "Test API Docstrings"
+        shell: bash
+        working-directory: src
+        if: (inputs.DOCSTRING == 'true')
+        run: |
+          echo "TMP: "$TMP
+          echo "TEMP: "$TEMP
+          pytest --doctest-modules $DEBUG --junitxml=junit/test-doctests-results.xml ansys/dpf/core
+
+      - name: "Kill all servers"
+        uses: ansys/pydpf-actions/kill-dpf-servers@v2.3
+        if: (inputs.DOCSTRING == 'true')
+
+      - name: "Upload Docstring Test Results to artifacts"
+        uses: actions/upload-artifact@v4
+        if: (inputs.DOCSTRING == 'true')
         with:
-          MODULE: ${{env.MODULE}}
-          PACKAGE_NAME: ${{env.PACKAGE_NAME}}
-          working-directory: src
+          name: ${{ env.PACKAGE_NAME }}_${{ matrix.python-version }}_${{ matrix.os }}_doctest_${{ inputs.ANSYS_VERSION }}${{ inputs.test_any == 'true' && '_any' || '' }}
+          path: src/junit/test-doctests-results.xml
 
       - name: "Set tox extra CLI arguments"
         id: tox-cli-arguments