diff --git a/test/lib/nvme/unit/nvme_ns_cmd_c/nvme_ns_cmd_ut.c b/test/lib/nvme/unit/nvme_ns_cmd_c/nvme_ns_cmd_ut.c
index fb850c313..dce977a8e 100644
--- a/test/lib/nvme/unit/nvme_ns_cmd_c/nvme_ns_cmd_ut.c
+++ b/test/lib/nvme/unit/nvme_ns_cmd_c/nvme_ns_cmd_ut.c
@@ -37,14 +37,12 @@
 
 #include "lib/nvme/unit/test_env.c"
 
-struct nvme_driver _g_nvme_driver = {
+static struct nvme_driver _g_nvme_driver = {
 	.lock = PTHREAD_MUTEX_INITIALIZER,
 	.request_mempool = NULL,
 };
 
-struct nvme_driver *g_spdk_nvme_driver = &_g_nvme_driver;
-
-struct nvme_request *g_request = NULL;
+static struct nvme_request *g_request = NULL;
 
 int
 spdk_pci_nvme_enumerate(spdk_pci_enum_cb enum_cb, void *enum_ctx)
@@ -907,6 +905,8 @@ int main(int argc, char **argv)
 		return CU_get_error();
 	}
 
+	g_spdk_nvme_driver = &_g_nvme_driver;
+
 	CU_basic_set_mode(CU_BRM_VERBOSE);
 	CU_basic_run_tests();
 	num_failures = CU_get_number_of_failures();