diff --git a/aidl_unittest.cpp b/aidl_unittest.cpp
index 2ee75df..36d82c9 100644
--- a/aidl_unittest.cpp
+++ b/aidl_unittest.cpp
@@ -4323,7 +4323,7 @@
                                " -Weverything -o out -h out p/Foo.aidl");
   CaptureStderr();
   EXPECT_EQ(0, aidl::compile_aidl(options, io_delegate_));
-  EXPECT_EQ("WARNING: p/Foo.aidl:1.1-10: Interface names should start with I.\n",
+  EXPECT_EQ("WARNING: p/Foo.aidl:1.1-10: Interface names should start with I.[-Winterface-name]\n",
             GetCapturedStderr());
 }
 
@@ -4333,17 +4333,7 @@
                                " -Weverything -Werror -o out -h out p/Foo.aidl");
   CaptureStderr();
   EXPECT_EQ(1, aidl::compile_aidl(options, io_delegate_));
-  EXPECT_EQ("ERROR: p/Foo.aidl:1.1-10: Interface names should start with I.\n",
-            GetCapturedStderr());
-}
-
-TEST_P(AidlTest, ErrorEnumZero) {
-  io_delegate_.SetFileContents("p/Foo.aidl", "enum Foo { FOO = 1 }");
-  auto options = Options::From("aidl --lang " + Options::LanguageToString(GetLanguage()) +
-                               " -Weverything -Werror -o out -h out p/Foo.aidl");
-  CaptureStderr();
-  EXPECT_EQ(1, aidl::compile_aidl(options, io_delegate_));
-  EXPECT_EQ("ERROR: p/Foo.aidl:1.11-15: The first enumerator 'FOO' should be 0, but it is 1.\n",
+  EXPECT_EQ("ERROR: p/Foo.aidl:1.1-10: Interface names should start with I.[-Winterface-name]\n",
             GetCapturedStderr());
 }