diff --git a/test/nvmf/discovery/discovery.sh b/test/nvmf/discovery/discovery.sh
index 54e8c3635..6c83c43e3 100755
--- a/test/nvmf/discovery/discovery.sh
+++ b/test/nvmf/discovery/discovery.sh
@@ -5,6 +5,8 @@ rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/scripts/autotest_common.sh
 source $rootdir/test/nvmf/common.sh
 
+rpc_py="python $rootdir/scripts/rpc.py"
+
 set -e
 
 if ! hash nvme; then
@@ -33,8 +35,14 @@ if [ -e "/dev/nvme-fabrics" ]; then
 	chmod a+rw /dev/nvme-fabrics
 fi
 
+$rpc_py construct_nvmf_subsystem Direct nqn.2016-06.io.spdk:cnode1 'transport:RDMA traddr:192.168.100.8 trsvcid:4420' All -p "*"
+$rpc_py construct_nvmf_subsystem Virtual nqn.2016-06.io.spdk:cnode2 'transport:RDMA traddr:192.168.100.8 trsvcid:4420' All -s SPDK00000000000001 -n 'Malloc0 Malloc1'
+
 nvme discover -t rdma -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT
 
+$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
+$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode2
+
 trap - SIGINT SIGTERM EXIT
 
 nvmfcleanup
diff --git a/test/nvmf/filesystem/filesystem.sh b/test/nvmf/filesystem/filesystem.sh
index 38cee74f1..9d6fa0286 100755
--- a/test/nvmf/filesystem/filesystem.sh
+++ b/test/nvmf/filesystem/filesystem.sh
@@ -5,6 +5,8 @@ rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/scripts/autotest_common.sh
 source $rootdir/test/nvmf/common.sh
 
+rpc_py="python $rootdir/scripts/rpc.py"
+
 set -e
 
 if ! rdma_nic_available; then
@@ -28,6 +30,9 @@ if [ -e "/dev/nvme-fabrics" ]; then
 	chmod a+rw /dev/nvme-fabrics
 fi
 
+$rpc_py construct_nvmf_subsystem Direct nqn.2016-06.io.spdk:cnode1 'transport:RDMA traddr:192.168.100.8 trsvcid:4420' All -p "*"
+$rpc_py construct_nvmf_subsystem Virtual nqn.2016-06.io.spdk:cnode2 'transport:RDMA traddr:192.168.100.8 trsvcid:4420' All -s SPDK00000000000001 -n 'Malloc0 Malloc1'
+
 nvme connect -t rdma -n "nqn.2016-06.io.spdk:cnode1" -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT"
 nvme connect -t rdma -n "nqn.2016-06.io.spdk:cnode2" -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT"
 
@@ -67,6 +72,9 @@ sync
 nvme disconnect -n "nqn.2016-06.io.spdk:cnode1"
 nvme disconnect -n "nqn.2016-06.io.spdk:cnode2"
 
+$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
+$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode2
+
 trap - SIGINT SIGTERM EXIT
 
 nvmfcleanup
diff --git a/test/nvmf/fio/fio.sh b/test/nvmf/fio/fio.sh
index 98e072faf..b7b004cff 100755
--- a/test/nvmf/fio/fio.sh
+++ b/test/nvmf/fio/fio.sh
@@ -5,6 +5,8 @@ rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/scripts/autotest_common.sh
 source $rootdir/test/nvmf/common.sh
 
+rpc_py="python $rootdir/scripts/rpc.py"
+
 set -e
 
 if ! rdma_nic_available; then
@@ -28,6 +30,9 @@ if [ -e "/dev/nvme-fabrics" ]; then
 	chmod a+rw /dev/nvme-fabrics
 fi
 
+$rpc_py construct_nvmf_subsystem Direct nqn.2016-06.io.spdk:cnode1 'transport:RDMA traddr:192.168.100.8 trsvcid:4420' All -p "*"
+$rpc_py construct_nvmf_subsystem Virtual nqn.2016-06.io.spdk:cnode2 'transport:RDMA traddr:192.168.100.8 trsvcid:4420' All -s SPDK00000000000001 -n 'Malloc0 Malloc1'
+
 nvme connect -t rdma -n "nqn.2016-06.io.spdk:cnode1" -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT"
 nvme connect -t rdma -n "nqn.2016-06.io.spdk:cnode2" -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT"
 
@@ -40,6 +45,9 @@ sync
 nvme disconnect -n "nqn.2016-06.io.spdk:cnode1"
 nvme disconnect -n "nqn.2016-06.io.spdk:cnode2"
 
+$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
+$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode2
+
 rm -f ./local-job0-0-verify.state
 rm -f ./local-job1-1-verify.state
 rm -f ./local-job2-2-verify.state
diff --git a/test/nvmf/nvme_cli/nvme_cli.sh b/test/nvmf/nvme_cli/nvme_cli.sh
index 17edbcd31..9cc8dc2d1 100755
--- a/test/nvmf/nvme_cli/nvme_cli.sh
+++ b/test/nvmf/nvme_cli/nvme_cli.sh
@@ -5,6 +5,8 @@ rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/scripts/autotest_common.sh
 source $rootdir/test/nvmf/common.sh
 
+rpc_py="python $rootdir/scripts/rpc.py"
+
 set -e
 
 if ! rdma_nic_available; then
@@ -27,6 +29,9 @@ if [ -e "/dev/nvme-fabrics" ]; then
 	chmod a+rw /dev/nvme-fabrics
 fi
 
+$rpc_py construct_nvmf_subsystem Direct nqn.2016-06.io.spdk:cnode1 'transport:RDMA traddr:192.168.100.8 trsvcid:4420' All -p "*"
+$rpc_py construct_nvmf_subsystem Virtual nqn.2016-06.io.spdk:cnode2 'transport:RDMA traddr:192.168.100.8 trsvcid:4420' All -s SPDK00000000000001 -n 'Malloc0 Malloc1'
+
 nvme connect -t rdma -n "nqn.2016-06.io.spdk:cnode1" -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT"
 nvme connect -t rdma -n "nqn.2016-06.io.spdk:cnode2" -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT"
 
@@ -44,6 +49,9 @@ done
 nvme disconnect -n "nqn.2016-06.io.spdk:cnode1"
 nvme disconnect -n "nqn.2016-06.io.spdk:cnode2"
 
+$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
+$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode2
+
 trap - SIGINT SIGTERM EXIT
 
 nvmfcleanup
diff --git a/test/nvmf/nvmf.conf b/test/nvmf/nvmf.conf
index 55090acc7..b3f17151f 100644
--- a/test/nvmf/nvmf.conf
+++ b/test/nvmf/nvmf.conf
@@ -11,17 +11,3 @@
 
 [Nvmf]
   MaxQueuesPerSession 4
-
-[Subsystem1]
-  NQN "nqn.2016-06.io.spdk:cnode1"
-  Mode Direct
-  Listen RDMA 192.168.100.8:4420
-  NVMe *
-
-[Subsystem2]
-  NQN "nqn.2016-06.io.spdk:cnode2"
-  Mode Virtual
-  Listen RDMA 192.168.100.8:4420
-  SN SPDK00000000000001
-  Namespace Malloc0
-  Namespace Malloc1