diff --git a/.github/workflows/spike-openocd-tests.yml b/.github/workflows/spike-openocd-tests.yml
index 71bf29a4b..5e6bb7085 100644
--- a/.github/workflows/spike-openocd-tests.yml
+++ b/.github/workflows/spike-openocd-tests.yml
@@ -1,6 +1,6 @@
 # Build Spike and run a couple of debug tests.
 
-name: Test OpenOCD against 2 spike configurations
+name: Test OpenOCD against 4 spike configurations
 
 env:
   SPIKE_REPO: https://github.com/riscv-software-src/riscv-isa-sim.git
@@ -115,7 +115,8 @@ jobs:
               --gcc /opt/riscv/toolchain/bin/riscv-none-elf-gcc \
               --gdb /opt/riscv/toolchain/bin/riscv-none-elf-gdb \
               --sim_cmd /opt/riscv/spike/bin/spike \
-              --server_cmd $GITHUB_WORKSPACE/src/openocd
+              --remotelogfile-enable \
+              --server_cmd "$GITHUB_WORKSPACE/src/openocd -d3"
 
       - name: Run Spike64-2 Tests
         if: success() || steps.spike32-tests.conclusion == 'failure'
@@ -125,7 +126,30 @@ jobs:
               --gcc /opt/riscv/toolchain/bin/riscv-none-elf-gcc \
               --gdb /opt/riscv/toolchain/bin/riscv-none-elf-gdb \
               --sim_cmd /opt/riscv/spike/bin/spike \
-              --server_cmd $GITHUB_WORKSPACE/src/openocd
+              --remotelogfile-enable \
+              --server_cmd "$GITHUB_WORKSPACE/src/openocd -d3"
+
+      - name: Run Spike64-2-hwthread Tests
+        if: success() || steps.spike32-tests.conclusion == 'failure'
+        run: |
+          cd riscv-tests/debug
+          ./gdbserver.py targets/RISC-V/spike64-2-hwthread.py --print-failures \
+              --gcc /opt/riscv/toolchain/bin/riscv-none-elf-gcc \
+              --gdb /opt/riscv/toolchain/bin/riscv-none-elf-gdb \
+              --sim_cmd /opt/riscv/spike/bin/spike \
+              --remotelogfile-enable \
+              --server_cmd "$GITHUB_WORKSPACE/src/openocd -d3"
+
+      - name: Run Spike32-2-hwthread Tests
+        if: success() || steps.spike32-tests.conclusion == 'failure'
+        run: |
+          cd riscv-tests/debug
+          ./gdbserver.py targets/RISC-V/spike32-2-hwthread.py --print-failures \
+              --gcc /opt/riscv/toolchain/bin/riscv-none-elf-gcc \
+              --gdb /opt/riscv/toolchain/bin/riscv-none-elf-gdb \
+              --sim_cmd /opt/riscv/spike/bin/spike \
+              --remotelogfile-enable \
+              --server_cmd "$GITHUB_WORKSPACE/src/openocd -d3"
 
       - name: Archive test logs
         # Proceed even if there was a failed test