diff --git a/clang/test/Tooling/clang-check-mac-libcxx-fixed-compilation-db.cpp b/clang/test/Tooling/clang-check-mac-libcxx-fixed-compilation-db.cpp
--- a/clang/test/Tooling/clang-check-mac-libcxx-fixed-compilation-db.cpp
+++ b/clang/test/Tooling/clang-check-mac-libcxx-fixed-compilation-db.cpp
@@ -16,5 +16,7 @@
 //
 // ^ -ccc-install-dir passed to unbreak tests on *BSD where
 //   getMainExecutable() relies on real argv[0] being passed
+//
+// UNSUPPORTED: enable_shared
 #include <mock_vector>
 vector v;
diff --git a/llvm/utils/lit/lit/llvm/config.py b/llvm/utils/lit/lit/llvm/config.py
--- a/llvm/utils/lit/lit/llvm/config.py
+++ b/llvm/utils/lit/lit/llvm/config.py
@@ -52,6 +52,8 @@
             # We should standardize on the former.
             features.add('system-linker-mach-o')
             features.add('system-darwin')
+            if config.enable_shared:
+                features.add("enable_shared")
         elif platform.system() == 'Windows':
             # For tests that require Windows to run.
             features.add('system-windows')