diff --git a/test/diagnostics/errno/cerrno.pass.cpp b/test/diagnostics/errno/cerrno.pass.cpp
deleted file mode 100644
index f66ab85d..00000000
--- a/test/diagnostics/errno/cerrno.pass.cpp
+++ /dev/null
@@ -1,341 +0,0 @@
-// -*- 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
-
-#ifndef E2BIG
-#error E2BIG not defined
-#endif
-
-#ifndef EACCES
-#error EACCES not defined
-#endif
-
-#ifndef EACCES
-#error EACCES not defined
-#endif
-
-#ifndef EADDRINUSE
-#error EADDRINUSE not defined
-#endif
-
-#ifndef EADDRNOTAVAIL
-#error EADDRNOTAVAIL not defined
-#endif
-
-#ifndef EAFNOSUPPORT
-#error EAFNOSUPPORT not defined
-#endif
-
-#ifndef EAGAIN
-#error EAGAIN not defined
-#endif
-
-#ifndef EALREADY
-#error EALREADY not defined
-#endif
-
-#ifndef EBADF
-#error EBADF not defined
-#endif
-
-#ifndef EBADMSG
-#error EBADMSG not defined
-#endif
-
-#ifndef EBUSY
-#error EBUSY not defined
-#endif
-
-#ifndef ECANCELED
-#error ECANCELED not defined
-#endif
-
-#ifndef ECHILD
-#error ECHILD not defined
-#endif
-
-#ifndef ECONNABORTED
-#error ECONNABORTED not defined
-#endif
-
-#ifndef ECONNREFUSED
-#error ECONNREFUSED not defined
-#endif
-
-#ifndef ECONNRESET
-#error ECONNRESET not defined
-#endif
-
-#ifndef EDEADLK
-#error EDEADLK not defined
-#endif
-
-#ifndef EDESTADDRREQ
-#error EDESTADDRREQ not defined
-#endif
-
-#ifndef EDOM
-#error EDOM not defined
-#endif
-
-#ifndef EEXIST
-#error EEXIST not defined
-#endif
-
-#ifndef EFAULT
-#error EFAULT not defined
-#endif
-
-#ifndef EFBIG
-#error EFBIG not defined
-#endif
-
-#ifndef EHOSTUNREACH
-#error EHOSTUNREACH not defined
-#endif
-
-#ifndef EIDRM
-#error EIDRM not defined
-#endif
-
-#ifndef EILSEQ
-#error EILSEQ not defined
-#endif
-
-#ifndef EINPROGRESS
-#error EINPROGRESS not defined
-#endif
-
-#ifndef EINTR
-#error EINTR not defined
-#endif
-
-#ifndef EINVAL
-#error EINVAL not defined
-#endif
-
-#ifndef EIO
-#error EIO not defined
-#endif
-
-#ifndef EISCONN
-#error EISCONN not defined
-#endif
-
-#ifndef EISDIR
-#error EISDIR not defined
-#endif
-
-#ifndef ELOOP
-#error ELOOP not defined
-#endif
-
-#ifndef EMFILE
-#error EMFILE not defined
-#endif
-
-#ifndef EMLINK
-#error EMLINK not defined
-#endif
-
-#ifndef EMSGSIZE
-#error EMSGSIZE not defined
-#endif
-
-#ifndef ENAMETOOLONG
-#error ENAMETOOLONG not defined
-#endif
-
-#ifndef ENETDOWN
-#error ENETDOWN not defined
-#endif
-
-#ifndef ENETRESET
-#error ENETRESET not defined
-#endif
-
-#ifndef ENETUNREACH
-#error ENETUNREACH not defined
-#endif
-
-#ifndef ENFILE
-#error ENFILE not defined
-#endif
-
-#ifndef ENOBUFS
-#error ENOBUFS not defined
-#endif
-
-#ifndef ENODATA
-#error ENODATA not defined
-#endif
-
-#ifndef ENODEV
-#error ENODEV not defined
-#endif
-
-#ifndef ENOENT
-#error ENOENT not defined
-#endif
-
-#ifndef ENOEXEC
-#error ENOEXEC not defined
-#endif
-
-#ifndef ENOLCK
-#error ENOLCK not defined
-#endif
-
-#ifndef ENOLINK
-#error ENOLINK not defined
-#endif
-
-#ifndef ENOMEM
-#error ENOMEM not defined
-#endif
-
-#ifndef ENOMSG
-#error ENOMSG not defined
-#endif
-
-#ifndef ENOPROTOOPT
-#error ENOPROTOOPT not defined
-#endif
-
-#ifndef ENOSPC
-#error ENOSPC not defined
-#endif
-
-#ifndef ENOSR
-#error ENOSR not defined
-#endif
-
-#ifndef ENOSTR
-#error ENOSTR not defined
-#endif
-
-#ifndef ENOSYS
-#error ENOSYS not defined
-#endif
-
-#ifndef ENOTCONN
-#error ENOTCONN not defined
-#endif
-
-#ifndef ENOTDIR
-#error ENOTDIR not defined
-#endif
-
-#ifndef ENOTEMPTY
-#error ENOTEMPTY not defined
-#endif
-
-#ifndef ENOTRECOVERABLE
-#error ENOTRECOVERABLE not defined
-#endif
-
-#ifndef ENOTSOCK
-#error ENOTSOCK not defined
-#endif
-
-#ifndef ENOTSUP
-#error ENOTSUP not defined
-#endif
-
-#ifndef ENOTTY
-#error ENOTTY not defined
-#endif
-
-#ifndef ENXIO
-#error ENXIO not defined
-#endif
-
-#ifndef EOPNOTSUPP
-#error EOPNOTSUPP not defined
-#endif
-
-#ifndef EOVERFLOW
-#error EOVERFLOW not defined
-#endif
-
-#ifndef EOWNERDEAD
-#error EOWNERDEAD not defined
-#endif
-
-#ifndef EPERM
-#error EPERM not defined
-#endif
-
-#ifndef EPIPE
-#error EPIPE not defined
-#endif
-
-#ifndef EPROTO
-#error EPROTO not defined
-#endif
-
-#ifndef EPROTONOSUPPORT
-#error EPROTONOSUPPORT not defined
-#endif
-
-#ifndef EPROTOTYPE
-#error EPROTOTYPE not defined
-#endif
-
-#ifndef ERANGE
-#error ERANGE not defined
-#endif
-
-#ifndef EROFS
-#error EROFS not defined
-#endif
-
-#ifndef ESPIPE
-#error ESPIPE not defined
-#endif
-
-#ifndef ESRCH
-#error ESRCH not defined
-#endif
-
-#ifndef ETIME
-#error ETIME not defined
-#endif
-
-#ifndef ETIMEDOUT
-#error ETIMEDOUT not defined
-#endif
-
-#ifndef ETXTBSY
-#error ETXTBSY not defined
-#endif
-
-#ifndef EWOULDBLOCK
-#error EWOULDBLOCK not defined
-#endif
-
-#ifndef EXDEV
-#error EXDEV not defined
-#endif
-
-#ifndef errno
-#error errno not defined
-#endif
-
-int main()
-{
-}
diff --git a/test/diagnostics/syserr/errc.pass.cpp b/test/diagnostics/syserr/errc.pass.cpp
deleted file mode 100644
index f9d1ec71..00000000
--- a/test/diagnostics/syserr/errc.pass.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     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.
-//
-//===----------------------------------------------------------------------===//
-
-// <system_error>
-
-// enum errc {...}
-
-#include <system_error>
-
-int main()
-{
-    static_assert(std::errc::address_family_not_supported == EAFNOSUPPORT, "");
-    static_assert(std::errc::address_in_use == EADDRINUSE, "");
-    static_assert(std::errc::address_not_available == EADDRNOTAVAIL, "");
-    static_assert(std::errc::already_connected == EISCONN, "");
-    static_assert(std::errc::argument_list_too_long == E2BIG, "");
-    static_assert(std::errc::argument_out_of_domain == EDOM, "");
-    static_assert(std::errc::bad_address == EFAULT, "");
-    static_assert(std::errc::bad_file_descriptor == EBADF, "");
-    static_assert(std::errc::bad_message == EBADMSG, "");
-    static_assert(std::errc::broken_pipe == EPIPE, "");
-    static_assert(std::errc::connection_aborted == ECONNABORTED, "");
-    static_assert(std::errc::connection_already_in_progress == EALREADY, "");
-    static_assert(std::errc::connection_refused == ECONNREFUSED, "");
-    static_assert(std::errc::connection_reset == ECONNRESET, "");
-    static_assert(std::errc::cross_device_link == EXDEV, "");
-    static_assert(std::errc::destination_address_required == EDESTADDRREQ, "");
-    static_assert(std::errc::device_or_resource_busy == EBUSY, "");
-    static_assert(std::errc::directory_not_empty == ENOTEMPTY, "");
-    static_assert(std::errc::executable_format_error == ENOEXEC, "");
-    static_assert(std::errc::file_exists == EEXIST, "");
-    static_assert(std::errc::file_too_large == EFBIG, "");
-    static_assert(std::errc::filename_too_long == ENAMETOOLONG, "");
-    static_assert(std::errc::function_not_supported == ENOSYS, "");
-    static_assert(std::errc::host_unreachable == EHOSTUNREACH, "");
-    static_assert(std::errc::identifier_removed == EIDRM, "");
-    static_assert(std::errc::illegal_byte_sequence == EILSEQ, "");
-    static_assert(std::errc::inappropriate_io_control_operation == ENOTTY, "");
-    static_assert(std::errc::interrupted == EINTR, "");
-    static_assert(std::errc::invalid_argument == EINVAL, "");
-    static_assert(std::errc::invalid_seek == ESPIPE, "");
-    static_assert(std::errc::io_error == EIO, "");
-    static_assert(std::errc::is_a_directory == EISDIR, "");
-    static_assert(std::errc::message_size == EMSGSIZE, "");
-    static_assert(std::errc::network_down == ENETDOWN, "");
-    static_assert(std::errc::network_reset == ENETRESET, "");
-    static_assert(std::errc::network_unreachable == ENETUNREACH, "");
-    static_assert(std::errc::no_buffer_space == ENOBUFS, "");
-    static_assert(std::errc::no_child_process == ECHILD, "");
-    static_assert(std::errc::no_link == ENOLINK, "");
-    static_assert(std::errc::no_lock_available == ENOLCK, "");
-    static_assert(std::errc::no_message_available == ENODATA, "");
-    static_assert(std::errc::no_message == ENOMSG, "");
-    static_assert(std::errc::no_protocol_option == ENOPROTOOPT, "");
-    static_assert(std::errc::no_space_on_device == ENOSPC, "");
-    static_assert(std::errc::no_stream_resources == ENOSR, "");
-    static_assert(std::errc::no_such_device_or_address == ENXIO, "");
-    static_assert(std::errc::no_such_device == ENODEV, "");
-    static_assert(std::errc::no_such_file_or_directory == ENOENT, "");
-    static_assert(std::errc::no_such_process == ESRCH, "");
-    static_assert(std::errc::not_a_directory == ENOTDIR, "");
-    static_assert(std::errc::not_a_socket == ENOTSOCK, "");
-    static_assert(std::errc::not_a_stream == ENOSTR, "");
-    static_assert(std::errc::not_connected == ENOTCONN, "");
-    static_assert(std::errc::not_enough_memory == ENOMEM, "");
-    static_assert(std::errc::not_supported == ENOTSUP, "");
-    static_assert(std::errc::operation_canceled == ECANCELED, "");
-    static_assert(std::errc::operation_in_progress == EINPROGRESS, "");
-    static_assert(std::errc::operation_not_permitted == EPERM, "");
-    static_assert(std::errc::operation_not_supported == EOPNOTSUPP, "");
-    static_assert(std::errc::operation_would_block == EWOULDBLOCK, "");
-    static_assert(std::errc::owner_dead == EOWNERDEAD, "");
-    static_assert(std::errc::permission_denied == EACCES, "");
-    static_assert(std::errc::protocol_error == EPROTO, "");
-    static_assert(std::errc::protocol_not_supported == EPROTONOSUPPORT, "");
-    static_assert(std::errc::read_only_file_system == EROFS, "");
-    static_assert(std::errc::resource_deadlock_would_occur == EDEADLK, "");
-    static_assert(std::errc::resource_unavailable_try_again == EAGAIN, "");
-    static_assert(std::errc::result_out_of_range == ERANGE, "");
-    static_assert(std::errc::state_not_recoverable == ENOTRECOVERABLE, "");
-    static_assert(std::errc::stream_timeout == ETIME, "");
-    static_assert(std::errc::text_file_busy == ETXTBSY, "");
-    static_assert(std::errc::timed_out == ETIMEDOUT, "");
-    static_assert(std::errc::too_many_files_open_in_system == ENFILE, "");
-    static_assert(std::errc::too_many_files_open == EMFILE, "");
-    static_assert(std::errc::too_many_links == EMLINK, "");
-    static_assert(std::errc::too_many_symbolic_link_levels == ELOOP, "");
-    static_assert(std::errc::value_too_large == EOVERFLOW, "");
-    static_assert(std::errc::wrong_protocol_type == EPROTOTYPE, "");
-}
diff --git a/test/diagnostics/syserr/syserr.errcode/syserr.errcode.nonmembers/make_error_code.pass.cpp b/test/diagnostics/syserr/syserr.errcode/syserr.errcode.nonmembers/make_error_code.pass.cpp
deleted file mode 100644
index fc4e0f2b..00000000
--- a/test/diagnostics/syserr/syserr.errcode/syserr.errcode.nonmembers/make_error_code.pass.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     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.
-//
-//===----------------------------------------------------------------------===//
-
-// <system_error>
-
-// class error_code
-
-// error_code make_error_code(errc e);
-
-#include <system_error>
-#include <cassert>
-
-int main()
-{
-    {
-        std::error_code ec = make_error_code(std::errc::operation_canceled);
-        assert(ec.value() == static_cast<int>(std::errc::operation_canceled));
-        assert(ec.category() == std::generic_category());
-    }
-}
diff --git a/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.nonmembers/make_error_condition.pass.cpp b/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.nonmembers/make_error_condition.pass.cpp
deleted file mode 100644
index acefc465..00000000
--- a/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.nonmembers/make_error_condition.pass.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     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.
-//
-//===----------------------------------------------------------------------===//
-
-// <system_error>
-
-// class error_condition
-
-// error_condition make_error_condition(errc e);
-
-#include <system_error>
-#include <cassert>
-
-int main()
-{
-    {
-        const std::error_condition ec1 = std::make_error_condition(std::errc::message_size);
-        assert(ec1.value() == static_cast<int>(std::errc::message_size));
-        assert(ec1.category() == std::generic_category());
-    }
-}