diff --git a/lldb/test/API/.lit_test_times.txt b/lldb/test/API/.lit_test_times.txt
deleted file mode 100644
index 5b848a0183c9d6..00000000000000
--- a/lldb/test/API/.lit_test_times.txt
+++ /dev/null
@@ -1 +0,0 @@
-2.777875e+00 functionalities/load_lazy/TestLoadUsingLazyBind.py
diff --git a/lldb/test/API/lit.cfg.py b/lldb/test/API/lit.cfg.py
index 54a02453b174b2..cbb457e9328c60 100644
--- a/lldb/test/API/lit.cfg.py
+++ b/lldb/test/API/lit.cfg.py
@@ -17,10 +17,10 @@
 config.suffixes = ['.py']
 
 # test_source_root: The root path where tests are located.
-# test_exec_root: The root path where tests should be run.
 config.test_source_root = os.path.dirname(__file__)
-config.test_exec_root = config.test_source_root
 
+# test_exec_root: The root path where tests should be run.
+config.test_exec_root = os.path.join(config.lldb_obj_root, 'test', 'API')
 
 def mkdir_p(path):
   import errno
diff --git a/lldb/test/Shell/helper/toolchain.py b/lldb/test/Shell/helper/toolchain.py
index 59b078411c1c49..6e564f31dbd371 100644
--- a/lldb/test/Shell/helper/toolchain.py
+++ b/lldb/test/Shell/helper/toolchain.py
@@ -11,7 +11,7 @@
 
 
 def _get_lldb_init_path(config):
-    return os.path.join(config.test_exec_root, 'Shell', 'lit-lldb-init')
+    return os.path.join(config.test_exec_root, 'lit-lldb-init')
 
 
 def _disallow(config, execName):
diff --git a/lldb/test/Shell/lit.cfg.py b/lldb/test/Shell/lit.cfg.py
index 1e793846023a42..c4730b284b23c8 100644
--- a/lldb/test/Shell/lit.cfg.py
+++ b/lldb/test/Shell/lit.cfg.py
@@ -36,7 +36,7 @@
 config.test_source_root = os.path.dirname(__file__)
 
 # test_exec_root: The root path where tests should be run.
-config.test_exec_root = os.path.join(config.lldb_obj_root, 'test')
+config.test_exec_root = os.path.join(config.lldb_obj_root, 'test', 'Shell')
 
 # Propagate environment vars.
 llvm_config.with_system_environment([