diff --git a/src/sst/elements/mask-mpi/tests/testsuite_default_mask_mpi.py b/src/sst/elements/mask-mpi/tests/testsuite_default_mask_mpi.py
index bc1df0d043..9610b707c1 100644
--- a/src/sst/elements/mask-mpi/tests/testsuite_default_mask_mpi.py
+++ b/src/sst/elements/mask-mpi/tests/testsuite_default_mask_mpi.py
@@ -20,15 +20,14 @@ def tearDown(self):
 
 #####
 
-    def test_testme(self):
+    def test_sendrecv(self):
         testdir = self.get_testsuite_dir()
-
-        paths = os.environ.get("SST_LIB_PATH")
-        if paths is None:
-            os.environ["SST_LIB_PATH"] = testdir
+        libdir = sstsimulator_conf_get_value_str("SST_ELEMENT_LIBRARY","SST_ELEMENT_LIBRARY_LIBDIR")
+        path = os.environ.get("SST_LIB_PATH")
+        if path is None or path == "":
+            os.environ["SST_LIB_PATH"] = libdir
         else:
-            os.environ["SST_LIB_PATH"] = paths + ":" + testdir
-
+            os.environ["SST_LIB_PATH"] = path + ":" + libdir
         self.mask_mpi_template("test_sendrecv")
 
 #####
diff --git a/src/sst/elements/mercury/tests/testsuite_default_hg.py b/src/sst/elements/mercury/tests/testsuite_default_hg.py
index 241ee86a49..b4a3dd7293 100644
--- a/src/sst/elements/mercury/tests/testsuite_default_hg.py
+++ b/src/sst/elements/mercury/tests/testsuite_default_hg.py
@@ -21,13 +21,12 @@ def tearDown(self):
 
     def test_testme(self):
         testdir = self.get_testsuite_dir()
-
-        paths = os.environ.get("SST_LIB_PATH")
-        if paths is None:
-            os.environ["SST_LIB_PATH"] = testdir
+        libdir = sstsimulator_conf_get_value_str("SST_ELEMENT_LIBRARY","SST_ELEMENT_LIBRARY_LIBDIR")
+        path = os.environ.get("SST_LIB_PATH")
+        if path is None or path == "":
+            os.environ["SST_LIB_PATH"] = libdir
         else:
-            os.environ["SST_LIB_PATH"] = paths + ":" + testdir
-
+            os.environ["SST_LIB_PATH"] = path + ":" + libdir
         self.simple_components_template("ostest")
 
 #####