diff --git a/Utilities/bootstrap b/Utilities/bootstrap
index d6bdd3d2f2f..a36bdce901d 100755
--- a/Utilities/bootstrap
+++ b/Utilities/bootstrap
@@ -167,6 +167,9 @@ def add_build_args(parser):
         "--llbuild-link-framework",
         action="store_true",
         help="whether to link to the llbuild framework")
+    parser.add_argument(
+        "--extra-dynamic-library-path",
+        help="path to add to DYLD/LD_LIBRARY_PATH")
     parser.add_argument(
         "--release",
         action="store_true",
@@ -876,8 +879,9 @@ def get_swiftpm_env_cmd(args):
     if not '-macosx' in args.build_target and args.command == 'install':
         env_cmd.append("SWIFTCI_INSTALL_RPATH_OS=%s" % args.platform_path.group(2))
 
+    libs = []
     if args.bootstrap:
-        libs = [
+        libs += [
             os.path.join(args.bootstrap_dir,                       "lib"),
             os.path.join(args.build_dirs["tsc"],                   "lib"),
             os.path.join(args.build_dirs["llbuild"],               "lib"),
@@ -891,6 +895,10 @@ def get_swiftpm_env_cmd(args):
             os.path.join(args.build_dirs["swift-build"],           "lib"),
         ]
 
+    if args.extra_dynamic_library_path:
+        libs.append(args.extra_dynamic_library_path)
+
+    if libs:
         if platform.system() == 'Darwin':
             env_cmd.append("DYLD_LIBRARY_PATH=%s" % ":".join(libs))
         else:
@@ -901,6 +909,7 @@ def get_swiftpm_env_cmd(args):
         env_cmd.append("SWIFTCI_DISABLE_SDK_DEPENDENT_TESTS=YES")
 
     env_cmd += [
+        "SWIFT_BACKTRACE=enable=yes,warnings=suppressed",
         "SWIFT_EXEC=" + args.swiftc_path,
         "SWIFT_DRIVER_SWIFT_EXEC=" + args.swiftc_path,
         "CC=" + args.clang_path,