diff --git a/test/nvme/aer/aer.c b/test/nvme/aer/aer.c
index 701109ced..ae9e32663 100644
--- a/test/nvme/aer/aer.c
+++ b/test/nvme/aer/aer.c
@@ -525,7 +525,6 @@ spdk_aer_changed_ns_test(void)
 int main(int argc, char **argv)
 {
 	struct dev		*dev;
-	int			i;
 	struct spdk_env_opts	opts;
 	int			rc;
 
@@ -597,9 +596,7 @@ int main(int argc, char **argv)
 		spdk_nvme_ctrlr_register_aer_callback(dev->ctrlr, NULL, NULL);
 	}
 
-	for (i = 0; i < g_num_devs; i++) {
-		struct dev *dev = &g_devs[i];
-
+	foreach_dev(dev) {
 		spdk_nvme_detach(dev->ctrlr);
 	}
 
diff --git a/test/nvme/e2edp/nvme_dp.c b/test/nvme/e2edp/nvme_dp.c
index 9559001e8..5e8590d9b 100644
--- a/test/nvme/e2edp/nvme_dp.c
+++ b/test/nvme/e2edp/nvme_dp.c
@@ -605,7 +605,7 @@ attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid,
 int main(int argc, char **argv)
 {
 	struct dev		*iter;
-	int			rc, i;
+	int			rc;
 	struct spdk_env_opts	opts;
 
 	spdk_env_opts_init(&opts);
@@ -642,10 +642,8 @@ int main(int argc, char **argv)
 
 	printf("Cleaning up...\n");
 
-	for (i = 0; i < num_devs; i++) {
-		struct dev *dev = &devs[i];
-
-		spdk_nvme_detach(dev->ctrlr);
+	foreach_dev(iter) {
+		spdk_nvme_detach(iter->ctrlr);
 	}
 
 	return rc;
diff --git a/test/nvme/err_injection/err_injection.c b/test/nvme/err_injection/err_injection.c
index 73b42786b..5f2faded1 100644
--- a/test/nvme/err_injection/err_injection.c
+++ b/test/nvme/err_injection/err_injection.c
@@ -213,7 +213,6 @@ cleanup:
 int main(int argc, char **argv)
 {
 	struct dev		*dev;
-	int			i;
 	struct spdk_env_opts	opts;
 	int			rc;
 
@@ -270,8 +269,7 @@ int main(int argc, char **argv)
 
 exit:
 	printf("Cleaning up...\n");
-	for (i = 0; i < num_devs; i++) {
-		struct dev *dev = &devs[i];
+	foreach_dev(dev) {
 		spdk_nvme_detach(dev->ctrlr);
 	}
 
diff --git a/test/nvme/reserve/reserve.c b/test/nvme/reserve/reserve.c
index 9bb9230cf..bb0b2ede5 100644
--- a/test/nvme/reserve/reserve.c
+++ b/test/nvme/reserve/reserve.c
@@ -412,7 +412,6 @@ attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid,
 int main(int argc, char **argv)
 {
 	struct dev		*iter;
-	int			i;
 	struct spdk_env_opts	opts;
 	int			ret = 0;
 
@@ -448,9 +447,8 @@ int main(int argc, char **argv)
 
 	printf("Reservation test %s\n", ret ? "failed" : "passed");
 
-	for (i = 0; i < g_num_devs; i++) {
-		struct dev *dev = &g_devs[i];
-		spdk_nvme_detach(dev->ctrlr);
+	foreach_dev(iter) {
+		spdk_nvme_detach(iter->ctrlr);
 	}
 
 	return ret;
diff --git a/test/nvme/sgl/sgl.c b/test/nvme/sgl/sgl.c
index 09794681f..bb3cf9f55 100644
--- a/test/nvme/sgl/sgl.c
+++ b/test/nvme/sgl/sgl.c
@@ -493,7 +493,7 @@ attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid,
 int main(int argc, char **argv)
 {
 	struct dev		*iter;
-	int			rc, i;
+	int			rc;
 	struct spdk_env_opts	opts;
 
 	spdk_env_opts_init(&opts);
@@ -535,10 +535,8 @@ int main(int argc, char **argv)
 
 	printf("Cleaning up...\n");
 
-	for (i = 0; i < num_devs; i++) {
-		struct dev *dev = &devs[i];
-
-		spdk_nvme_detach(dev->ctrlr);
+	foreach_dev(iter) {
+		spdk_nvme_detach(iter->ctrlr);
 	}
 
 	return rc;