diff --git a/libcxx/test/std/depr/depr.c.headers/stdlib_h.aligned_alloc.compile.pass.cpp b/libcxx/test/std/depr/depr.c.headers/stdlib_h.aligned_alloc.compile.pass.cpp
new file mode 100644
--- /dev/null
+++ b/libcxx/test/std/depr/depr.c.headers/stdlib_h.aligned_alloc.compile.pass.cpp
@@ -0,0 +1,24 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// test <stdlib.h>
+// ::aligned_alloc
+
+// UNSUPPORTED: c++03, c++11, c++14
+
+// ::aligned_alloc is provided by the C library, but it's marked as unavailable
+// until macOS 10.15
+// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}}
+
+// ::aligned_alloc is not implemented on Windows
+// XFAIL: target={{.+}}-pc-windows-{{.+}}
+
+#include <stdlib.h>
+#include <type_traits>
+
+static_assert(std::is_same<decltype(aligned_alloc(1, 0)), void*>::value, "");
diff --git a/libcxx/test/std/depr/depr.c.headers/stdlib_h.pass.cpp b/libcxx/test/std/depr/depr.c.headers/stdlib_h.pass.cpp
--- a/libcxx/test/std/depr/depr.c.headers/stdlib_h.pass.cpp
+++ b/libcxx/test/std/depr/depr.c.headers/stdlib_h.pass.cpp
@@ -8,13 +8,6 @@
 
 // test <stdlib.h>
 
-// ::aligned_alloc is provided by the C library, but it's marked as unavailable
-// until macOS 10.15
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}}
-
-// ::aligned_alloc is not implemented on Windows
-// XFAIL: target={{.+}}-pc-windows-{{.+}}
-
 #include <stdlib.h>
 #include <type_traits>
 #include <cassert>
@@ -139,9 +132,7 @@
     static_assert((std::is_same<decltype(rand()), int>::value), "");
     static_assert((std::is_same<decltype(srand(0)), void>::value), "");
 
-#if TEST_STD_VER > 14
-    static_assert((std::is_same<decltype(aligned_alloc(1, 0)), void*>::value), "");
-#endif
+    // aligned_alloc tested in stdlib_h.aligned_alloc.compile.pass.cpp
 
     void* pv = 0;
     void (*handler)() = 0;
diff --git a/libcxx/test/std/language.support/support.runtime/cstdlib.aligned_alloc.compile.pass.cpp b/libcxx/test/std/language.support/support.runtime/cstdlib.aligned_alloc.compile.pass.cpp
new file mode 100644
--- /dev/null
+++ b/libcxx/test/std/language.support/support.runtime/cstdlib.aligned_alloc.compile.pass.cpp
@@ -0,0 +1,24 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// test <cstdlib>
+// std::aligned_alloc
+
+// UNSUPPORTED: c++03, c++11, c++14
+
+// ::aligned_alloc is provided by the C library, but it's marked as unavailable
+// until macOS 10.15
+// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}}
+
+// ::aligned_alloc is not implemented on Windows
+// XFAIL: target={{.+}}-pc-windows-{{.+}}
+
+#include <cstdlib>
+#include <type_traits>
+
+static_assert(std::is_same<decltype(std::aligned_alloc(1, 0)), void*>::value, "");
diff --git a/libcxx/test/std/language.support/support.runtime/cstdlib.pass.cpp b/libcxx/test/std/language.support/support.runtime/cstdlib.pass.cpp
--- a/libcxx/test/std/language.support/support.runtime/cstdlib.pass.cpp
+++ b/libcxx/test/std/language.support/support.runtime/cstdlib.pass.cpp
@@ -8,13 +8,6 @@
 
 // test <cstdlib>
 
-// ::aligned_alloc is provided by the C library, but it's marked as unavailable
-// until macOS 10.15
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}}
-
-// ::aligned_alloc is not implemented on Windows
-// XFAIL: target={{.+}}-pc-windows-{{.+}}
-
 #include <cstdlib>
 #include <type_traits>
 #include <cassert>
@@ -126,9 +119,7 @@
     static_assert((std::is_same<decltype(std::rand()), int>::value), "");
     static_assert((std::is_same<decltype(std::srand(0)), void>::value), "");
 
-#if TEST_STD_VER > 14
-    static_assert((std::is_same<decltype(std::aligned_alloc(1, 0)), void*>::value), "");
-#endif
+    // std::aligned_alloc tested in cstdlib.aligned_alloc.compile.pass.cpp
 
     void* pv = 0;
     void (*handler)() = 0;
diff --git a/libcxx/test/std/language.support/support.runtime/ctime.pass.cpp b/libcxx/test/std/language.support/support.runtime/ctime.pass.cpp
--- a/libcxx/test/std/language.support/support.runtime/ctime.pass.cpp
+++ b/libcxx/test/std/language.support/support.runtime/ctime.pass.cpp
@@ -8,10 +8,6 @@
 
 // test <ctime>
 
-// ::timespec_get is provided by the C library, but it's marked as
-// unavailable until macOS 10.15
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}}
-
 #include <ctime>
 #include <type_traits>
 #include "test_macros.h"
@@ -36,10 +32,7 @@
     std::size_t s = 0;
     std::time_t t = 0;
     std::tm tm = {};
-#if TEST_STD_VER > 14
-    std::timespec tmspec = {};
-    ((void)tmspec); // Prevent unused warning
-#endif
+    // std::timespec and std::timespec_get tested in ctime.timespec.compile.pass.cpp
     ((void)c); // Prevent unused warning
     ((void)s); // Prevent unused warning
     ((void)t); // Prevent unused warning
@@ -48,9 +41,6 @@
     static_assert((std::is_same<decltype(std::difftime(t,t)), double>::value), "");
     static_assert((std::is_same<decltype(std::mktime(&tm)), std::time_t>::value), "");
     static_assert((std::is_same<decltype(std::time(&t)), std::time_t>::value), "");
-#if TEST_STD_VER > 14
-    static_assert((std::is_same<decltype(std::timespec_get(&tmspec, 0)), int>::value), "");
-#endif
 #ifndef _LIBCPP_HAS_NO_THREAD_UNSAFE_C_FUNCTIONS
     static_assert((std::is_same<decltype(std::asctime(&tm)), char*>::value), "");
     static_assert((std::is_same<decltype(std::ctime(&t)), char*>::value), "");
diff --git a/libcxx/test/std/language.support/support.runtime/ctime.timespec.compile.pass.cpp b/libcxx/test/std/language.support/support.runtime/ctime.timespec.compile.pass.cpp
new file mode 100644
--- /dev/null
+++ b/libcxx/test/std/language.support/support.runtime/ctime.timespec.compile.pass.cpp
@@ -0,0 +1,22 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// test <ctime>
+// std::timespec and std::timespec_get
+
+// UNSUPPORTED: c++03, c++11, c++14
+
+// ::timespec_get is provided by the C library, but it's marked as
+// unavailable until macOS 10.15
+// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}}
+
+#include <ctime>
+#include <type_traits>
+
+std::timespec tmspec = {};
+static_assert(std::is_same<decltype(std::timespec_get(&tmspec, 0)), int>::value, "");
diff --git a/libcxx/test/std/utilities/time/date.time/ctime.pass.cpp b/libcxx/test/std/utilities/time/date.time/ctime.pass.cpp
deleted file mode 100644
--- a/libcxx/test/std/utilities/time/date.time/ctime.pass.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// test <ctime>
-
-// ::timespec_get is provided by the C library, but it's marked as
-// unavailable until macOS 10.15
-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}}
-
-#include <ctime>
-#include <type_traits>
-
-#include "test_macros.h"
-
-#ifndef NULL
-#error NULL not defined
-#endif
-
-#ifndef CLOCKS_PER_SEC
-#error CLOCKS_PER_SEC not defined
-#endif
-
-#if TEST_STD_VER > 14
-#ifndef TIME_UTC
-#error TIME_UTC not defined
-#endif
-#endif
-
-#if defined(__GNUC__)
-#pragma GCC diagnostic ignored "-Wformat-zero-length"
-#endif
-
-int main(int, char**)
-{
-    std::clock_t c = 0;
-    std::size_t s = 0;
-    std::time_t t = 0;
-    std::tm tm = {};
-    char str[3];
-    ((void)c); // Prevent unused warning
-    ((void)s); // Prevent unused warning
-    ((void)t); // Prevent unused warning
-    ((void)tm); // Prevent unused warning
-    ((void)str); // Prevent unused warning
-#if TEST_STD_VER > 14
-    std::timespec tmspec = {};
-    ((void)tmspec); // Prevent unused warning
-#endif
-
-    static_assert((std::is_same<decltype(std::clock()), std::clock_t>::value), "");
-    static_assert((std::is_same<decltype(std::difftime(t,t)), double>::value), "");
-    static_assert((std::is_same<decltype(std::mktime(&tm)), std::time_t>::value), "");
-    static_assert((std::is_same<decltype(std::time(&t)), std::time_t>::value), "");
-#if TEST_STD_VER > 14
-    static_assert((std::is_same<decltype(std::timespec_get(&tmspec, 0)), int>::value), "");
-#endif
-#ifndef _LIBCPP_HAS_NO_THREAD_UNSAFE_C_FUNCTIONS
-    static_assert((std::is_same<decltype(std::asctime(&tm)), char*>::value), "");
-    static_assert((std::is_same<decltype(std::ctime(&t)), char*>::value), "");
-    static_assert((std::is_same<decltype(std::gmtime(&t)), std::tm*>::value), "");
-    static_assert((std::is_same<decltype(std::localtime(&t)), std::tm*>::value), "");
-#endif
-    static_assert((std::is_same<decltype(std::strftime(str,s,"",&tm)), std::size_t>::value), "");
-
-  return 0;
-}