diff --git a/libcxx/include/type_traits b/libcxx/include/type_traits
--- a/libcxx/include/type_traits
+++ b/libcxx/include/type_traits
@@ -758,7 +758,9 @@
 
 // is_array
 
-#if __has_keyword(__is_array)
+// TODO: Clang incorrectly reports that __is_array is true for T[0].
+//       Re-enable the branch once https://llvm.org/PR54705 is fixed.
+#if __has_keyword(__is_array) && 0
 
 template <class _Tp>
 struct _LIBCPP_TEMPLATE_VIS is_array : _BoolConstant<__is_array(_Tp)> { };
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/is_array.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/is_array.pass.cpp
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/is_array.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/is_array.pass.cpp
@@ -73,6 +73,7 @@
 int main(int, char**)
 {
     test_is_array<char[3]>();
+    test_is_not_array<char[0]>();
     test_is_array<char[]>();
     test_is_array<Union[]>();
 
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_bounded_array.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_bounded_array.pass.cpp
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_bounded_array.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_bounded_array.pass.cpp
@@ -32,9 +32,6 @@
     test_array_imp<const volatile T, B>();
 }
 
-typedef char array[3];
-typedef char incomplete_array[];
-
 class incomplete_type;
 
 class Empty {};
@@ -65,8 +62,9 @@
     test_array<FunctionPtr,    false>();
 
 //  Array types
-    test_array<array,             true>();
-    test_array<incomplete_array,  false>();
+    test_array<char[3],           true>();
+    test_array<int[0],            false>();
+    test_array<char[],            false>();
     test_array<incomplete_type[], false>();
 
   return 0;
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_unbounded_array.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_unbounded_array.pass.cpp
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_unbounded_array.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_unbounded_array.pass.cpp
@@ -32,9 +32,6 @@
     test_array_imp<const volatile T, B>();
 }
 
-typedef char array[3];
-typedef char incomplete_array[];
-
 class incomplete_type;
 
 class Empty {};
@@ -65,8 +62,9 @@
     test_array<FunctionPtr,    false>();
 
 //  Array types
-    test_array<array,             false>();
-    test_array<incomplete_array,  true>();
+    test_array<char[3],           false>();
+    test_array<int[0],            false>();
+    test_array<char[],            true>();
     test_array<incomplete_type[], true>();
 
   return 0;