diff --git a/scripts/error_codes.py b/scripts/error_codes.py
index 23c1657a7..9b106d0c0 100755
--- a/scripts/error_codes.py
+++ b/scripts/error_codes.py
@@ -223,7 +223,7 @@ def examine_id_coverage(top_dir, source_id_to_file_names, new_ids_only=False):
         "1123", "1220", "1584", "1823",
         "1988", "2657", "2800", "3356",
         "3893", "3996", "4010", "4802",
-        "5073", "5272", "5622", "6272", "7128",
+        "5073", "5272", "5622", "7128",
         "7589", "7593", "7653", "8065", "8084", "8140",
         "8312", "8592", "9085", "9390"
     }
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_opcode_like.sol b/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_opcode_like.sol
index 3296252ea..e9d6f1983 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_opcode_like.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_opcode_like.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// ParserError 2314: (118-119): Expected '(' but got '}'
+// Warning 8261: (52-62): Variable is shadowed in inline assembly by an instruction of the same name
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_opcode_like.sol b/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_opcode_like.sol
index 7a783b9fe..51028e50c 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_opcode_like.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_opcode_like.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// ParserError 2314: (101-103): Expected '(' but got ':='
+// ParserError 6272: (101-103): Cannot assign to builtin function "mload".
diff --git a/test/libyul/yulSyntaxTests/builtin_identifier_3.yul b/test/libyul/yulSyntaxTests/builtin_identifier_3.yul
index 283d64b49..ece40e793 100644
--- a/test/libyul/yulSyntaxTests/builtin_identifier_3.yul
+++ b/test/libyul/yulSyntaxTests/builtin_identifier_3.yul
@@ -2,4 +2,4 @@
 	function f(x) { f(add) }
 }
 // ----
-// ParserError 2314: (24-25): Expected '(' but got ')'
+// DeclarationError 8198: (21-24): Identifier not found.
diff --git a/test/libyul/yulSyntaxTests/builtin_identifier_6.yul b/test/libyul/yulSyntaxTests/builtin_identifier_6.yul
index 8f3395d79..e261354fc 100644
--- a/test/libyul/yulSyntaxTests/builtin_identifier_6.yul
+++ b/test/libyul/yulSyntaxTests/builtin_identifier_6.yul
@@ -1,6 +1,5 @@
 {
-	// Test for the unreachable 6272_error
 	add := 1
 }
 // ----
-// ParserError 2314: (47-49): Expected '(' but got ':='
+// ParserError 6272: (7-9): Cannot assign to builtin function "add".
diff --git a/test/libyul/yulSyntaxTests/builtin_identifier_7.yul b/test/libyul/yulSyntaxTests/builtin_identifier_7.yul
index 391b190d9..c34da0363 100644
--- a/test/libyul/yulSyntaxTests/builtin_identifier_7.yul
+++ b/test/libyul/yulSyntaxTests/builtin_identifier_7.yul
@@ -1,7 +1,6 @@
 {
-	// Test for the unreachable 6272_error
 	function f() -> a, b {}
 	add, mul := f()
 }
 // ----
-// ParserError 2314: (71-72): Expected '(' but got ','
+// ParserError 6272: (31-32): Cannot assign to builtin function "add".
diff --git a/test/libyul/yulSyntaxTests/for_expr_invalid_5.yul b/test/libyul/yulSyntaxTests/for_expr_invalid_5.yul
index acf9be847..7f89fb3f4 100644
--- a/test/libyul/yulSyntaxTests/for_expr_invalid_5.yul
+++ b/test/libyul/yulSyntaxTests/for_expr_invalid_5.yul
@@ -2,4 +2,5 @@
 	for {} mload {} {}
 }
 // ----
-// ParserError 2314: (16-17): Expected '(' but got '{'
+// DeclarationError 8198: (10-15): Identifier not found.
+// TypeError 1733: (10-15): Expected a value of boolean type "bool" but got "u256"
diff --git a/test/libyul/yulSyntaxTests/functional_partial.yul b/test/libyul/yulSyntaxTests/functional_partial.yul
index f66225658..5f65cb13f 100644
--- a/test/libyul/yulSyntaxTests/functional_partial.yul
+++ b/test/libyul/yulSyntaxTests/functional_partial.yul
@@ -2,4 +2,4 @@
     let x := byte
 }
 // ----
-// ParserError 2314: (20-21): Expected '(' but got '}'
+// DeclarationError 8198: (15-19): Identifier not found.
diff --git a/test/libyul/yulSyntaxTests/if_statement_invalid_1.yul b/test/libyul/yulSyntaxTests/if_statement_invalid_1.yul
index 5f73fcf2a..8d40479cd 100644
--- a/test/libyul/yulSyntaxTests/if_statement_invalid_1.yul
+++ b/test/libyul/yulSyntaxTests/if_statement_invalid_1.yul
@@ -2,4 +2,5 @@
     if mload {}
 }
 // ----
-// ParserError 2314: (15-16): Expected '(' but got '{'
+// DeclarationError 8198: (9-14): Identifier not found.
+// TypeError 1733: (9-14): Expected a value of boolean type "bool" but got "u256"
diff --git a/test/libyul/yulSyntaxTests/if_statement_invalid_4.yul b/test/libyul/yulSyntaxTests/if_statement_invalid_4.yul
index ed9deeda6..546537203 100644
--- a/test/libyul/yulSyntaxTests/if_statement_invalid_4.yul
+++ b/test/libyul/yulSyntaxTests/if_statement_invalid_4.yul
@@ -2,4 +2,5 @@
     if calldatasize {}
 }
 // ----
-// ParserError 2314: (22-23): Expected '(' but got '{'
+// DeclarationError 8198: (9-21): Identifier not found.
+// TypeError 1733: (9-21): Expected a value of boolean type "bool" but got "u256"
diff --git a/test/libyul/yulSyntaxTests/switch_invalid_expr_2.yul b/test/libyul/yulSyntaxTests/switch_invalid_expr_2.yul
index 842fa02f3..905b9ed1f 100644
--- a/test/libyul/yulSyntaxTests/switch_invalid_expr_2.yul
+++ b/test/libyul/yulSyntaxTests/switch_invalid_expr_2.yul
@@ -4,4 +4,4 @@
     default {}
 }
 // ----
-// ParserError 2314: (23-27): Expected '(' but got reserved keyword 'case'
+// DeclarationError 8198: (13-18): Identifier not found.