Index: test/lit.cfg
===================================================================
--- test/lit.cfg
+++ test/lit.cfg
@@ -3,6 +3,7 @@
 import os
 import platform
 import re
+import subprocess
 
 import lit.formats
 import lit.util
@@ -30,6 +31,7 @@
 if polly_obj_root is not None:
     config.test_exec_root = os.path.join(polly_obj_root, 'test')
 
+
 # Set llvm_{src,obj}_root for use by others.
 config.llvm_src_root = getattr(config, 'llvm_src_root', None)
 config.llvm_obj_root = getattr(config, 'llvm_obj_root', None)
@@ -78,8 +80,9 @@
         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']).decode("utf-8").strip()
+    llvm_obj_root = subprocess.check_output(['llvm-config', '--obj-root']).decode("utf-8").strip()
+
     polly_src_root = os.path.join(llvm_src_root, "tools", "polly")
     polly_obj_root = os.path.join(llvm_obj_root, "tools", "polly")