diff --git a/app/nvmf_tgt/nvmf_main.c b/app/nvmf_tgt/nvmf_main.c
index 815ec73af..e3795fb53 100644
--- a/app/nvmf_tgt/nvmf_main.c
+++ b/app/nvmf_tgt/nvmf_main.c
@@ -77,6 +77,6 @@ main(int argc, char **argv)
 
 	/* Blocks until the application is exiting */
 	rc = spdk_app_start(&opts, nvmf_tgt_started, NULL, NULL);
-
+	spdk_app_fini();
 	return rc;
 }
diff --git a/app/spdk_tgt/spdk_tgt.c b/app/spdk_tgt/spdk_tgt.c
index 3659eadfd..cf6281d07 100644
--- a/app/spdk_tgt/spdk_tgt.c
+++ b/app/spdk_tgt/spdk_tgt.c
@@ -119,5 +119,7 @@ main(int argc, char **argv)
 	}
 
 	rc = spdk_app_start(&opts, spdk_tgt_started, NULL, NULL);
+	spdk_app_fini();
+
 	return rc;
 }
diff --git a/test/app/stub/stub.c b/test/app/stub/stub.c
index d3929d45a..c52917dd2 100644
--- a/test/app/stub/stub.c
+++ b/test/app/stub/stub.c
@@ -141,6 +141,7 @@ main(int argc, char **argv)
 	opts.max_delay_us = 1000 * 1000;
 
 	ch = spdk_app_start(&opts, stub_start, (void *)(intptr_t)opts.shm_id, NULL);
+	spdk_app_fini();
 
 	return ch;
 }