diff --git a/examples/nvme/hello_world/hello_world.c b/examples/nvme/hello_world/hello_world.c
index 37e03ea1f..d2b2b2139 100644
--- a/examples/nvme/hello_world/hello_world.c
+++ b/examples/nvme/hello_world/hello_world.c
@@ -316,6 +316,7 @@ int main(int argc, char **argv)
 	 */
 	spdk_env_opts_init(&opts);
 	opts.name = "hello_world";
+	opts.shm_id = 0;
 	spdk_env_init(&opts);
 
 	printf("Initializing NVMe Controllers\n");
diff --git a/examples/nvme/reserve/reserve.c b/examples/nvme/reserve/reserve.c
index 7db2d55a7..b2aa87a49 100644
--- a/examples/nvme/reserve/reserve.c
+++ b/examples/nvme/reserve/reserve.c
@@ -407,6 +407,7 @@ int main(int argc, char **argv)
 	spdk_env_opts_init(&opts);
 	opts.name = "reserve";
 	opts.core_mask = "0x1";
+	opts.shm_id = 0;
 	spdk_env_init(&opts);
 
 	if (spdk_nvme_probe(NULL, NULL, probe_cb, attach_cb, NULL) != 0) {
diff --git a/test/lib/nvme/e2edp/nvme_dp.c b/test/lib/nvme/e2edp/nvme_dp.c
index 2b7edd792..10ee60970 100644
--- a/test/lib/nvme/e2edp/nvme_dp.c
+++ b/test/lib/nvme/e2edp/nvme_dp.c
@@ -633,6 +633,7 @@ int main(int argc, char **argv)
 	spdk_env_opts_init(&opts);
 	opts.name = "nvme_dp";
 	opts.core_mask = "0x1";
+	opts.shm_id = 0;
 	spdk_env_init(&opts);
 
 	printf("NVMe Write/Read with End-to-End data protection test\n");
diff --git a/test/lib/nvme/nvme.sh b/test/lib/nvme/nvme.sh
index 65bcd622c..831f578ae 100755
--- a/test/lib/nvme/nvme.sh
+++ b/test/lib/nvme/nvme.sh
@@ -12,6 +12,11 @@ function linux_iter_pci {
 
 timing_enter nvme
 
+if [ `uname` = Linux ]; then
+	start_stub "-s 2048 -i 0 -m 0xF"
+	trap "kill_stub; exit 1" SIGINT SIGTERM ExIT
+fi
+
 if [ $RUN_NIGHTLY -eq 1 ]; then
 	timing_enter aer
 	$testdir/aer/aer
@@ -23,14 +28,14 @@ if [ $RUN_NIGHTLY -eq 1 ]; then
 fi
 
 timing_enter identify
-$rootdir/examples/nvme/identify/identify
+$rootdir/examples/nvme/identify/identify -i 0
 for bdf in $(linux_iter_pci 0108); do
-	$rootdir/examples/nvme/identify/identify -r "trtype:PCIe traddr:${bdf}"
+	$rootdir/examples/nvme/identify/identify -r "trtype:PCIe traddr:${bdf}" -i 0
 done
 timing_exit identify
 
 timing_enter perf
-$rootdir/examples/nvme/perf/perf -q 128 -w read -s 12288 -t 1 -LL
+$rootdir/examples/nvme/perf/perf -q 128 -w read -s 12288 -t 1 -LL -i 0
 timing_exit perf
 
 timing_enter reserve
@@ -41,10 +46,26 @@ timing_enter hello_world
 $rootdir/examples/nvme/hello_world/hello_world
 timing_exit
 
+timing_enter sgl
+$testdir/sgl/sgl
+timing_exit sgl
+
+timing_enter e2edp
+$testdir/e2edp/nvme_dp
+timing_exit e2edp
+
 timing_enter overhead
 $rootdir/test/lib/nvme/overhead/overhead -s 4096 -t 1 -H
 timing_exit overhead
 
+timing_enter arbitration
+$rootdir/examples/nvme/arbitration/arbitration -t 3 -i 0
+timing_exit arbitration
+
+if [ `uname` = Linux ]; then
+	trap - SIGINT SIGTERM EXIT
+	kill_stub
+fi
 PLUGIN_DIR=$rootdir/examples/nvme/fio_plugin
 
 if [ -d /usr/src/fio ]; then
@@ -57,10 +78,6 @@ if [ -d /usr/src/fio ]; then
 	timing_exit fio_plugin
 fi
 
-timing_enter arbitration
-$rootdir/examples/nvme/arbitration/arbitration -t 3
-timing_exit arbitration
-
 if [ $(uname -s) = Linux ] && [ $SPDK_TEST_NVME_MULTIPROCESS -eq 1 ]; then
 	timing_enter multi_process
 	$rootdir/examples/nvme/arbitration/arbitration -i 0 -s 4096 -t 10 -c 0xf &
@@ -86,12 +103,4 @@ if [ $(uname -s) = Linux ] && [ $SPDK_TEST_NVME_MULTIPROCESS -eq 1 ]; then
 	timing_exit multi_process
 fi
 
-timing_enter sgl
-$testdir/sgl/sgl
-timing_exit sgl
-
-timing_enter e2edp
-$testdir/e2edp/nvme_dp
-timing_exit e2edp
-
 timing_exit nvme
diff --git a/test/lib/nvme/overhead/overhead.c b/test/lib/nvme/overhead/overhead.c
index 0ce625c44..2324a4f97 100644
--- a/test/lib/nvme/overhead/overhead.c
+++ b/test/lib/nvme/overhead/overhead.c
@@ -621,6 +621,7 @@ int main(int argc, char **argv)
 	spdk_env_opts_init(&opts);
 	opts.name = "overhead";
 	opts.core_mask = "0x1";
+	opts.shm_id = 0;
 	spdk_env_init(&opts);
 
 	rc = parse_args(argc, argv);
diff --git a/test/lib/nvme/sgl/sgl.c b/test/lib/nvme/sgl/sgl.c
index 6b56b37d8..93ec1e970 100644
--- a/test/lib/nvme/sgl/sgl.c
+++ b/test/lib/nvme/sgl/sgl.c
@@ -475,6 +475,7 @@ int main(int argc, char **argv)
 	spdk_env_opts_init(&opts);
 	opts.name = "nvme_sgl";
 	opts.core_mask = "0x1";
+	opts.shm_id = 0;
 	spdk_env_init(&opts);
 
 	printf("NVMe Readv/Writev Request test\n");