diff --git a/libcxx/test/libcxx/language.support/support.rtti/type.info/type_info.comparison.merged.sh.cpp b/libcxx/test/libcxx/language.support/support.rtti/type.info/type_info.comparison.merged.sh.cpp
index ae6efea8b17baf..e4cf05ac72c0d2 100644
--- a/libcxx/test/libcxx/language.support/support.rtti/type.info/type_info.comparison.merged.sh.cpp
+++ b/libcxx/test/libcxx/language.support/support.rtti/type.info/type_info.comparison.merged.sh.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: -fno-rtti
+// UNSUPPORTED: no-rtti
 
 // RUN: %{cxx} %s %{flags} %{compile_flags} -c -o %t.tu1.o -DTU1 -D_LIBCPP_TYPEINFO_COMPARISON_IMPLEMENTATION=1
 // RUN: %{cxx} %s %{flags} %{compile_flags} -c -o %t.tu2.o -DTU2 -D_LIBCPP_TYPEINFO_COMPARISON_IMPLEMENTATION=1
diff --git a/libcxx/test/libcxx/language.support/support.rtti/type.info/type_info.comparison.unmerged.sh.cpp b/libcxx/test/libcxx/language.support/support.rtti/type.info/type_info.comparison.unmerged.sh.cpp
index 1fb9bc3a9b4189..3ce47dbb029614 100644
--- a/libcxx/test/libcxx/language.support/support.rtti/type.info/type_info.comparison.unmerged.sh.cpp
+++ b/libcxx/test/libcxx/language.support/support.rtti/type.info/type_info.comparison.unmerged.sh.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: -fno-rtti
+// UNSUPPORTED: no-rtti
 
 // RUN: %{cxx} %s %{flags} %{compile_flags} -c -o %t.tu1.o -DTU1 -D_LIBCPP_TYPEINFO_COMPARISON_IMPLEMENTATION=2
 // RUN: %{cxx} %s %{flags} %{compile_flags} -c -o %t.tu2.o -DTU2 -D_LIBCPP_TYPEINFO_COMPARISON_IMPLEMENTATION=2
diff --git a/libcxx/test/std/language.support/support.rtti/type.info/type_info.pass.cpp b/libcxx/test/std/language.support/support.rtti/type.info/type_info.pass.cpp
index ce169087ea5541..2422db658964c4 100644
--- a/libcxx/test/std/language.support/support.rtti/type.info/type_info.pass.cpp
+++ b/libcxx/test/std/language.support/support.rtti/type.info/type_info.pass.cpp
@@ -8,7 +8,7 @@
 
 // test type_info
 
-// UNSUPPORTED: -fno-rtti
+// UNSUPPORTED: no-rtti
 
 #include <typeinfo>
 #include <string>
diff --git a/libcxx/test/std/language.support/support.rtti/type.info/type_info_hash.pass.cpp b/libcxx/test/std/language.support/support.rtti/type.info/type_info_hash.pass.cpp
index ea47e2f145f3db..f173495dac7dba 100644
--- a/libcxx/test/std/language.support/support.rtti/type.info/type_info_hash.pass.cpp
+++ b/libcxx/test/std/language.support/support.rtti/type.info/type_info_hash.pass.cpp
@@ -8,7 +8,7 @@
 
 // test type_info
 
-// UNSUPPORTED: -fno-rtti
+// UNSUPPORTED: no-rtti
 
 #include <typeinfo>
 #include <cstring>
diff --git a/libcxx/test/std/utilities/any/any.class/any.observers/type.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.observers/type.pass.cpp
index 4a355c29cd1d96..3c951f81143d2f 100644
--- a/libcxx/test/std/utilities/any/any.class/any.observers/type.pass.cpp
+++ b/libcxx/test/std/utilities/any/any.class/any.observers/type.pass.cpp
@@ -8,7 +8,7 @@
 
 // UNSUPPORTED: c++03, c++11, c++14
 
-// XFAIL: -fno-rtti
+// XFAIL: no-rtti
 
 // <any>
 
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target.pass.cpp
index cc238ddef5fe1e..5a2b3647c6e189 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target.pass.cpp
@@ -22,7 +22,7 @@
 // This test runs in C++03, but we have deprecated using std::function in C++03.
 // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS
 
-// UNSUPPORTED: -fno-rtti
+// UNSUPPORTED: no-rtti
 
 #include <functional>
 #include <new>
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target_type.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target_type.pass.cpp
index ca3a6a566f1399..d6b3bf3003c9a1 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target_type.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target_type.pass.cpp
@@ -15,7 +15,7 @@
 // This test runs in C++03, but we have deprecated using std::function in C++03.
 // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS
 
-// UNSUPPORTED: -fno-rtti
+// UNSUPPORTED: no-rtti
 
 #include <functional>
 #include <typeinfo>
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.getdeleter/get_deleter.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.getdeleter/get_deleter.pass.cpp
index 0da513d256dbd1..bc0b87613b95a9 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.getdeleter/get_deleter.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.getdeleter/get_deleter.pass.cpp
@@ -12,7 +12,7 @@
 
 // template<class D, class T> D* get_deleter(const shared_ptr<T>& p);
 
-// UNSUPPORTED: -fno-rtti
+// UNSUPPORTED: no-rtti
 
 #include <memory>
 #include <cassert>
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/dynamic_pointer_cast.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/dynamic_pointer_cast.pass.cpp
index 77eb96dd97bd84..6059ff8b562fef 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/dynamic_pointer_cast.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/dynamic_pointer_cast.pass.cpp
@@ -12,7 +12,7 @@
 
 // template<class T, class U> shared_ptr<T> dynamic_pointer_cast(const shared_ptr<U>& r);
 
-// UNSUPPORTED: -fno-rtti
+// UNSUPPORTED: no-rtti
 
 #include <memory>
 #include <type_traits>
diff --git a/libcxx/test/std/utilities/type.index/type.index.hash/hash.pass.cpp b/libcxx/test/std/utilities/type.index/type.index.hash/hash.pass.cpp
index 35ba51723c89d2..aae9472856607e 100644
--- a/libcxx/test/std/utilities/type.index/type.index.hash/hash.pass.cpp
+++ b/libcxx/test/std/utilities/type.index/type.index.hash/hash.pass.cpp
@@ -17,7 +17,7 @@
 //     size_t operator()(type_index index) const;
 // };
 
-// UNSUPPORTED: -fno-rtti
+// UNSUPPORTED: no-rtti
 
 #include <typeindex>
 #include <type_traits>
diff --git a/libcxx/test/std/utilities/type.index/type.index.members/ctor.pass.cpp b/libcxx/test/std/utilities/type.index/type.index.members/ctor.pass.cpp
index e1ed6b8c0a7f81..202d818b96e691 100644
--- a/libcxx/test/std/utilities/type.index/type.index.members/ctor.pass.cpp
+++ b/libcxx/test/std/utilities/type.index/type.index.members/ctor.pass.cpp
@@ -12,7 +12,7 @@
 
 // type_index(const type_info& rhs);
 
-// UNSUPPORTED: -fno-rtti
+// UNSUPPORTED: no-rtti
 
 #include <typeinfo>
 #include <typeindex>
diff --git a/libcxx/test/std/utilities/type.index/type.index.members/eq.pass.cpp b/libcxx/test/std/utilities/type.index/type.index.members/eq.pass.cpp
index 5224183ac1c9dd..f64e2a7cb6c831 100644
--- a/libcxx/test/std/utilities/type.index/type.index.members/eq.pass.cpp
+++ b/libcxx/test/std/utilities/type.index/type.index.members/eq.pass.cpp
@@ -13,7 +13,7 @@
 // bool operator==(const type_index& rhs) const;
 // bool operator!=(const type_index& rhs) const;
 
-// UNSUPPORTED: -fno-rtti
+// UNSUPPORTED: no-rtti
 
 #include <typeindex>
 #include <cassert>
diff --git a/libcxx/test/std/utilities/type.index/type.index.members/hash_code.pass.cpp b/libcxx/test/std/utilities/type.index/type.index.members/hash_code.pass.cpp
index 6c99038435d894..0311d4e00e7ca4 100644
--- a/libcxx/test/std/utilities/type.index/type.index.members/hash_code.pass.cpp
+++ b/libcxx/test/std/utilities/type.index/type.index.members/hash_code.pass.cpp
@@ -12,7 +12,7 @@
 
 // size_t hash_code() const;
 
-// UNSUPPORTED: -fno-rtti
+// UNSUPPORTED: no-rtti
 
 #include <typeindex>
 #include <cassert>
diff --git a/libcxx/test/std/utilities/type.index/type.index.members/lt.pass.cpp b/libcxx/test/std/utilities/type.index/type.index.members/lt.pass.cpp
index 1a96ca0f6ce00a..360793864048c1 100644
--- a/libcxx/test/std/utilities/type.index/type.index.members/lt.pass.cpp
+++ b/libcxx/test/std/utilities/type.index/type.index.members/lt.pass.cpp
@@ -15,7 +15,7 @@
 // bool operator> (const type_index& rhs) const;
 // bool operator>=(const type_index& rhs) const;
 
-// UNSUPPORTED: -fno-rtti
+// UNSUPPORTED: no-rtti
 
 #include <typeindex>
 #include <cassert>
diff --git a/libcxx/test/std/utilities/type.index/type.index.members/name.pass.cpp b/libcxx/test/std/utilities/type.index/type.index.members/name.pass.cpp
index e03a9262c69040..110159355bad7d 100644
--- a/libcxx/test/std/utilities/type.index/type.index.members/name.pass.cpp
+++ b/libcxx/test/std/utilities/type.index/type.index.members/name.pass.cpp
@@ -12,7 +12,7 @@
 
 // const char* name() const;
 
-// UNSUPPORTED: -fno-rtti
+// UNSUPPORTED: no-rtti
 
 #include <typeindex>
 #include <string>
diff --git a/libcxx/test/std/utilities/type.index/type.index.overview/copy_assign.pass.cpp b/libcxx/test/std/utilities/type.index/type.index.overview/copy_assign.pass.cpp
index 80eeef6eee055a..7260f4282d4b1b 100644
--- a/libcxx/test/std/utilities/type.index/type.index.overview/copy_assign.pass.cpp
+++ b/libcxx/test/std/utilities/type.index/type.index.overview/copy_assign.pass.cpp
@@ -12,7 +12,7 @@
 
 // type_index& operator=(const type_index& ti);
 
-// UNSUPPORTED: -fno-rtti
+// UNSUPPORTED: no-rtti
 
 #include <typeindex>
 #include <cassert>
diff --git a/libcxx/test/std/utilities/type.index/type.index.overview/copy_ctor.pass.cpp b/libcxx/test/std/utilities/type.index/type.index.overview/copy_ctor.pass.cpp
index 6a2c47c5e57642..f55263518269b5 100644
--- a/libcxx/test/std/utilities/type.index/type.index.overview/copy_ctor.pass.cpp
+++ b/libcxx/test/std/utilities/type.index/type.index.overview/copy_ctor.pass.cpp
@@ -12,7 +12,7 @@
 
 // type_index(const type_index& ti);
 
-// UNSUPPORTED: -fno-rtti
+// UNSUPPORTED: no-rtti
 
 #include <typeindex>
 #include <cassert>
diff --git a/libcxx/test/std/utilities/type.index/type.index.synopsis/hash_type_index.pass.cpp b/libcxx/test/std/utilities/type.index/type.index.synopsis/hash_type_index.pass.cpp
index 97b0aa4ed9a70a..70a2e80b656c67 100644
--- a/libcxx/test/std/utilities/type.index/type.index.synopsis/hash_type_index.pass.cpp
+++ b/libcxx/test/std/utilities/type.index/type.index.synopsis/hash_type_index.pass.cpp
@@ -14,7 +14,7 @@
 //     size_t operator()(type_index index) const;
 // };
 
-// UNSUPPORTED: -fno-rtti
+// UNSUPPORTED: no-rtti
 
 #include <typeindex>
 #include <type_traits>
diff --git a/libcxx/test/support/test.support/test_macros_header.no_rtti.verify.cpp b/libcxx/test/support/test.support/test_macros_header.no_rtti.verify.cpp
index 4be5e9046de9b3..a7f35577c6beb9 100644
--- a/libcxx/test/support/test.support/test_macros_header.no_rtti.verify.cpp
+++ b/libcxx/test/support/test.support/test_macros_header.no_rtti.verify.cpp
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-// Make sure the TEST_HAS_NO_RTTI macro is defined when the -fno-rtti feature
+// Make sure the TEST_HAS_NO_RTTI macro is defined when the no-rtti Lit feature
 // is defined.
 
-// REQUIRES: -fno-rtti
+// REQUIRES: no-rtti
 
 #include "test_macros.h"
 
diff --git a/libcxx/test/support/test.support/test_macros_header.rtti.pass.cpp b/libcxx/test/support/test.support/test_macros_header.rtti.pass.cpp
index 4c602a50b54a77..ff8271cdd920d4 100644
--- a/libcxx/test/support/test.support/test_macros_header.rtti.pass.cpp
+++ b/libcxx/test/support/test.support/test_macros_header.rtti.pass.cpp
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-// Make sure the TEST_HAS_NO_RTTI macro is NOT defined when the -fno-rtti
+// Make sure the TEST_HAS_NO_RTTI macro is NOT defined when the no-rtti Lit
 // feature isn't defined.
 
-// UNSUPPORTED: -fno-rtti
+// UNSUPPORTED: no-rtti
 
 #include "test_macros.h"
 
diff --git a/libcxx/utils/libcxx/test/params.py b/libcxx/utils/libcxx/test/params.py
index 773890b015097e..175074a169b63d 100644
--- a/libcxx/utils/libcxx/test/params.py
+++ b/libcxx/utils/libcxx/test/params.py
@@ -27,7 +27,7 @@
   Parameter(name='enable_rtti', choices=[True, False], type=bool, default=True,
             help="Whether to enable RTTI when compiling the test suite.",
             feature=lambda rtti: None if rtti else
-              Feature(name='-fno-rtti', compileFlag='-fno-rtti')),
+              Feature(name='no-rtti', compileFlag='-fno-rtti')),
 
   Parameter(name='stdlib', choices=['libc++', 'libstdc++', 'msvc'], type=str, default='libc++',
             help="The C++ Standard Library implementation being tested.",
diff --git a/libcxxabi/test/incomplete_type.sh.cpp b/libcxxabi/test/incomplete_type.sh.cpp
index fba24b20925632..5521a1092863e5 100644
--- a/libcxxabi/test/incomplete_type.sh.cpp
+++ b/libcxxabi/test/incomplete_type.sh.cpp
@@ -14,7 +14,7 @@
 // addresses.
 
 // UNSUPPORTED: no-exceptions
-// UNSUPPORTED: -fno-rtti
+// UNSUPPORTED: no-rtti
 
 // NOTE: Link libc++abi explicitly and before libc++ so that libc++ doesn't drag
 // in the system libc++abi installation on OS X. (DYLD_LIBRARY_PATH is ignored