diff --git a/src/resolver/entry_point_validation_test.cc b/src/resolver/entry_point_validation_test.cc
index 6d9f3425b3..0a5184d02d 100644
--- a/src/resolver/entry_point_validation_test.cc
+++ b/src/resolver/entry_point_validation_test.cc
@@ -500,7 +500,9 @@ TEST_F(ResolverEntryPointValidationTest, Parameter_Struct_DuplicateLocation) {
 12:34 note: while analysing entry point main)");
 }
 
-TEST_F(ResolverEntryPointValidationTest, VertexShaderMustReturnPosition) {
+// TODO(bclayton): Reenable after CTS is updated
+TEST_F(ResolverEntryPointValidationTest,
+       DISABLED_VertexShaderMustReturnPosition) {
   // [[stage(vertex)]]
   // fn main() {}
   Func(Source{{12, 34}}, "main", {}, ty.void_(), {},
diff --git a/src/resolver/resolver.cc b/src/resolver/resolver.cc
index 6532144172..a96c6b7de9 100644
--- a/src/resolver/resolver.cc
+++ b/src/resolver/resolver.cc
@@ -811,7 +811,8 @@ bool Resolver::ValidateEntryPoint(const ast::Function* func,
         }
       }
     }
-    if (!found) {
+    // TODO(bclayton): Reenable after CTS is updated
+    if (((false)) && !found) {
       diagnostics_.add_error(
           "a vertex shader must include the 'position' builtin in its return "
           "type",