diff --git a/test/iscsi_tgt/rpc_config/rpc_config.py b/test/iscsi_tgt/rpc_config/rpc_config.py
index ae6068ef3..6ee2c5a42 100755
--- a/test/iscsi_tgt/rpc_config/rpc_config.py
+++ b/test/iscsi_tgt/rpc_config/rpc_config.py
@@ -461,7 +461,7 @@ def verify_add_nvme_bdev_rpc_methods(rpc_py):
     output = check_output(["lspci", "-mm", "-nn"])
     addrs = re.findall('^([0-9]{2}:[0-9]{2}.[0-9]) "Non-Volatile memory controller \[0108\]".*-p02', output.decode(), re.MULTILINE)
     for addr in addrs:
-        ctrlr_address = "-b Nvme0 -t pcie -a 0000:{}".format(addr)
+        ctrlr_address = "-b Nvme{} -t pcie -a 0000:{}".format(addrs.index(addr), addr)
         rpc.construct_nvme_bdev(ctrlr_address)
         print("add nvme device passed first time")
         test_pass = 0