diff --git a/src/libs/3rdparty/cplusplus/Parser.cpp b/src/libs/3rdparty/cplusplus/Parser.cpp
index 6fccebb0155..901f5ac2c1f 100644
--- a/src/libs/3rdparty/cplusplus/Parser.cpp
+++ b/src/libs/3rdparty/cplusplus/Parser.cpp
@@ -1789,6 +1789,11 @@ bool Parser::parseEnumSpecifier(SpecifierListAST *&node)
         if (_languageFeatures.cxx11Enabled && (LA() == T_CLASS || LA() == T_STRUCT))
             ast->key_token = consumeToken();
 
+
+        if (tok().isKeyword()) {
+            error(cursor(), "expected identifier before '%s'", tok().spell());
+            return false;
+        }
         parseName(ast->name);
 
         if (_languageFeatures.cxx11Enabled && LA() == T_COLON) {
diff --git a/tests/auto/cplusplus/ast/tst_ast.cpp b/tests/auto/cplusplus/ast/tst_ast.cpp
index a2219e7cfc6..aa42b2b3ec2 100644
--- a/tests/auto/cplusplus/ast/tst_ast.cpp
+++ b/tests/auto/cplusplus/ast/tst_ast.cpp
@@ -208,6 +208,8 @@ private slots:
     void expensiveExpression();
     void invalidCode_data();
     void invalidCode();
+    void enumDeclaration();
+    void invalidEnumClassDeclaration();
 };
 
 void tst_AST::gcc_attributes_1()
@@ -1982,6 +1984,28 @@ void tst_AST::invalidCode()
     QVERIFY(diag.errorCount != 0);
 }
 
+void tst_AST::enumDeclaration()
+{
+    QSharedPointer<TranslationUnit> unit(parseStatement(
+         //Unnamed
+         "enum { ENUMERATOR0 };\n"
+         "enum Enum { ENUMERATOR1 };\n"
+         "enum EnumWithBase : int { ENUMERATOR2 };\n"
+         "enum enum : int { ENUMERATOR2a };\n"
+         "enum class EnumClass { ENUMERATOR3 = 10 };\n", true));
+
+    QVERIFY(unit->ast());
+    QCOMPARE(diag.errorCount, 0);
+}
+
+void tst_AST::invalidEnumClassDeclaration()
+{
+    QSharedPointer<TranslationUnit> unit(parseStatement(
+        "enum class operator A { };", true));
+
+    QVERIFY(diag.errorCount != 0);
+}
+
 void tst_AST::initTestCase()
 {
     control.setDiagnosticClient(&diag);