diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh
index f391699e0..4792818eb 100755
--- a/test/common/autotest_common.sh
+++ b/test/common/autotest_common.sh
@@ -155,8 +155,8 @@ export SPDK_TEST_USE_IGB_UIO
 export SPDK_TEST_SCHEDULER
 : ${SPDK_TEST_SCANBUILD:=0}
 export SPDK_TEST_SCANBUILD
-: ${SPDK_TEST_NVMF_DRIVER:=}
-export SPDK_TEST_NVMF_DRIVER
+: ${SPDK_TEST_NVMF_NICS:=}
+export SPDK_TEST_NVMF_NICS
 
 # always test with SPDK shared objects.
 export SPDK_LIB_DIR="$rootdir/build/lib"
diff --git a/test/nvmf/common.sh b/test/nvmf/common.sh
index 2cdf1de43..49efeaef8 100644
--- a/test/nvmf/common.sh
+++ b/test/nvmf/common.sh
@@ -309,10 +309,12 @@ function gather_supported_nvmf_pci_devs() {
 	fi
 
 	# Try to respect what CI wants to test and override pci_devs[]
-	if [[ $SPDK_TEST_NVMF_DRIVER == mlx5_ib ]]; then
+	if [[ $SPDK_TEST_NVMF_NICS == mlx5 ]]; then
 		pci_devs=("${mlx[@]}")
-	elif [[ $SPDK_TEST_NVMF_DRIVER == ice ]]; then
+	elif [[ $SPDK_TEST_NVMF_NICS == e810 ]]; then
 		pci_devs=("${e810[@]}")
+	elif [[ $SPDK_TEST_NVMF_NICS == x722 ]]; then
+		pci_devs=("${x722[@]}")
 	fi
 
 	if ((${#pci_devs[@]} == 0)); then