diff --git a/test/common/config/pkgdep/git b/test/common/config/pkgdep/git
index c2e6c817c..e14059469 100644
--- a/test/common/config/pkgdep/git
+++ b/test/common/config/pkgdep/git
@@ -40,6 +40,13 @@ function install_refspdk() {
 	git -C "$output_dir" checkout "$release"
 	git -C "$output_dir" submodule update --init
 
+	if ((gcc_version >= 11)) && le "${release#v}" 21.04; then
+		git -C "$output_dir" config --global user.name "spdk"
+		git -C "$output_dir" config --global user.email "hotpatch@spdk.io"
+		curl -s https://github.com/spdk/spdk/commit/36b5a69bb0699694b53a2f08a13cc0de620450a9.patch | git -C "$output_dir" am
+		curl -s https://github.com/spdk/spdk/commit/2ac152158116a17b863270a4731977d9ddedf50d.patch | git -C "$output_dir" am
+	fi
+
 	cat > $HOME/autorun-spdk.conf <<- EOF
 		SPDK_BUILD_SHARED_OBJECT=1
 		SPDK_TEST_AUTOBUILD=1