diff --git a/clash-vexriscv-sim/tests/tests.hs b/clash-vexriscv-sim/tests/tests.hs
index 497997f..022e27b 100644
--- a/clash-vexriscv-sim/tests/tests.hs
+++ b/clash-vexriscv-sim/tests/tests.hs
@@ -23,6 +23,8 @@ import Test.Tasty.HUnit (Assertion, testCase, (@?=))
 import Utils.ProgramLoad (loadProgramDmem)
 import Utils.Cpu (cpu)
 
+-- XXX: Disabled, we need to add OpenOCD + GDB to CI (or use the Nix shell?)
+-- import qualified Tests.Jtag
 
 runProgramExpect ::
   -- | action to copy ELF file
@@ -130,7 +132,7 @@ main = do
           [ testGroup "Debug builds" debugTestCases
           , testGroup "Release builds" releaseTestCases
           -- XXX: Disabled, we need to add OpenOCD + GDB to CI (or use the Nix shell?)
-          -- , Jtag.tests
+          -- , Tests.Jtag.tests
           ]
 
   defaultMain tests
diff --git a/nix/openocd-vexriscv.nix b/nix/openocd-vexriscv.nix
index bc5e49f..ff2d6b7 100644
--- a/nix/openocd-vexriscv.nix
+++ b/nix/openocd-vexriscv.nix
@@ -22,7 +22,13 @@ pkgs.stdenv.mkDerivation rec {
   src = pkgs.fetchgit {
     url = "https://github.com/SpinalHDL/openocd_riscv.git";
     rev = "058dfa50d625893bee9fecf8d604141911fac125";
-    sha256 = "sha256-5BvR45A3/7NqivQpYwaFnu7ra/Rf8giRig8R3zSYVd8=";
+    sha256 = "sha256-UuX4Zfr9DiJx60nvBAv+9xCbWXExrk5KNSC5V5e4rsw=";
+    fetchSubmodules = true;
+    deepClone = true;
+    postFetch = ''
+      # See: https://github.com/NixOS/nixpkgs/issues/8567#issuecomment-1846499599
+      find "$out/" -type d -name '.git' | xargs rm -rf
+    '';
   };
 
   installPhase = ''