diff --git a/test/lit.cfg b/test/lit.cfg
index e79f2220..7c8d2687 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -234,7 +234,6 @@ class Configuration(object):
         self.configure_obj_root()
         self.configure_use_system_lib()
         self.configure_use_clang_verify()
-        self.configure_env()
         self.configure_std_flag()
         self.configure_compile_flags()
         self.configure_link_flags()
@@ -444,12 +443,12 @@ class Configuration(object):
     def configure_link_flags(self):
         # Configure library search paths
         abi_library_path = self.get_lit_conf('abi_library_path', '')
-        self.link_flags += ['-L' + self.obj_root + '/lib']
         if not self.use_system_lib:
-            self.link_flags += ['-Wl,-rpath', '-Wl,' + self.obj_root + '/lib']
+            self.link_flags += ['-L' + self.obj_root + '/lib']
+            self.link_flags += ['-Wl,-rpath,' + self.obj_root + '/lib']
         if abi_library_path:
             self.link_flags += ['-L' + abi_library_path,
-                                '-Wl,-rpath', '-Wl,' + abi_library_path]
+                                '-Wl,-rpath,' + abi_library_path]
         # Configure libraries
         self.link_flags += ['-lc++']
         link_flags_str = self.get_lit_conf('link_flags')
@@ -559,12 +558,6 @@ class Configuration(object):
             self.lit_config.note(
                 "inferred target_triple as: %r" % self.config.target_triple)
 
-    def configure_env(self):
-        # Configure extra linker parameters.
-        if sys.platform == 'darwin':
-            if not self.use_system_lib:
-                self.env['DYLD_LIBRARY_PATH'] = os.path.join(self.obj_root,
-                                                             'lib')
 
 
 # name: The name of this test suite.