diff --git a/.github/workflows/run-nightly-tests.yml b/.github/workflows/run-nightly-tests.yml
index fb949b225f..2bde990081 100644
--- a/.github/workflows/run-nightly-tests.yml
+++ b/.github/workflows/run-nightly-tests.yml
@@ -17,6 +17,7 @@ jobs:
       #We don't have to build the kernel here, as we have a cron job running on
       #the k8s cluster that builds the linus-master target nightly.
       - name: Run blktests in VM
+        id: blktests
         uses: ./.github/actions/kubevirt-action
         with:
           kernel_version: linus-master
@@ -51,6 +52,7 @@ jobs:
 
             git clone https://github.com/${{ github.repository }} nvme-cli
             cd nvme-cli
+            git checkout ${{ github.sha }}
             scripts/build.sh -b release -c gcc
             sudo meson install -C .build-ci
             sudo ldconfig /usr/local/lib64
@@ -72,6 +74,7 @@ jobs:
             EF
             sudo ./check nvme md/001
       - name: Run nvme-cli tests in VM
+        if: success() || steps.blktests.conclusion == 'failure'
         uses: ./.github/actions/kubevirt-action
         with:
           kernel_version: linus-master
@@ -86,7 +89,9 @@ jobs:
             uname -a
             PIPX_BIN_DIR=/usr/local/bin pipx install nose2 --force
             git clone https://github.com/${{ github.repository }} /nvme-cli
+            git config --global --add safe.directory /nvme-cli
             cd /nvme-cli
+            git checkout ${{ github.sha }}
             scripts/build.sh -b release -c gcc
             CONTROLLER=$(echo "${BDEV0}" | sed 's/n[0-9]*$//')
             cat > tests/config.json << EOJ