diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp
--- a/clang/unittests/Format/FormatTest.cpp
+++ b/clang/unittests/Format/FormatTest.cpp
@@ -1358,23 +1358,21 @@
 
   Style.AllowShortEnumsOnASingleLine = true;
   Style.BraceWrapping.AfterEnum = true;
-  verifyFormat("enum { A, B, C } Test1, AfterEnum2;", Style);
+  verifyFormat("enum { A, B, C } Test1;", Style);
   verifyFormat("enum\n"
                "{\n"
                "  A,\n"
                "  B, // foo\n"
                "  C\n"
-               "} Test2,\n"
-               "    AfterEnum2;",
+               "} Test2;",
                Style);
   Style.BraceWrapping.AfterEnum = false;
-  verifyFormat("enum { A, B, C } Test3, AfterEnum2;", Style);
+  verifyFormat("enum { A, B, C } Test3;", Style);
   verifyFormat("enum {\n"
                "  A,\n"
                "  B, // foo\n"
                "  C\n"
-               "} Test4,\n"
-               "    AfterEnum2;",
+               "} Test4;",
                Style);
 
   Style.AllowShortEnumsOnASingleLine = false;
@@ -1384,14 +1382,14 @@
                "  A,\n"
                "  B,\n"
                "  C\n"
-               "} Test5, AfterEnum2;",
+               "} Test5;",
                Style);
   Style.BraceWrapping.AfterEnum = false;
   verifyFormat("enum {\n"
                "  A,\n"
                "  B,\n"
                "  C\n"
-               "} Test6, AfterEnum2;",
+               "} Test6;",
                Style);
 }