diff --git a/test/nvmf/common.sh b/test/nvmf/common.sh
index 2d239ae8a..90e9d9ec6 100644
--- a/test/nvmf/common.sh
+++ b/test/nvmf/common.sh
@@ -379,6 +379,23 @@ function gen_nvmf_target_json() {
 		    {
 		      "subsystem": "bdev",
 		      "config": [
+			{
+			  "method": "bdev_nvme_set_options",
+			  "params": {
+				"action_on_timeout": "none",
+				"timeout_us": 0,
+				"retry_count": 4,
+				"arbitration_burst": 0,
+				"low_priority_weight": 0,
+				"medium_priority_weight": 0,
+				"high_priority_weight": 0,
+				"nvme_adminq_poll_period_us": 10000,
+				"keep_alive_timeout_ms" : 10000,
+				"nvme_ioq_poll_period_us": 0,
+				"io_queue_requests": 0,
+				"delay_cmd_submit": true
+			  }
+			},
 		        $(
 		IFS=","
 		printf '%s\n' "${config[*]}"