diff --git a/src/test/ex_pmreorder/TEST0 b/src/test/ex_pmreorder/TEST0
index 32650c7f255fc87457cc1fb8d36eefe7651383df..0e983a8cff7142a416a709a00fb9a2eb881ef91f 100755
--- a/src/test/ex_pmreorder/TEST0
+++ b/src/test/ex_pmreorder/TEST0
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2018, Intel Corporation
+# Copyright 2018-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -37,7 +37,7 @@
 
 . ../unittest/unittest.sh
 
-LIBPMEM_SO=${TEST_LD_LIBRARY_PATH}/libpmem.so.1
+LIBPMEM_SO=${PMDK_LIB_PATH}/libpmem.so.1
 
 require_test_type medium
 require_build_type debug nondebug
diff --git a/src/test/ex_pmreorder/TEST1 b/src/test/ex_pmreorder/TEST1
index 8c60516897da719cf565b2c415e84eed4400cc49..9406352ec94d4a54253cfa695f129f7d1d7bc9a5 100755
--- a/src/test/ex_pmreorder/TEST1
+++ b/src/test/ex_pmreorder/TEST1
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2018, Intel Corporation
+# Copyright 2018-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -37,7 +37,7 @@
 
 . ../unittest/unittest.sh
 
-LIBPMEM_SO=${TEST_LD_LIBRARY_PATH}/libpmem.so.1
+LIBPMEM_SO=${PMDK_LIB_PATH}/libpmem.so.1
 
 require_test_type medium
 require_build_type debug nondebug
diff --git a/src/test/pmempool_create/TEST7 b/src/test/pmempool_create/TEST7
index d0a5e624bf7fe1fd560deb423db47e70e6529019..ec00cd33b0df6e419ab7f24ded673b9b67c58049 100755
--- a/src/test/pmempool_create/TEST7
+++ b/src/test/pmempool_create/TEST7
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2014-2018, Intel Corporation
+# Copyright 2014-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -41,7 +41,7 @@ require_test_type medium
 require_fs_type pmem non-pmem
 require_build_type nondebug debug
 
-configure_valgrind memcheck force-enable $TEST_LD_LIBRARY_PATH/libpmemobj.so
+configure_valgrind memcheck force-enable $PMDK_LIB_PATH/libpmemobj.so
 export PMEMOBJ_VG_CHECK_UNDEF=1
 
 setup
diff --git a/src/test/scope/TEST0 b/src/test/scope/TEST0
index 5173a5f05a5dc2e97b3ae512aa3481740fdc9408..e357fbed8e7d70511d30ed1d44377970424b1977 100755
--- a/src/test/scope/TEST0
+++ b/src/test/scope/TEST0
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2014-2018, Intel Corporation
+# Copyright 2014-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -53,9 +53,9 @@ parse_lib() {
 }
 
 if [ "$BUILD" = "debug" -o "$BUILD" = "nondebug" ]; then
-	parse_lib -D $TEST_LD_LIBRARY_PATH/libvmem.so.1
+	parse_lib -D $PMDK_LIB_PATH/libvmem.so.1
 else
-	parse_lib -g $TEST_LD_LIBRARY_PATH/libvmem.a
+	parse_lib -g $PMDK_LIB_PATH/libvmem.a
 fi
 
 check
diff --git a/src/test/scope/TEST1 b/src/test/scope/TEST1
index c2f756f11ff37be00c17f4bacf497e538bd0b999..5137e1e32e85223e457efd37079b7a04d92e70b7 100755
--- a/src/test/scope/TEST1
+++ b/src/test/scope/TEST1
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2014-2018, Intel Corporation
+# Copyright 2014-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -54,9 +54,9 @@ parse_lib() {
 }
 
 if [ "$BUILD" = "debug" -o "$BUILD" = "nondebug" ]; then
-	parse_lib -D $TEST_LD_LIBRARY_PATH/libpmem.so.1
+	parse_lib -D $PMDK_LIB_PATH/libpmem.so.1
 else
-	parse_lib -g $TEST_LD_LIBRARY_PATH/libpmem.a
+	parse_lib -g $PMDK_LIB_PATH/libpmem.a
 fi
 
 check
diff --git a/src/test/scope/TEST2 b/src/test/scope/TEST2
index 4599d556720359bfc0d496274d0413f699dab24a..ab428bd17a8ae91710e4a2de31fb68249d1688bd 100755
--- a/src/test/scope/TEST2
+++ b/src/test/scope/TEST2
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2014-2018, Intel Corporation
+# Copyright 2014-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -54,9 +54,9 @@ parse_lib() {
 }
 
 if [ "$BUILD" = "debug" -o "$BUILD" = "nondebug" ]; then
-	parse_lib -D $TEST_LD_LIBRARY_PATH/libpmemlog.so.1
+	parse_lib -D $PMDK_LIB_PATH/libpmemlog.so.1
 else
-	parse_lib -g $TEST_LD_LIBRARY_PATH/libpmemlog.a
+	parse_lib -g $PMDK_LIB_PATH/libpmemlog.a
 fi
 
 check
diff --git a/src/test/scope/TEST3 b/src/test/scope/TEST3
index 24cdfa17e42ff5c29d475f89a8c3a3938675e926..9cdbab29ad6078a7d756c81d3079ca5ec8b3be29 100755
--- a/src/test/scope/TEST3
+++ b/src/test/scope/TEST3
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2014-2018, Intel Corporation
+# Copyright 2014-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -53,9 +53,9 @@ parse_lib() {
 }
 
 if [ "$BUILD" = "debug" -o "$BUILD" = "nondebug" ]; then
-	parse_lib -D $TEST_LD_LIBRARY_PATH/libpmemblk.so.1
+	parse_lib -D $PMDK_LIB_PATH/libpmemblk.so.1
 else
-	parse_lib -g $TEST_LD_LIBRARY_PATH/libpmemblk.a
+	parse_lib -g $PMDK_LIB_PATH/libpmemblk.a
 fi
 
 check
diff --git a/src/test/scope/TEST4 b/src/test/scope/TEST4
index 34ed346408f8eaa3f9812ba13cef3b7981b336db..ec22bb21894bc3787137c2836ec79d6d61cc3f5b 100755
--- a/src/test/scope/TEST4
+++ b/src/test/scope/TEST4
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2014-2018, Intel Corporation
+# Copyright 2014-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -54,9 +54,9 @@ parse_lib() {
 }
 
 if [ "$BUILD" = "debug" -o "$BUILD" = "nondebug" ]; then
-	parse_lib -D $TEST_LD_LIBRARY_PATH/libpmemobj.so.1
+	parse_lib -D $PMDK_LIB_PATH/libpmemobj.so.1
 else
-	parse_lib -g $TEST_LD_LIBRARY_PATH/libpmemobj.a
+	parse_lib -g $PMDK_LIB_PATH/libpmemobj.a
 fi
 
 check
diff --git a/src/test/scope/TEST5 b/src/test/scope/TEST5
index 6096aff9aa66edede5b4049513b7ffc89233fb8a..cde680de781d1a172f65eb212e65b1a6c3168768 100755
--- a/src/test/scope/TEST5
+++ b/src/test/scope/TEST5
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2014-2018, Intel Corporation
+# Copyright 2014-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -54,7 +54,7 @@ parse_lib() {
 
 }
 
-parse_lib -D $TEST_LD_LIBRARY_PATH/$VMMALLOC
+parse_lib -D $PMDK_LIB_PATH/$VMMALLOC
 
 check
 
diff --git a/src/test/scope/TEST6 b/src/test/scope/TEST6
index 5039967c263742549a03ac50964912e3a14f00f8..d9c100dc5d25a41ae8e13f92918b0384d741be39 100755
--- a/src/test/scope/TEST6
+++ b/src/test/scope/TEST6
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2014-2018, Intel Corporation
+# Copyright 2014-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -54,9 +54,9 @@ parse_lib() {
 }
 
 if [ "$BUILD" = "debug" -o "$BUILD" = "nondebug" ]; then
-	parse_lib -D $TEST_LD_LIBRARY_PATH/libpmempool.so.1
+	parse_lib -D $PMDK_LIB_PATH/libpmempool.so.1
 else
-	parse_lib -g $TEST_LD_LIBRARY_PATH/libpmempool.a
+	parse_lib -g $PMDK_LIB_PATH/libpmempool.a
 fi
 
 check
diff --git a/src/test/unittest/unittest.sh b/src/test/unittest/unittest.sh
index ae4c9ea156bc4ab435816193cc66df5764eec891..fa591c664a855749653324169885e9076355440b 100644
--- a/src/test/unittest/unittest.sh
+++ b/src/test/unittest/unittest.sh
@@ -170,23 +170,26 @@ NODE_PID_FILES[0]=""
 	in
 	debug|static-debug)
 		if [ -z "$PMDK_LIB_PATH_DEBUG" ]; then
-			TEST_LD_LIBRARY_PATH=../../debug
-			REMOTE_LD_LIBRARY_PATH=../debug
+			PMDK_LIB_PATH=../../debug
+			REMOTE_PMDK_LIB_PATH=../debug
 		else
-			TEST_LD_LIBRARY_PATH=$PMDK_LIB_PATH_DEBUG
-			REMOTE_LD_LIBRARY_PATH=$PMDK_LIB_PATH_DEBUG
+			PMDK_LIB_PATH=$PMDK_LIB_PATH_DEBUG
+			REMOTE_PMDK_LIB_PATH=$PMDK_LIB_PATH_DEBUG
 		fi
 		;;
 	nondebug|static-nondebug)
 		if [ -z "$PMDK_LIB_PATH_NONDEBUG" ]; then
-			TEST_LD_LIBRARY_PATH=../../nondebug
-			REMOTE_LD_LIBRARY_PATH=../nondebug
+			PMDK_LIB_PATH=../../nondebug
+			REMOTE_PMDK_LIB_PATH=../nondebug
 		else
-			TEST_LD_LIBRARY_PATH=$PMDK_LIB_PATH_NONDEBUG
-			REMOTE_LD_LIBRARY_PATH=$PMDK_LIB_PATH_NONDEBUG
+			PMDK_LIB_PATH=$PMDK_LIB_PATH_NONDEBUG
+			REMOTE_PMDK_LIB_PATH=$PMDK_LIB_PATH_NONDEBUG
 		fi
 		;;
 	esac
+
+	TEST_LD_LIBRARY_PATH=$PMDK_LIB_PATH
+	REMOTE_LD_LIBRARY_PATH=$REMOTE_PMDK_LIB_PATH
 }
 
 #
diff --git a/src/test/vmmalloc_init/TEST16 b/src/test/vmmalloc_init/TEST16
index 4420f45f5e16f750234b9625bc90800851f03cfc..fffe30fb082b061412935f115255d3e4b4eef623 100755
--- a/src/test/vmmalloc_init/TEST16
+++ b/src/test/vmmalloc_init/TEST16
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2015-2018, Intel Corporation
+# Copyright 2015-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -48,9 +48,9 @@ require_no_freebsd
 
 # Valgrind does not call vmmalloc's malloc implementation from library
 # loaded with RTLD_DEEPBIND.
-configure_valgrind memcheck force-disable $TEST_LD_LIBRARY_PATH/$VMMALLOC
-configure_valgrind helgrind force-disable $TEST_LD_LIBRARY_PATH/$VMMALLOC
-configure_valgrind drd force-disable $TEST_LD_LIBRARY_PATH/$VMMALLOC
+configure_valgrind memcheck force-disable $PMDK_LIB_PATH/$VMMALLOC
+configure_valgrind helgrind force-disable $PMDK_LIB_PATH/$VMMALLOC
+configure_valgrind drd force-disable $PMDK_LIB_PATH/$VMMALLOC
 
 setup
 
diff --git a/src/test/vmmalloc_init/TEST6 b/src/test/vmmalloc_init/TEST6
index 0f612eef25d2e45e7b06678eea6fed42bbe6e10a..cff2a6d0089925e8ca1e9b599101220c8301072c 100755
--- a/src/test/vmmalloc_init/TEST6
+++ b/src/test/vmmalloc_init/TEST6
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2014-2018, Intel Corporation
+# Copyright 2014-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -48,9 +48,9 @@ require_no_freebsd
 
 # Valgrind does not call vmmalloc's malloc implementation from library
 # loaded with RTLD_DEEPBIND.
-configure_valgrind memcheck force-disable $TEST_LD_LIBRARY_PATH/$VMMALLOC
-configure_valgrind helgrind force-disable $TEST_LD_LIBRARY_PATH/$VMMALLOC
-configure_valgrind drd force-disable $TEST_LD_LIBRARY_PATH/$VMMALLOC
+configure_valgrind memcheck force-disable $PMDK_LIB_PATH/$VMMALLOC
+configure_valgrind helgrind force-disable $PMDK_LIB_PATH/$VMMALLOC
+configure_valgrind drd force-disable $PMDK_LIB_PATH/$VMMALLOC
 
 setup
 
diff --git a/src/test/vmmalloc_valgrind/TEST0 b/src/test/vmmalloc_valgrind/TEST0
index 827d8e8491395f014bd15ef9c241c9180a0e460c..fed60702b9a7203f18f8a1556391ad5b2c1326a1 100755
--- a/src/test/vmmalloc_valgrind/TEST0
+++ b/src/test/vmmalloc_valgrind/TEST0
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2014-2018, Intel Corporation
+# Copyright 2014-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -46,7 +46,7 @@ require_fs_type any
 require_build_type debug nondebug
 require_valgrind 3.7
 set_valgrind_exe_name
-configure_valgrind memcheck force-enable $TEST_LD_LIBRARY_PATH/$VMMALLOC
+configure_valgrind memcheck force-enable $PMDK_LIB_PATH/$VMMALLOC
 setup
 
 unset VMMALLOC_LOG_LEVEL
diff --git a/src/test/vmmalloc_valgrind/TEST1 b/src/test/vmmalloc_valgrind/TEST1
index 22f4b0dbaaa20e67797ba48e39ba7277311a12cd..87ab5b65a9df423148bd68db90a701fa4396bde4 100755
--- a/src/test/vmmalloc_valgrind/TEST1
+++ b/src/test/vmmalloc_valgrind/TEST1
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2014-2018, Intel Corporation
+# Copyright 2014-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -46,7 +46,7 @@ require_fs_type any
 require_build_type debug nondebug
 require_valgrind 3.7
 set_valgrind_exe_name
-configure_valgrind memcheck force-enable $TEST_LD_LIBRARY_PATH/$VMMALLOC
+configure_valgrind memcheck force-enable $PMDK_LIB_PATH/$VMMALLOC
 setup
 
 unset VMMALLOC_LOG_LEVEL
diff --git a/src/test/vmmalloc_valgrind/TEST2 b/src/test/vmmalloc_valgrind/TEST2
index 8d8605f4e52c66587f6c96c8e58a632c21489354..fa92990627e241d93d21b6087e3c7068583e5240 100755
--- a/src/test/vmmalloc_valgrind/TEST2
+++ b/src/test/vmmalloc_valgrind/TEST2
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2014-2018, Intel Corporation
+# Copyright 2014-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -46,7 +46,7 @@ require_fs_type any
 require_build_type debug nondebug
 require_valgrind 3.8
 set_valgrind_exe_name
-configure_valgrind memcheck force-enable $TEST_LD_LIBRARY_PATH/$VMMALLOC
+configure_valgrind memcheck force-enable $PMDK_LIB_PATH/$VMMALLOC
 setup
 
 unset VMMALLOC_LOG_LEVEL