diff --git a/test/std/atomics/version.pass.cpp b/test/libcxx/atomics/version.pass.cpp
similarity index 100%
rename from test/std/atomics/version.pass.cpp
rename to test/libcxx/atomics/version.pass.cpp
diff --git a/test/libcxx/diagnostics/assertions/version_cassert.pass.cpp b/test/libcxx/diagnostics/assertions/version_cassert.pass.cpp
new file mode 100644
index 000000000..f123a0525
--- /dev/null
+++ b/test/libcxx/diagnostics/assertions/version_cassert.pass.cpp
@@ -0,0 +1,20 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// test <cassert>
+
+#include <cassert>
+
+#ifndef _LIBCPP_VERSION
+#error _LIBCPP_VERSION not defined
+#endif
+
+int main()
+{
+}
diff --git a/test/libcxx/diagnostics/errno/version_cerrno.pass.cpp b/test/libcxx/diagnostics/errno/version_cerrno.pass.cpp
new file mode 100644
index 000000000..7cd2be8ef
--- /dev/null
+++ b/test/libcxx/diagnostics/errno/version_cerrno.pass.cpp
@@ -0,0 +1,19 @@
+// -*- C++ -*-
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// test <cerrno>
+
+#include <cerrno>
+
+#ifndef _LIBCPP_VERSION
+#error _LIBCPP_VERSION not defined
+#endif
+
+int main() {}
diff --git a/test/std/diagnostics/std.exceptions/version.pass.cpp b/test/libcxx/diagnostics/std.exceptions/version.pass.cpp
similarity index 100%
rename from test/std/diagnostics/std.exceptions/version.pass.cpp
rename to test/libcxx/diagnostics/std.exceptions/version.pass.cpp
diff --git a/test/std/diagnostics/syserr/version.pass.cpp b/test/libcxx/diagnostics/syserr/version.pass.cpp
similarity index 100%
rename from test/std/diagnostics/syserr/version.pass.cpp
rename to test/libcxx/diagnostics/syserr/version.pass.cpp
diff --git a/test/std/experimental/optional/version.pass.cpp b/test/libcxx/experimental/optional/version.pass.cpp
similarity index 100%
rename from test/std/experimental/optional/version.pass.cpp
rename to test/libcxx/experimental/optional/version.pass.cpp
diff --git a/test/std/experimental/utilities/meta/version.pass.cpp b/test/libcxx/experimental/utilities/meta/version.pass.cpp
similarity index 100%
rename from test/std/experimental/utilities/meta/version.pass.cpp
rename to test/libcxx/experimental/utilities/meta/version.pass.cpp
diff --git a/test/std/experimental/utilities/utility/version.pass.cpp b/test/libcxx/experimental/utilities/utility/version.pass.cpp
similarity index 100%
rename from test/std/experimental/utilities/utility/version.pass.cpp
rename to test/libcxx/experimental/utilities/utility/version.pass.cpp
diff --git a/test/std/strings/c.strings/version_cctype.pass.cpp b/test/libcxx/strings/c.strings/version_cctype.pass.cpp
similarity index 100%
rename from test/std/strings/c.strings/version_cctype.pass.cpp
rename to test/libcxx/strings/c.strings/version_cctype.pass.cpp
diff --git a/test/std/strings/c.strings/version_cstring.pass.cpp b/test/libcxx/strings/c.strings/version_cstring.pass.cpp
similarity index 100%
rename from test/std/strings/c.strings/version_cstring.pass.cpp
rename to test/libcxx/strings/c.strings/version_cstring.pass.cpp
diff --git a/test/std/strings/c.strings/version_cuchar.pass.cpp b/test/libcxx/strings/c.strings/version_cuchar.pass.cpp
similarity index 100%
rename from test/std/strings/c.strings/version_cuchar.pass.cpp
rename to test/libcxx/strings/c.strings/version_cuchar.pass.cpp
diff --git a/test/std/strings/c.strings/version_cwchar.pass.cpp b/test/libcxx/strings/c.strings/version_cwchar.pass.cpp
similarity index 100%
rename from test/std/strings/c.strings/version_cwchar.pass.cpp
rename to test/libcxx/strings/c.strings/version_cwchar.pass.cpp
diff --git a/test/std/strings/c.strings/version_cwctype.pass.cpp b/test/libcxx/strings/c.strings/version_cwctype.pass.cpp
similarity index 100%
rename from test/std/strings/c.strings/version_cwctype.pass.cpp
rename to test/libcxx/strings/c.strings/version_cwctype.pass.cpp
diff --git a/test/std/strings/version.pass.cpp b/test/libcxx/strings/version.pass.cpp
similarity index 100%
rename from test/std/strings/version.pass.cpp
rename to test/libcxx/strings/version.pass.cpp
diff --git a/test/std/thread/thread.condition/version.pass.cpp b/test/libcxx/thread/thread.condition/version.pass.cpp
similarity index 100%
rename from test/std/thread/thread.condition/version.pass.cpp
rename to test/libcxx/thread/thread.condition/version.pass.cpp
diff --git a/test/std/thread/thread.mutex/version.pass.cpp b/test/libcxx/thread/thread.mutex/version.pass.cpp
similarity index 100%
rename from test/std/thread/thread.mutex/version.pass.cpp
rename to test/libcxx/thread/thread.mutex/version.pass.cpp
diff --git a/test/std/thread/thread.threads/version.pass.cpp b/test/libcxx/thread/thread.threads/version.pass.cpp
similarity index 100%
rename from test/std/thread/thread.threads/version.pass.cpp
rename to test/libcxx/thread/thread.threads/version.pass.cpp
diff --git a/test/std/diagnostics/assertions/cassert.pass.cpp b/test/std/diagnostics/assertions/cassert.pass.cpp
index bed7a394e..3f886e7b9 100644
--- a/test/std/diagnostics/assertions/cassert.pass.cpp
+++ b/test/std/diagnostics/assertions/cassert.pass.cpp
@@ -15,10 +15,6 @@
 #error assert not defined
 #endif
 
-#ifndef _LIBCPP_VERSION
-#error _LIBCPP_VERSION not defined
-#endif
-
 int main()
 {
 }
diff --git a/test/std/diagnostics/errno/cerrno.pass.cpp b/test/std/diagnostics/errno/cerrno.pass.cpp
index c6743fb79..72c9371d1 100644
--- a/test/std/diagnostics/errno/cerrno.pass.cpp
+++ b/test/std/diagnostics/errno/cerrno.pass.cpp
@@ -12,10 +12,6 @@
 
 #include <cerrno>
 
-#ifndef _LIBCPP_VERSION
-#error _LIBCPP_VERSION not defined
-#endif
-
 #ifndef E2BIG
 #error E2BIG not defined
 #endif