diff --git a/test/env/env_dpdk_post_init/env_dpdk_post_init.c b/test/env/env_dpdk_post_init/env_dpdk_post_init.c
index 578e8cc73..94a5685ae 100644
--- a/test/env/env_dpdk_post_init/env_dpdk_post_init.c
+++ b/test/env/env_dpdk_post_init/env_dpdk_post_init.c
@@ -77,10 +77,7 @@ attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid,
 	dev->ctrlr = ctrlr;
 	nsid = spdk_nvme_ctrlr_get_first_active_ns(ctrlr);
 	dev->ns = spdk_nvme_ctrlr_get_ns(ctrlr, nsid);
-	if (dev->ns == NULL) {
-		g_failed = 1;
-		return;
-	}
+
 	dev->qpair = spdk_nvme_ctrlr_alloc_io_qpair(ctrlr, NULL, 0);
 	if (dev->qpair == NULL) {
 		g_failed = 1;
diff --git a/test/nvme/err_injection/err_injection.c b/test/nvme/err_injection/err_injection.c
index 016e2d70f..1047b558e 100644
--- a/test/nvme/err_injection/err_injection.c
+++ b/test/nvme/err_injection/err_injection.c
@@ -82,10 +82,7 @@ attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid,
 	dev->ctrlr = ctrlr;
 	nsid = spdk_nvme_ctrlr_get_first_active_ns(ctrlr);
 	dev->ns = spdk_nvme_ctrlr_get_ns(ctrlr, nsid);
-	if (dev->ns == NULL) {
-		failed = 1;
-		return;
-	}
+
 	dev->qpair = spdk_nvme_ctrlr_alloc_io_qpair(ctrlr, NULL, 0);
 	if (dev->qpair == NULL) {
 		failed = 1;
@@ -183,6 +180,10 @@ read_test(bool error_expected)
 	struct dev *dev;
 
 	foreach_dev(dev) {
+		if (dev->ns == NULL) {
+			continue;
+		}
+
 		dev->error_expected = error_expected;
 		dev->data = spdk_zmalloc(0x1000, 0x1000, NULL, SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA);
 		if (!dev->data) {