diff --git a/doc/blobfs.md b/doc/blobfs.md
index eee88548c..5a8ef79ec 100644
--- a/doc/blobfs.md
+++ b/doc/blobfs.md
@@ -29,17 +29,10 @@ cd rocksdb
 make db_bench SPDK_DIR=path/to/spdk
 ~~~
 
-Copy `etc/spdk/rocksdb.conf.in` from the SPDK repository to `/usr/local/etc/spdk/rocksdb.conf`.
+Create an NVMe section in the configuration file using SPDK's `gen_nvme.sh` script.
 
 ~~~{.sh}
-cd ../spdk
-cp etc/spdk/rocksdb.conf.in /usr/local/etc/spdk/rocksdb.conf
-~~~
-
-Append an NVMe section to the configuration file using SPDK's `gen_nvme.sh` script.
-
-~~~{.sh}
-scripts/gen_nvme.sh >> /usr/local/etc/spdk/rocksdb.conf
+scripts/gen_nvme.sh > /usr/local/etc/spdk/rocksdb.conf
 ~~~
 
 Verify the configuration file has specified the correct NVMe SSD.
diff --git a/etc/spdk/rocksdb.conf.in b/etc/spdk/rocksdb.conf.in
deleted file mode 100644
index 503d31621..000000000
--- a/etc/spdk/rocksdb.conf.in
+++ /dev/null
@@ -1,18 +0,0 @@
-# spdk configuration file
-#
-# Please write all parameters using ASCII.
-# The parameter must be quoted if it includes whitespace.
-#
-# Configuration syntax:
-# Spaces at head of line are deleted, other spaces are as separator
-# Lines starting with '#' are comments and not evaluated.
-# Lines ending with '\' are concatenated with the next line.
-# Bracketed keys are section keys grouping the following value keys.
-# Number of section key is used as a tag number.
-#  Ex. [TargetNode1] = TargetNode section key with tag number 1
-[Global]
-
-[Ioat]
-  Enable No
-
-# [Nvme] section will get appended here by scripts/gen_nvme.sh.
diff --git a/test/bdev/bdev.conf.in b/test/bdev/bdev.conf.in
index ac31381cb..f4cff0297 100644
--- a/test/bdev/bdev.conf.in
+++ b/test/bdev/bdev.conf.in
@@ -18,9 +18,6 @@
   AIO /dev/ram0 AIO0
   AIO /tmp/aiofile AIO1 2048
 
-[Ioat]
-  Enable No
-
 [QoS]
   # QoS section defines limitation on performance
   # metric like IOPS
diff --git a/test/blobfs/rocksdb/rocksdb.sh b/test/blobfs/rocksdb/rocksdb.sh
index 88900f312..1a73ee55d 100755
--- a/test/blobfs/rocksdb/rocksdb.sh
+++ b/test/blobfs/rocksdb/rocksdb.sh
@@ -45,8 +45,7 @@ popd
 
 timing_exit db_bench_build
 
-cp $rootdir/etc/spdk/rocksdb.conf.in $ROCKSDB_CONF
-$rootdir/scripts/gen_nvme.sh >> $ROCKSDB_CONF
+$rootdir/scripts/gen_nvme.sh > $ROCKSDB_CONF
 
 trap 'run_bsdump; rm -f $ROCKSDB_CONF; exit 1' SIGINT SIGTERM EXIT
 
diff --git a/test/iscsi_tgt/initiator/bdev.conf.in b/test/iscsi_tgt/initiator/bdev.conf.in
deleted file mode 100644
index 09094ea82..000000000
--- a/test/iscsi_tgt/initiator/bdev.conf.in
+++ /dev/null
@@ -1,2 +0,0 @@
-[Ioat]
-  Enable No
diff --git a/test/iscsi_tgt/initiator/initiator.sh b/test/iscsi_tgt/initiator/initiator.sh
index 41a15267e..129c4fa97 100755
--- a/test/iscsi_tgt/initiator/initiator.sh
+++ b/test/iscsi_tgt/initiator/initiator.sh
@@ -39,8 +39,7 @@ sleep 1
 trap "killprocess $pid; rm -f $testdir/bdev.conf; exit 1" SIGINT SIGTERM EXIT
 
 # Prepare config file for iSCSI initiator
-cp $testdir/bdev.conf.in $testdir/bdev.conf
-echo "[iSCSI_Initiator]" >> $testdir/bdev.conf
+echo "[iSCSI_Initiator]" > $testdir/bdev.conf
 echo "  URL iscsi://$TARGET_IP/iqn.2016-06.io.spdk:disk1/0 iSCSI0" >> $testdir/bdev.conf
 $rootdir/test/bdev/bdevperf/bdevperf -c $testdir/bdev.conf -q 128 -o 4096 -w verify -t 5 -s 512
 if [ $RUN_NIGHTLY -eq 1 ]; then
diff --git a/test/vhost/hotplug/vhost.conf.base b/test/vhost/hotplug/vhost.conf.base
index 0b0de7490..4fa801d9b 100644
--- a/test/vhost/hotplug/vhost.conf.base
+++ b/test/vhost/hotplug/vhost.conf.base
@@ -1,7 +1,4 @@
 [Global]
 
-[Ioat]
-  Enable No
-
 [Nvme]
   HotplugEnable Yes
diff --git a/test/vhost/initiator/bdev.conf b/test/vhost/initiator/bdev.conf
index d9198d088..7ea01a828 100644
--- a/test/vhost/initiator/bdev.conf
+++ b/test/vhost/initiator/bdev.conf
@@ -19,6 +19,3 @@
   Path naa.Nvme0n1_blk1.0
   Type Blk
   Queues 8
-
-[Ioat]
-  Enable No
diff --git a/test/vhost/initiator/bdev_pci.conf b/test/vhost/initiator/bdev_pci.conf
index 635891b3f..0e47e88a7 100644
--- a/test/vhost/initiator/bdev_pci.conf
+++ b/test/vhost/initiator/bdev_pci.conf
@@ -1,5 +1,2 @@
 [VirtioPci]
   Enable Yes
-
-[Ioat]
-  Enable No