diff --git a/clang/test/Unit/lit.cfg b/clang/test/Unit/lit.cfg
index 39fad0099ceb..90eb2ac604a5 100644
--- a/clang/test/Unit/lit.cfg
+++ b/clang/test/Unit/lit.cfg
@@ -4,6 +4,7 @@
 
 import os
 import platform
+import subprocess
 
 import lit.formats
 import lit.util
@@ -65,8 +66,8 @@ if config.test_exec_root is None:
         lit_config.fatal('No site specific configuration available!')
 
     # Get the source and object roots.
-    llvm_src_root = lit.util.capture(['llvm-config', '--src-root']).strip()
-    llvm_obj_root = lit.util.capture(['llvm-config', '--obj-root']).strip()
+    llvm_src_root = subprocess.check_output(['llvm-config', '--src-root']).strip()
+    llvm_obj_root = subprocess.check_output(['llvm-config', '--obj-root']).strip()
     clang_src_root = os.path.join(llvm_src_root, "tools", "clang")
     clang_obj_root = os.path.join(llvm_obj_root, "tools", "clang")
 
diff --git a/clang/test/lit.cfg b/clang/test/lit.cfg
index e72eca6bd397..28026578299b 100644
--- a/clang/test/lit.cfg
+++ b/clang/test/lit.cfg
@@ -148,8 +148,8 @@ if config.test_exec_root is None:
         lit_config.fatal('No site specific configuration available!')
 
     # Get the source and object roots.
-    llvm_src_root = lit.util.capture(['llvm-config', '--src-root']).strip()
-    llvm_obj_root = lit.util.capture(['llvm-config', '--obj-root']).strip()
+    llvm_src_root = subprocess.check_output(['llvm-config', '--src-root']).strip()
+    llvm_obj_root = subprocess.check_output(['llvm-config', '--obj-root']).strip()
     clang_src_root = os.path.join(llvm_src_root, "tools", "clang")
     clang_obj_root = os.path.join(llvm_obj_root, "tools", "clang")
 
diff --git a/lld/test/lit.cfg b/lld/test/lit.cfg
index 486e83eb29e3..d063ffae707b 100644
--- a/lld/test/lit.cfg
+++ b/lld/test/lit.cfg
@@ -122,8 +122,8 @@ if config.test_exec_root is None:
         lit_config.fatal('No site specific configuration available!')
 
     # Get the source and object roots.
-    llvm_src_root = lit.util.capture(['llvm-config', '--src-root']).strip()
-    llvm_obj_root = lit.util.capture(['llvm-config', '--obj-root']).strip()
+    llvm_src_root = subprocess.check_output(['llvm-config', '--src-root']).strip()
+    llvm_obj_root = subprocess.check_output(['llvm-config', '--obj-root']).strip()
     lld_src_root = os.path.join(llvm_src_root, "tools", "lld")
     lld_obj_root = os.path.join(llvm_obj_root, "tools", "lld")
 
diff --git a/lldb/lit/lit.cfg b/lldb/lit/lit.cfg
index a3d5f9ca7524..8dea61b27169 100644
--- a/lldb/lit/lit.cfg
+++ b/lldb/lit/lit.cfg
@@ -95,8 +95,8 @@ if config.test_exec_root is None:
         lit_config.fatal('No site specific configuration available!')
 
     # Get the source and object roots.
-    llvm_src_root = lit.util.capture(['llvm-config', '--src-root']).strip()
-    llvm_obj_root = lit.util.capture(['llvm-config', '--obj-root']).strip()
+    llvm_src_root = subprocess.check_output(['llvm-config', '--src-root']).strip()
+    llvm_obj_root = subprocess.check_output(['llvm-config', '--obj-root']).strip()
     lldb_src_root = os.path.join(llvm_src_root, "tools", "lldb")
     lldb_obj_root = os.path.join(llvm_obj_root, "tools", "lldb")
 
@@ -132,7 +132,7 @@ if not os.path.exists(config.cxx):
 
 if platform.system() in ['Darwin']:
     try:
-        out = lit.util.capture(['xcrun', '--show-sdk-path']).strip()
+        out = subprocess.check_output(['xcrun', '--show-sdk-path']).strip()
         res = 0
     except OSError:
         res = -1
diff --git a/llvm/test/Unit/lit.cfg b/llvm/test/Unit/lit.cfg
index dac0bf829ba6..9da82f5f2c9b 100644
--- a/llvm/test/Unit/lit.cfg
+++ b/llvm/test/Unit/lit.cfg
@@ -3,6 +3,7 @@
 # Configuration file for the 'lit' test runner.
 
 import os
+import subprocess
 
 import lit.formats
 
@@ -75,8 +76,8 @@ if config.test_exec_root is None:
         lit_config.fatal('No site specific configuration available!')
 
     # Get the source and object roots.
-    llvm_src_root = lit.util.capture(['llvm-config', '--src-root']).strip()
-    llvm_obj_root = lit.util.capture(['llvm-config', '--obj-root']).strip()
+    llvm_src_root = subprocess.check_output(['llvm-config', '--src-root']).strip()
+    llvm_obj_root = subprocess.check_output(['llvm-config', '--obj-root']).strip()
 
     # Validate that we got a tree which points to here.
     this_src_root = os.path.join(os.path.dirname(__file__),'..','..')
diff --git a/llvm/test/lit.cfg b/llvm/test/lit.cfg
index ed1ba2d11b1a..8ed9187aea77 100644
--- a/llvm/test/lit.cfg
+++ b/llvm/test/lit.cfg
@@ -6,6 +6,7 @@ import os
 import sys
 import re
 import platform
+import subprocess
 
 import lit.util
 import lit.formats
@@ -150,8 +151,8 @@ if config.test_exec_root is None:
         lit_config.fatal('No site specific configuration available!')
 
     # Get the source and object roots.
-    llvm_src_root = lit.util.capture(['llvm-config', '--src-root']).strip()
-    llvm_obj_root = lit.util.capture(['llvm-config', '--obj-root']).strip()
+    llvm_src_root = subprocess.check_output(['llvm-config', '--src-root']).strip()
+    llvm_obj_root = subprocess.check_output(['llvm-config', '--obj-root']).strip()
 
     # Validate that we got a tree which points to here.
     this_src_root = os.path.dirname(config.test_source_root)