Index: test/support/msvc_stdlib_force_include.hpp
===================================================================
--- test/support/msvc_stdlib_force_include.hpp
+++ test/support/msvc_stdlib_force_include.hpp
@@ -72,10 +72,12 @@
 #ifndef _LIBCXX_IN_DEVCRT
     // atomic_is_lock_free.pass.cpp needs this VS 2015 Update 2 fix.
     #define _ENABLE_ATOMIC_ALIGNMENT_FIX
+#endif // _LIBCXX_IN_DEVCRT
 
+#if !defined(_LIBCXX_IN_DEVCRT) && !defined(_LIBCPP_ENABLE_DEPRECATION_WARNINGS)
     // Silence warnings about features that are deprecated in C++17.
     #define _SILENCE_ALL_CXX17_DEPRECATION_WARNINGS
-#endif // _LIBCXX_IN_DEVCRT
+#endif // !defined(_LIBCXX_IN_DEVCRT) && !defined(_LIBCPP_ENABLE_DEPRECATION_WARNINGS)
 
 #include <ciso646>