diff --git a/app/iscsi_tgt/Makefile b/app/iscsi_tgt/Makefile
index 2d5246f86..2083fc5e4 100644
--- a/app/iscsi_tgt/Makefile
+++ b/app/iscsi_tgt/Makefile
@@ -56,7 +56,6 @@ LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
 	$(COPY_MODULES_LINKER_ARGS) \
 	$(SOCK_MODULES_LINKER_ARGS)
 LIBS += $(SPDK_LIB_LINKER_ARGS)
-LIBS += $(ENV_LINKER_ARGS)
 
 all : $(APP)
 	@:
diff --git a/app/nvmf_tgt/Makefile b/app/nvmf_tgt/Makefile
index 8fdbd0cc2..adbeaf676 100644
--- a/app/nvmf_tgt/Makefile
+++ b/app/nvmf_tgt/Makefile
@@ -51,7 +51,7 @@ endif
 LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
 	$(COPY_MODULES_LINKER_ARGS) \
 	$(SOCK_MODULES_LINKER_ARGS) \
-	$(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
+	$(SPDK_LIB_LINKER_ARGS)
 
 all : $(APP)
 	@:
diff --git a/app/spdk_tgt/Makefile b/app/spdk_tgt/Makefile
index cc0666049..b2cbb1dfe 100644
--- a/app/spdk_tgt/Makefile
+++ b/app/spdk_tgt/Makefile
@@ -59,7 +59,7 @@ endif
 LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
 	$(COPY_MODULES_LINKER_ARGS) \
 	$(SOCK_MODULES_LINKER_ARGS) \
-	$(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
+	$(SPDK_LIB_LINKER_ARGS)
 
 all: $(APP)
 	@:
diff --git a/app/vhost/Makefile b/app/vhost/Makefile
index 39132fe10..bc3090241 100644
--- a/app/vhost/Makefile
+++ b/app/vhost/Makefile
@@ -50,7 +50,6 @@ LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
 	$(COPY_MODULES_LINKER_ARGS) \
 	$(SOCK_MODULES_LINKER_ARGS)
 LIBS += $(SPDK_LIB_LINKER_ARGS)
-LIBS += $(ENV_LINKER_ARGS)
 
 all : $(APP)
 	@:
diff --git a/examples/bdev/fio_plugin/Makefile b/examples/bdev/fio_plugin/Makefile
index 9688c4173..2be633ac7 100644
--- a/examples/bdev/fio_plugin/Makefile
+++ b/examples/bdev/fio_plugin/Makefile
@@ -46,7 +46,7 @@ LDFLAGS += -shared -rdynamic
 SPDK_LIB_LIST += thread util bdev conf copy rpc jsonrpc json log sock trace
 
 LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) $(SOCK_MODULES_LINKER_ARGS)
-LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
+LIBS += $(SPDK_LIB_LINKER_ARGS)
 
 all: $(APP)
 	@:
diff --git a/examples/bdev/hello_world/Makefile b/examples/bdev/hello_world/Makefile
index 1965e296b..12a90baa7 100644
--- a/examples/bdev/hello_world/Makefile
+++ b/examples/bdev/hello_world/Makefile
@@ -42,7 +42,7 @@ SPDK_LIB_LIST = event_bdev event_copy
 SPDK_LIB_LIST += bdev copy event thread util conf trace log jsonrpc json rpc sock
 
 LIBS += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_MODULES_LINKER_ARGS) $(SOCK_MODULES_LINKER_ARGS)
-LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
+LIBS += $(SPDK_LIB_LINKER_ARGS)
 
 all : $(APP)
 	@:
diff --git a/examples/blob/cli/Makefile b/examples/blob/cli/Makefile
index cfde82ea4..3212a7a8f 100644
--- a/examples/blob/cli/Makefile
+++ b/examples/blob/cli/Makefile
@@ -46,7 +46,7 @@ SPDK_LIB_LIST += bdev copy event thread util conf trace \
 BLOCKDEV_MODULES_LIST := $(filter-out bdev_lvol,$(BLOCKDEV_MODULES_LIST))
 
 LIBS += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_MODULES_LINKER_ARGS) $(SOCK_MODULES_LINKER_ARGS)
-LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
+LIBS += $(SPDK_LIB_LINKER_ARGS)
 
 all : $(APP)
 	@:
diff --git a/examples/blob/hello_world/Makefile b/examples/blob/hello_world/Makefile
index aa9dbced3..08f7b6880 100644
--- a/examples/blob/hello_world/Makefile
+++ b/examples/blob/hello_world/Makefile
@@ -43,7 +43,7 @@ SPDK_LIB_LIST += bdev copy event thread util conf trace \
 		log jsonrpc json rpc sock
 
 LIBS += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_MODULES_LINKER_ARGS) $(SOCK_MODULES_LINKER_ARGS)
-LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
+LIBS += $(SPDK_LIB_LINKER_ARGS)
 
 all : $(APP)
 	@:
diff --git a/examples/ioat/perf/Makefile b/examples/ioat/perf/Makefile
index 518a35072..54d14a535 100644
--- a/examples/ioat/perf/Makefile
+++ b/examples/ioat/perf/Makefile
@@ -41,7 +41,7 @@ C_SRCS := perf.c
 
 SPDK_LIB_LIST = ioat thread util log
 
-LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
+LIBS += $(SPDK_LIB_LINKER_ARGS)
 
 all: $(APP)
 	@:
diff --git a/examples/ioat/verify/Makefile b/examples/ioat/verify/Makefile
index d7a7b0b2c..4929c523c 100644
--- a/examples/ioat/verify/Makefile
+++ b/examples/ioat/verify/Makefile
@@ -41,7 +41,7 @@ C_SRCS := verify.c
 
 SPDK_LIB_LIST = ioat thread util log
 
-LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
+LIBS += $(SPDK_LIB_LINKER_ARGS)
 
 all: $(APP)
 	@:
diff --git a/examples/sock/hello_world/Makefile b/examples/sock/hello_world/Makefile
index 575de2f7e..4e6ba2d5d 100644
--- a/examples/sock/hello_world/Makefile
+++ b/examples/sock/hello_world/Makefile
@@ -40,7 +40,7 @@ C_SRCS := hello_sock.c
 
 SPDK_LIB_LIST += event thread util conf trace log jsonrpc json rpc sock
 
-LIBS += $(SOCK_MODULES_LINKER_ARGS) $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
+LIBS += $(SOCK_MODULES_LINKER_ARGS) $(SPDK_LIB_LINKER_ARGS)
 
 all : $(APP)
 	@:
diff --git a/mk/nvme.libtest.mk b/mk/nvme.libtest.mk
index 2aa6ef790..43d9d2aec 100644
--- a/mk/nvme.libtest.mk
+++ b/mk/nvme.libtest.mk
@@ -42,7 +42,7 @@ C_SRCS = $(APP:%=%.c)
 SPDK_LIB_LIST = nvme thread util log sock
 
 LIBS += $(SOCK_MODULES_LINKER_ARGS)
-LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
+LIBS += $(SPDK_LIB_LINKER_ARGS)
 
 ifeq ($(CONFIG_RDMA),y)
 SYS_LIBS += -libverbs -lrdmacm
diff --git a/mk/spdk.common.mk b/mk/spdk.common.mk
index b00e8edc2..6b6672bfa 100644
--- a/mk/spdk.common.mk
+++ b/mk/spdk.common.mk
@@ -219,11 +219,11 @@ COMPILE_CXX=\
 # Link $(OBJS) and $(LIBS) into $@ (app)
 LINK_C=\
 	$(Q)echo "  LINK $S/$@"; \
-	$(CC) -o $@ $(CPPFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) $(SYS_LIBS)
+	$(CC) -o $@ $(CPPFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) $(ENV_LINKER_ARGS) $(SYS_LIBS)
 
 LINK_CXX=\
 	$(Q)echo "  LINK $S/$@"; \
-	$(CXX) -o $@ $(CPPFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) $(SYS_LIBS)
+	$(CXX) -o $@ $(CPPFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) $(ENV_LINKER_ARGS) $(SYS_LIBS)
 
 #
 # Variables to use for versioning shared libs
diff --git a/mk/spdk.unittest.mk b/mk/spdk.unittest.mk
index f20529a6a..0f0fb9850 100644
--- a/mk/spdk.unittest.mk
+++ b/mk/spdk.unittest.mk
@@ -46,6 +46,10 @@ LIBS += -lcunit $(SPDK_STATIC_LIB_LINKER_ARGS)
 
 APP = $(TEST_FILE:.c=)
 
+ifneq ($(UNIT_TEST_LINK_ENV),1)
+ENV_LINKER_ARGS =
+endif
+
 all: $(APP)
 	@:
 
diff --git a/test/app/bdev_svc/Makefile b/test/app/bdev_svc/Makefile
index b97dcee49..3475a5af0 100644
--- a/test/app/bdev_svc/Makefile
+++ b/test/app/bdev_svc/Makefile
@@ -51,7 +51,7 @@ endif
 LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
 	$(COPY_MODULES_LINKER_ARGS) \
 	$(SOCK_MODULES_LINKER_ARGS) \
-	$(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
+	$(SPDK_LIB_LINKER_ARGS)
 
 all : $(APP)
 	@:
diff --git a/test/app/histogram_perf/Makefile b/test/app/histogram_perf/Makefile
index 7c6ecd89c..ab3fc34fd 100644
--- a/test/app/histogram_perf/Makefile
+++ b/test/app/histogram_perf/Makefile
@@ -41,7 +41,7 @@ C_SRCS = histogram_perf.c
 
 SPDK_LIB_LIST = thread util log
 
-LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
+LIBS += $(SPDK_LIB_LINKER_ARGS)
 
 all: $(APP)
 	@:
diff --git a/test/app/jsoncat/Makefile b/test/app/jsoncat/Makefile
index 2bbba95b8..da6a25fc0 100644
--- a/test/app/jsoncat/Makefile
+++ b/test/app/jsoncat/Makefile
@@ -41,7 +41,7 @@ C_SRCS = jsoncat.c
 
 SPDK_LIB_LIST = json thread util log
 
-LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
+LIBS += $(SPDK_LIB_LINKER_ARGS)
 
 all: $(APP)
 	@:
diff --git a/test/app/stub/Makefile b/test/app/stub/Makefile
index 05cfcdfd0..e84d19454 100644
--- a/test/app/stub/Makefile
+++ b/test/app/stub/Makefile
@@ -44,7 +44,6 @@ SPDK_LIB_LIST = event conf nvme log trace rpc jsonrpc json thread util sock
 
 LIBS += $(SOCK_MODULES_LINKER_ARGS)
 LIBS += $(SPDK_LIB_LINKER_ARGS)
-LIBS += $(ENV_LINKER_ARGS)
 
 all : $(APP)
 	@:
diff --git a/test/bdev/bdevio/Makefile b/test/bdev/bdevio/Makefile
index 8e762f0bc..016468159 100644
--- a/test/bdev/bdevio/Makefile
+++ b/test/bdev/bdevio/Makefile
@@ -47,7 +47,7 @@ LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
 	$(COPY_MODULES_LINKER_ARGS) \
 	$(SOCK_MODULES_LINKER_ARGS)
 
-LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS) -lcunit
+LIBS += $(SPDK_LIB_LINKER_ARGS) -lcunit
 
 all : $(APP)
 	@:
diff --git a/test/bdev/bdevperf/Makefile b/test/bdev/bdevperf/Makefile
index 9c3155238..8eef9bf6e 100644
--- a/test/bdev/bdevperf/Makefile
+++ b/test/bdev/bdevperf/Makefile
@@ -47,7 +47,7 @@ LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
 	$(COPY_MODULES_LINKER_ARGS) \
 	$(SOCK_MODULES_LINKER_ARGS)
 
-LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
+LIBS += $(SPDK_LIB_LINKER_ARGS)
 
 all : $(APP)
 	@:
diff --git a/test/blobfs/fuse/Makefile b/test/blobfs/fuse/Makefile
index 2c1917be5..9d1b4a972 100644
--- a/test/blobfs/fuse/Makefile
+++ b/test/blobfs/fuse/Makefile
@@ -45,7 +45,7 @@ SPDK_LIB_LIST += bdev copy event thread util conf trace \
 		log jsonrpc json rpc sock
 
 LIBS += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_MODULES_LINKER_ARGS)
-LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
+LIBS += $(SPDK_LIB_LINKER_ARGS)
 LIBS+= -L/usr/local/lib -lfuse3
 
 all : $(APP)
diff --git a/test/blobfs/mkfs/Makefile b/test/blobfs/mkfs/Makefile
index 014a6fd06..14abf1197 100644
--- a/test/blobfs/mkfs/Makefile
+++ b/test/blobfs/mkfs/Makefile
@@ -45,7 +45,7 @@ SPDK_LIB_LIST += bdev copy event thread util conf trace \
 		log jsonrpc json rpc sock
 
 LIBS += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_MODULES_LINKER_ARGS) $(SOCK_MODULES_LINKER_ARGS)
-LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
+LIBS += $(SPDK_LIB_LINKER_ARGS)
 
 all : $(APP)
 	@:
diff --git a/test/env/pci/Makefile b/test/env/pci/Makefile
index 341655845..8b9697029 100644
--- a/test/env/pci/Makefile
+++ b/test/env/pci/Makefile
@@ -35,8 +35,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
+UNIT_TEST_LINK_ENV = 1
 CFLAGS += $(ENV_CFLAGS)
-LIBS += $(ENV_LINKER_ARGS)
 TEST_FILE = pci_ut.c
 
 ADDITIONAL_LIBS += $(ENV_LIBS)
diff --git a/test/env/vtophys/Makefile b/test/env/vtophys/Makefile
index 7dc4d0053..94eceae94 100644
--- a/test/env/vtophys/Makefile
+++ b/test/env/vtophys/Makefile
@@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
-LIBS += $(ENV_LINKER_ARGS)
+UNIT_TEST_LINK_ENV = 1
 TEST_FILE = vtophys.c
 
 ADDITIONAL_LIBS += $(ENV_LIBS)
diff --git a/test/event/event_perf/Makefile b/test/event/event_perf/Makefile
index df6c7bbd1..6fda5a6b9 100644
--- a/test/event/event_perf/Makefile
+++ b/test/event/event_perf/Makefile
@@ -40,7 +40,7 @@ C_SRCS := event_perf.c
 
 SPDK_LIB_LIST = event trace conf thread util log rpc jsonrpc json sock
 
-LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
+LIBS += $(SPDK_LIB_LINKER_ARGS)
 
 all : $(APP)
 	@:
diff --git a/test/event/reactor/Makefile b/test/event/reactor/Makefile
index 66e301230..80298ee3b 100644
--- a/test/event/reactor/Makefile
+++ b/test/event/reactor/Makefile
@@ -40,7 +40,7 @@ C_SRCS := reactor.c
 
 SPDK_LIB_LIST = event trace conf thread util log rpc jsonrpc json sock
 
-LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
+LIBS += $(SPDK_LIB_LINKER_ARGS)
 
 all : $(APP)
 	@:
diff --git a/test/event/reactor_perf/Makefile b/test/event/reactor_perf/Makefile
index d8e40bfd4..146f1f1fc 100644
--- a/test/event/reactor_perf/Makefile
+++ b/test/event/reactor_perf/Makefile
@@ -40,7 +40,7 @@ C_SRCS := reactor_perf.c
 
 SPDK_LIB_LIST = event trace conf thread util log rpc jsonrpc json sock
 
-LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
+LIBS += $(SPDK_LIB_LINKER_ARGS)
 
 all : $(APP)
 	@:
diff --git a/test/rpc_client/Makefile b/test/rpc_client/Makefile
index 58e2c9ffa..4f5609273 100644
--- a/test/rpc_client/Makefile
+++ b/test/rpc_client/Makefile
@@ -42,7 +42,7 @@ C_SRCS := rpc_client_test.c
 
 SPDK_LIB_LIST = jsonrpc json rpc log util
 
-LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
+LIBS += $(SPDK_LIB_LINKER_ARGS)
 
 all : $(APP)
 	@: