diff --git a/test/iscsi_tgt/iscsi_tgt.sh b/test/iscsi_tgt/iscsi_tgt.sh
index c8868bb004..5decbc13bc 100755
--- a/test/iscsi_tgt/iscsi_tgt.sh
+++ b/test/iscsi_tgt/iscsi_tgt.sh
@@ -43,9 +43,6 @@ kill_stub
 
 # TODO: enable remote NVMe controllers with multi-process so that
 #  we can use the stub for this test
-#test configure remote NVMe device from rpc
-run_test ./test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh 0
-#test configure remote NVMe device from conf file
-run_test ./test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh 1
+run_test ./test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
 
 timing_exit iscsi_tgt
diff --git a/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh b/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
index 1cd69b8d5a..8802cc47e8 100755
--- a/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
+++ b/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
@@ -34,14 +34,8 @@ echo "NVMf subsystem created."
 
 timing_enter start_iscsi_tgt
 
-cp $testdir/iscsi.conf $testdir/iscsi.conf.tmp
-
-if [ $1 -eq 1 ]; then
-	echo "[NVMe]" >> $testdir/iscsi.conf.tmp
-	echo " TransportID 'trtype:RDMA adrfam:ipv4 traddr:192.168.100.8 trsvcid:4420 subnqn:nqn.2016-06.io.spdk:cnode1' Nvme0" >> $testdir/iscsi.conf.tmp
-fi
 # Start the iSCSI target
-$ISCSI_APP -c $testdir/iscsi.conf.tmp -m 0x1 -p 0 -s 512 &
+$ISCSI_APP -c $testdir/iscsi.conf -m 0x1 -p 0 -s 512 &
 iscsipid=$!
 echo "iSCSI target launched. pid: $iscsipid"
 trap "killprocess $iscsipid; killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT
@@ -54,9 +48,7 @@ timing_exit start_iscsi_tgt
 echo "Creating an iSCSI target node."
 $rpc_py -p 5261 add_portal_group 1 $TARGET_IP:$ISCSI_PORT
 $rpc_py -p 5261 add_initiator_group 1 ALL $INITIATOR_IP/32
-if [ $1 -eq 0 ]; then
-	$rpc_py -p 5261 construct_nvme_bdev -b "Nvme0" -t "rdma" -f "ipv4" -a 192.168.100.8 -s $NVMF_PORT -n nqn.2016-06.io.spdk:cnode1
-fi
+$rpc_py -p 5261 construct_nvme_bdev -b "Nvme0" -t "rdma" -f "ipv4" -a 192.168.100.8 -s $NVMF_PORT -n nqn.2016-06.io.spdk:cnode1
 $rpc_py -p 5261 construct_target_node Target1 Target1_alias 'Nvme0n1:0' '1:1' 64 1 0 0 0
 sleep 1
 
@@ -74,7 +66,6 @@ trap - SIGINT SIGTERM EXIT
 
 iscsicleanup
 killprocess $iscsipid
-rm -f $testdir/iscsi.conf.tmp
 $rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
 killprocess $nvmfpid