diff --git a/compiler-rt/test/lit.common.cfg.py b/compiler-rt/test/lit.common.cfg.py
--- a/compiler-rt/test/lit.common.cfg.py
+++ b/compiler-rt/test/lit.common.cfg.py
@@ -268,9 +268,6 @@
 # to the macOS version that first contained the relevant feature.
 darwin_min_deployment_target_substitutions = {
   '%macos_min_target_10_11': '10.11',
-  # rdar://problem/22207160
-  '%darwin_min_target_with_full_runtime_arc_support': '10.11',
-  '%darwin_min_target_with_tls_support': '10.12',
 }
 
 if config.host_os == 'Darwin':
diff --git a/compiler-rt/test/tsan/Darwin/norace-objcxx-run-time.mm b/compiler-rt/test/tsan/Darwin/norace-objcxx-run-time.mm
--- a/compiler-rt/test/tsan/Darwin/norace-objcxx-run-time.mm
+++ b/compiler-rt/test/tsan/Darwin/norace-objcxx-run-time.mm
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan %s -lc++ -fobjc-arc -lobjc -o %t -framework Foundation %darwin_min_target_with_full_runtime_arc_support
+// RUN: %clang_tsan %s -lc++ -fobjc-arc -lobjc -o %t -framework Foundation
 // RUN: %env_tsan_opts=ignore_interceptors_accesses=1 %run %t 2>&1 | FileCheck %s
 
 // Check that we do not report races between:
diff --git a/compiler-rt/test/tsan/Darwin/objc-synchronize-cycle-tagged.mm b/compiler-rt/test/tsan/Darwin/objc-synchronize-cycle-tagged.mm
--- a/compiler-rt/test/tsan/Darwin/objc-synchronize-cycle-tagged.mm
+++ b/compiler-rt/test/tsan/Darwin/objc-synchronize-cycle-tagged.mm
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc %darwin_min_target_with_full_runtime_arc_support
+// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc
 // RUN:     %run %t 6 2>&1 | FileCheck %s --check-prefix=SIX
 // RUN: not %run %t 7 2>&1 | FileCheck %s --check-prefix=SEVEN
 
diff --git a/compiler-rt/test/tsan/Darwin/objc-synchronize-cycle.mm b/compiler-rt/test/tsan/Darwin/objc-synchronize-cycle.mm
--- a/compiler-rt/test/tsan/Darwin/objc-synchronize-cycle.mm
+++ b/compiler-rt/test/tsan/Darwin/objc-synchronize-cycle.mm
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc %darwin_min_target_with_full_runtime_arc_support
+// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc
 // RUN:                                   not %run %t 2>&1 | FileCheck %s
 // RUN: %env_tsan_opts=detect_deadlocks=1 not %run %t 2>&1 | FileCheck %s
 // RUN: %env_tsan_opts=detect_deadlocks=0     %run %t 2>&1 | FileCheck %s --check-prefix=DISABLED
diff --git a/compiler-rt/test/tsan/Darwin/objc-synchronize-nested-recursive.mm b/compiler-rt/test/tsan/Darwin/objc-synchronize-nested-recursive.mm
--- a/compiler-rt/test/tsan/Darwin/objc-synchronize-nested-recursive.mm
+++ b/compiler-rt/test/tsan/Darwin/objc-synchronize-nested-recursive.mm
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc %darwin_min_target_with_full_runtime_arc_support
+// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc
 // RUN: %run %t 2>&1 | FileCheck %s
 
 #import <Foundation/Foundation.h>
diff --git a/compiler-rt/test/tsan/Darwin/objc-synchronize-tagged.mm b/compiler-rt/test/tsan/Darwin/objc-synchronize-tagged.mm
--- a/compiler-rt/test/tsan/Darwin/objc-synchronize-tagged.mm
+++ b/compiler-rt/test/tsan/Darwin/objc-synchronize-tagged.mm
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc %darwin_min_target_with_full_runtime_arc_support
+// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc
 // RUN: %run %t 2>&1 | FileCheck %s
 
 #import <Foundation/Foundation.h>
diff --git a/compiler-rt/test/tsan/Darwin/objc-synchronize.mm b/compiler-rt/test/tsan/Darwin/objc-synchronize.mm
--- a/compiler-rt/test/tsan/Darwin/objc-synchronize.mm
+++ b/compiler-rt/test/tsan/Darwin/objc-synchronize.mm
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc %darwin_min_target_with_full_runtime_arc_support
+// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc
 // RUN: %run %t 2>&1 | FileCheck %s
 
 #import <Foundation/Foundation.h>
diff --git a/compiler-rt/test/tsan/Darwin/os_unfair_lock.c b/compiler-rt/test/tsan/Darwin/os_unfair_lock.c
--- a/compiler-rt/test/tsan/Darwin/os_unfair_lock.c
+++ b/compiler-rt/test/tsan/Darwin/os_unfair_lock.c
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan %s -o %t -mmacosx-version-min=10.12
+// RUN: %clang_tsan %s -o %t
 // RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 // UNSUPPORTED: ios
diff --git a/compiler-rt/test/tsan/dtls.c b/compiler-rt/test/tsan/dtls.c
--- a/compiler-rt/test/tsan/dtls.c
+++ b/compiler-rt/test/tsan/dtls.c
@@ -1,6 +1,5 @@
-// RUN: %clang_tsan %darwin_min_target_with_tls_support %s -o %t
-// RUN: %clang_tsan %darwin_min_target_with_tls_support %s -DBUILD_SO -fPIC -o \
-// RUN:   %t-so.so -shared
+// RUN: %clang_tsan %s -o %t
+// RUN: %clang_tsan %s -DBUILD_SO -fPIC -o %t-so.so -shared
 // RUN: %run %t 2>&1 | FileCheck %s
 // XFAIL: netbsd
 
diff --git a/compiler-rt/test/tsan/mutexset7.cpp b/compiler-rt/test/tsan/mutexset7.cpp
--- a/compiler-rt/test/tsan/mutexset7.cpp
+++ b/compiler-rt/test/tsan/mutexset7.cpp
@@ -1,5 +1,5 @@
-// RUN: %clangxx_tsan %darwin_min_target_with_tls_support -O1 %s -o %t && \
-// RUN:   %deflake %run %t | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t
+// RUN: %deflake %run %t | FileCheck %s
 #include "test.h"
 
 int Global;
diff --git a/compiler-rt/test/tsan/tls_race.cpp b/compiler-rt/test/tsan/tls_race.cpp
--- a/compiler-rt/test/tsan/tls_race.cpp
+++ b/compiler-rt/test/tsan/tls_race.cpp
@@ -1,5 +1,5 @@
-// RUN: %clangxx_tsan %darwin_min_target_with_tls_support -O1 %s -o %t && \
-// RUN:   %deflake %run %t | \
+// RUN: %clangxx_tsan -O1 %s -o %t
+// RUN: %deflake %run %t | \
 // RUN:   FileCheck %s --check-prefix=CHECK-%os --check-prefix=CHECK
 #include "test.h"
 
diff --git a/compiler-rt/test/tsan/tls_race2.cpp b/compiler-rt/test/tsan/tls_race2.cpp
--- a/compiler-rt/test/tsan/tls_race2.cpp
+++ b/compiler-rt/test/tsan/tls_race2.cpp
@@ -1,5 +1,5 @@
-// RUN: %clangxx_tsan %darwin_min_target_with_tls_support -O1 %s -o %t && \
-// RUN:   %deflake %run %t | \
+// RUN: %clangxx_tsan -O1 %s -o %t
+// RUN: %deflake %run %t | \
 // RUN:   FileCheck %s --check-prefix=CHECK-%os --check-prefix=CHECK
 #include "test.h"