diff --git a/tests/7.4/arrow-function.php.faces b/tests/7.4/arrow-function.php.faces
index 86adede0..98e9a62c 100644
--- a/tests/7.4/arrow-function.php.faces
+++ b/tests/7.4/arrow-function.php.faces
@@ -11,54 +11,78 @@
  ("\n\n")
  ("$" . php-variable-sigil)
  ("fn1" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("fn" . php-keyword)
  ("(")
  ("$" . php-variable-sigil)
  ("x" . php-variable-name)
- (") => ")
+ (") =")
+ (">" . php-comparison-op)
+ (" ")
  ("$" . php-variable-sigil)
  ("x" . php-variable-name)
- (" + ")
+ (" ")
+ ("+" . php-arithmetic-op)
+ (" ")
  ("$" . php-variable-sigil)
  ("y" . php-variable-name)
  (";\n\n")
  ("$" . php-variable-sigil)
  ("fn2" . php-variable-name)
- (" = [\n    ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" [\n    ")
  ("fn" . php-keyword)
  ("(")
  ("$" . php-variable-sigil)
  ("x" . php-variable-name)
- (") => ")
+ (") =")
+ (">" . php-comparison-op)
+ (" ")
  ("$" . php-variable-sigil)
  ("x" . php-variable-name)
- (" + ")
+ (" ")
+ ("+" . php-arithmetic-op)
+ (" ")
  ("$" . php-variable-sigil)
  ("y" . php-variable-name)
  ("\n];\n\n")
  ("$" . php-variable-sigil)
  ("z" . php-variable-name)
- (" = 1;\n")
+ (" ")
+ ("=" . php-assignment-op)
+ (" 1;\n")
  ("$" . php-variable-sigil)
  ("fn3" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("fn" . php-keyword)
  ("(")
  ("$" . php-variable-sigil)
  ("x" . php-variable-name)
- (") => ")
+ (") =")
+ (">" . php-comparison-op)
+ (" ")
  ("fn" . php-keyword)
  ("(")
  ("$" . php-variable-sigil)
  ("y" . php-variable-name)
- (") => ")
+ (") =")
+ (">" . php-comparison-op)
+ (" ")
  ("$" . php-variable-sigil)
  ("x" . php-variable-name)
- (" * ")
+ (" ")
+ ("*" . php-arithmetic-op)
+ (" ")
  ("$" . php-variable-sigil)
  ("y" . php-variable-name)
- (" + ")
+ (" ")
+ ("+" . php-arithmetic-op)
+ (" ")
  ("$" . php-variable-sigil)
  ("z" . php-variable-name)
  (";\n"))
diff --git a/tests/7.4/typed-property.php.faces b/tests/7.4/typed-property.php.faces
index ffa15b00..74dc9a1c 100644
--- a/tests/7.4/typed-property.php.faces
+++ b/tests/7.4/typed-property.php.faces
@@ -1,32 +1,24 @@
 ;; -*- mode: emacs-lisp -*-
 (("<?php" . php-php-tag)
- ("
-
-")
+ ("\n\n")
  ("class" . php-keyword)
  (" ")
  ("Typed" . font-lock-type-face)
- ("
-{
-    ")
+ ("\n{\n    ")
  ("private" . php-keyword)
  (" ")
  ("?string" . php-class)
  (" ")
  ("$" . php-variable-sigil)
  ("string" . php-variable-name)
- (";
-
-    ")
+ (";\n\n    ")
  ("private" . php-keyword)
  (" ")
  ("Hoge" . php-class)
  (" ")
  ("$" . php-variable-sigil)
  ("hoge" . php-variable-name)
- (";
-
-    ")
+ (";\n\n    ")
  ("public" . php-keyword)
  (" ")
  ("function" . php-keyword)
@@ -35,46 +27,38 @@
  ("(")
  ("$" . php-variable-sigil)
  ("var" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("null" . php-constant)
- (")
-    {
-        ")
+ (")\n    {\n        ")
  ("$" . php-$this-sigil)
  ("this" . php-$this)
  ("->" . php-object-op)
  ("string" . php-property-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("$" . php-variable-sigil)
  ("var" . php-variable-name)
- (";
-    }
-
-    ")
+ (";\n    }\n\n    ")
  ("public" . php-keyword)
  (" ")
  ("function" . php-keyword)
  (" ")
  ("print" . php-function-name)
- ("()
-    {
-        ")
+ ("()\n    {\n        ")
  ("var_dump" . php-function-call)
  ("(")
  ("$" . php-$this-sigil)
  ("this" . php-$this)
  ("->" . php-object-op)
  ("string" . php-property-name)
- (");
-    }
-}
-
-(")
+ (");\n    }\n}\n\n(")
  ("new" . php-keyword)
  (" ")
  ("Typed" . font-lock-type-face)
  (")")
  ("->" . php-object-op)
  ("print" . php-method-call)
- ("();
-"))
+ ("();\n"))
diff --git a/tests/arrays.php.faces b/tests/arrays.php.faces
index d16ab696..2ca52028 100644
--- a/tests/arrays.php.faces
+++ b/tests/arrays.php.faces
@@ -5,17 +5,23 @@
  ("Array should be treated like a normal keyword\n" . font-lock-comment-face)
  ("$" . php-variable-sigil)
  ("test" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("array" . php-keyword)
  ("();\n\n")
  ("$" . php-variable-sigil)
  ("test" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("function" . php-keyword)
  ("(")
  ("$" . php-variable-sigil)
  ("test" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("array" . php-keyword)
  ("()) {\n};\n\n")
  ("// " . font-lock-comment-delimiter-face)
@@ -28,7 +34,9 @@
  ("- return type, should look like `: int`\n" . font-lock-comment-face)
  ("$" . php-variable-sigil)
  ("test" . php-variable-name)
- (" = (")
+ (" ")
+ ("=" . php-assignment-op)
+ (" (")
  ("array" . font-lock-type-face)
  (")")
  ("$" . php-variable-sigil)
@@ -36,7 +44,9 @@
  (";\n\n")
  ("$" . php-variable-sigil)
  ("test" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("function" . php-keyword)
  ("(")
  ("array" . font-lock-type-face)
diff --git a/tests/comments.php.24.faces b/tests/comments.php.24.faces
index f98deb66..664ada05 100644
--- a/tests/comments.php.24.faces
+++ b/tests/comments.php.24.faces
@@ -73,7 +73,9 @@
  ("const" . php-keyword)
  (" ")
  ("SAMPLE" . php-constant-assign)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("'SAMPLE'" . php-string)
  (";\n    ")
  ("/** " . font-lock-doc-face)
@@ -109,7 +111,9 @@
  ("this" . php-$this)
  ("->" . php-object-op)
  ("name" . php-property-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("$" . php-variable-sigil)
  ("name" . php-variable-name)
  ("; ")
@@ -129,7 +133,9 @@
  ("\n        ")
  ("$" . php-variable-sigil)
  ("foo" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("hoge" . php-function-call)
  ("();\n\n        ")
  ("// " . font-lock-comment-delimiter-face)
@@ -146,7 +152,9 @@
  ("\n        ")
  ("$" . php-variable-sigil)
  ("offset" . php-variable-name)
- (" = 0;\n    }\n\n    ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" 0;\n    }\n\n    ")
  ("/**\n     * Summary\n     *\n     * " . font-lock-doc-face)
  ("@throws" php-doc-annotation-tag font-lock-doc-face)
  (" " . font-lock-doc-face)
diff --git a/tests/comments.php.27.faces b/tests/comments.php.27.faces
index 3c097d18..491c03a1 100644
--- a/tests/comments.php.27.faces
+++ b/tests/comments.php.27.faces
@@ -74,7 +74,9 @@
  ("const" . php-keyword)
  (" ")
  ("SAMPLE" . font-lock-type-face)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("'SAMPLE'" . php-string)
  (";\n    ")
  ("/** " . font-lock-doc-face)
@@ -110,7 +112,9 @@
  ("this" . php-$this)
  ("->" . php-object-op)
  ("name" . php-property-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("$" . php-variable-sigil)
  ("name" . php-variable-name)
  ("; ")
@@ -130,7 +134,9 @@
  ("\n        ")
  ("$" . php-variable-sigil)
  ("foo" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("hoge" . php-function-call)
  ("();\n\n        ")
  ("// " . font-lock-comment-delimiter-face)
@@ -147,7 +153,9 @@
  ("\n        ")
  ("$" . php-variable-sigil)
  ("offset" . php-variable-name)
- (" = 0;\n    }\n\n    ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" 0;\n    }\n\n    ")
  ("/**\n     * Summary\n     *\n     * " . font-lock-doc-face)
  ("@throws" php-doc-annotation-tag font-lock-doc-face)
  (" " . font-lock-doc-face)
diff --git a/tests/comments.php.faces b/tests/comments.php.faces
index 54efd31b..a4ffb5ab 100644
--- a/tests/comments.php.faces
+++ b/tests/comments.php.faces
@@ -73,7 +73,9 @@
  ("const" . php-keyword)
  (" ")
  ("SAMPLE" . font-lock-type-face)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("'SAMPLE'" . php-string)
  (";\n    ")
  ("/** " . font-lock-doc-face)
@@ -109,7 +111,9 @@
  ("this" . php-$this)
  ("->" . php-object-op)
  ("name" . php-property-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("$" . php-variable-sigil)
  ("name" . php-variable-name)
  ("; ")
@@ -129,7 +133,9 @@
  ("\n        ")
  ("$" . php-variable-sigil)
  ("foo" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("hoge" . php-function-call)
  ("();\n\n        ")
  ("// " . font-lock-comment-delimiter-face)
@@ -146,7 +152,9 @@
  ("\n        ")
  ("$" . php-variable-sigil)
  ("offset" . php-variable-name)
- (" = 0;\n    }\n\n    ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" 0;\n    }\n\n    ")
  ("/**\n     * Summary\n     *\n     * " . font-lock-doc-face)
  ("@throws" php-doc-annotation-tag font-lock-doc-face)
  (" " . font-lock-doc-face)
diff --git a/tests/constants.php.faces b/tests/constants.php.faces
index 4f4c921f..6a2801ce 100644
--- a/tests/constants.php.faces
+++ b/tests/constants.php.faces
@@ -4,15 +4,21 @@
  ("// " . font-lock-comment-delimiter-face)
  ("Test c-lang-defconst c-constant-kwds\n" . font-lock-comment-face)
  ("true" . php-constant)
- (" === ")
+ (" ")
+ ("===" . php-comparison-op)
+ (" ")
  ("TRUE" . php-constant)
  (";\n")
  ("false" . php-constant)
- (" === ")
+ (" ")
+ ("===" . php-comparison-op)
+ (" ")
  ("FALSE" . php-constant)
  (";\n")
  ("null" . php-constant)
- (" === ")
+ (" ")
+ ("===" . php-comparison-op)
+ (" ")
  ("NULL" . php-constant)
  (";\n\n")
  ("// " . font-lock-comment-delimiter-face)
diff --git a/tests/identifiers.php.faces b/tests/identifiers.php.faces
index 44106058..fbb56dfa 100644
--- a/tests/identifiers.php.faces
+++ b/tests/identifiers.php.faces
@@ -3,28 +3,36 @@
  ("\n\n")
  ("$" . php-variable-sigil)
  ("object" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("new" . php-keyword)
  (" ")
  ("UnqualifiedClassName" . font-lock-type-face)
  (";\n")
  ("$" . php-variable-sigil)
  ("object" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("new" . php-keyword)
  (" ")
  ("\\FullyQualifiedClassName" . font-lock-type-face)
  (";\n")
  ("$" . php-variable-sigil)
  ("object" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("new" . php-keyword)
  (" ")
  ("SpaceName\\NamespacedClassName" . font-lock-type-face)
  (";\n")
  ("$" . php-variable-sigil)
  ("object" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("new" . php-keyword)
  (" ")
  ("NOTACONSTANT\\ClassName" . font-lock-type-face)
diff --git a/tests/issue-439.php.faces b/tests/issue-439.php.faces
index 0bb3252c..ce24c9fb 100644
--- a/tests/issue-439.php.faces
+++ b/tests/issue-439.php.faces
@@ -7,37 +7,51 @@
  ("\n\n")
  ("$" . php-variable-sigil)
  ("a" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("<<<ABC\nLet'go Justin\nABC" . php-string)
  (";\n\n")
  ("$" . php-variable-sigil)
  ("b" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("<<<A_B_C\nLet'go Justin\nA_B_C" . php-string)
  (";\n\n")
  ("$" . php-variable-sigil)
  ("c" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("<<<'A_B_C'\nLet'go Justin\nA_B_C" . php-string)
  (";\n\n")
  ("$" . php-variable-sigil)
  ("d" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("<<<\"A_B_C\"\nLet'go Justin\nA_B_C" . php-string)
  (";\n\n")
  ("$" . php-variable-sigil)
  ("e" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("<<<いろは\nLet'go Justin\nいろは" . php-string)
  (";\n\n")
  ("$" . php-variable-sigil)
  ("f" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("<<<'いろは'\nLet'go Justin\nいろは" . php-string)
  (";\n\n")
  ("$" . php-variable-sigil)
  ("g" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("<<<\"いろは\"\nLet'go Justin\nいろは" . php-string)
  (";\n\n")
  ("var_dump" . php-function-call)
@@ -45,9 +59,10 @@
  ("<<<\"ABC\"\nLet'go Justin\nABC" . php-string)
  (");\n\n")
  ("if" . php-keyword)
- (" (1 === 1) {\n    ")
+ (" (1 ")
+ ("===" . php-comparison-op)
+ (" 1) {\n    ")
  ("var_dump" . php-function-call)
  ("(")
  ("<<<\"ABC\"\n    Let'go Justin\n    ABC" . php-string)
- (");\n}\n")
- )
+ (");\n}\n"))
diff --git a/tests/issue-443.php.27.faces b/tests/issue-443.php.27.faces
index 2ad0a4af..a14ca611 100644
--- a/tests/issue-443.php.27.faces
+++ b/tests/issue-443.php.27.faces
@@ -4,7 +4,8 @@
  ("declare" . php-keyword)
  ("(")
  ("strict_types" . php-keyword)
- ("=1); ")
+ ("=" . php-assignment-op)
+ ("1); ")
  ("?>" . php-php-tag)
  ("\n")
  ("/** GitHub Issue: " . font-lock-doc-face)
@@ -12,11 +13,12 @@
  (" */" . font-lock-doc-face)
  ("\n")
  ("<?xml" . php-php-tag)
- (" version=")
+ (" version")
+ ("=" . php-assignment-op)
  ("\"1.0\"" . php-string)
  (" ")
  ("encoding" . php-keyword)
- ("=")
+ ("=" . php-assignment-op)
  ("\"UTF-8\"" . php-string)
  ("?>" . php-php-tag)
  ("\n")
@@ -51,7 +53,9 @@
  ("?>" . php-php-tag)
  ("\n")
  ("<?=" . php-php-tag)
- (" 1 + 1 ")
+ (" 1 ")
+ ("+" . php-arithmetic-op)
+ (" 1 ")
  ("?>" . php-php-tag)
  ("\n")
  ("<?php" . php-php-tag)
diff --git a/tests/issue-443.php.faces b/tests/issue-443.php.faces
index 0624cc2c..739370ab 100644
--- a/tests/issue-443.php.faces
+++ b/tests/issue-443.php.faces
@@ -4,7 +4,8 @@
  ("declare" . php-keyword)
  ("(")
  ("strict_types" . php-keyword)
- ("=1); ")
+ ("=" . php-assignment-op)
+ ("1); ")
  ("?>" . php-php-tag)
  ("\n")
  ("/** GitHub Issue: " . font-lock-doc-face)
@@ -12,11 +13,12 @@
  (" */" . font-lock-doc-face)
  ("\n")
  ("<?xml" . php-php-tag)
- (" version=")
+ (" version")
+ ("=" . php-assignment-op)
  ("\"1.0\"" . php-string)
  (" ")
  ("encoding" . php-keyword)
- ("=")
+ ("=" . php-assignment-op)
  ("\"UTF-8\"" . php-string)
  ("?>" . php-php-tag)
  ("\n")
@@ -51,7 +53,9 @@
  ("?>" . php-php-tag)
  ("\n")
  ("<?=" . php-php-tag)
- (" 1 + 1 ")
+ (" 1 ")
+ ("+" . php-arithmetic-op)
+ (" 1 ")
  ("?>" . php-php-tag)
  ("\n")
  ("<?php" . php-php-tag)
diff --git a/tests/lang/function/calls.php.faces b/tests/lang/function/calls.php.faces
index 8cac4259..19d681c5 100644
--- a/tests/lang/function/calls.php.faces
+++ b/tests/lang/function/calls.php.faces
@@ -7,7 +7,8 @@
  ("(")
  ("$" . php-variable-sigil)
  ("foo" . php-variable-name)
- (")) {\n    1+")
+ (")) {\n    1")
+ ("+" . php-arithmetic-op)
  ("bar" . php-function-call)
  ("()+")
  ("foo" . php-function-call)
@@ -29,42 +30,58 @@
  ("();\n")
  ("$" . php-variable-sigil)
  ("a" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("a" . php-function-call)
  ("();\n")
  ("$" . php-variable-sigil)
  ("aaa" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("aaa" . php-function-call)
  ("();\n")
  ("$" . php-variable-sigil)
  ("_aa" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("_aa" . php-function-call)
  ("();\n")
  ("$" . php-variable-sigil)
  ("a_a" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("a_a" . php-function-call)
  ("();\n")
  ("$" . php-variable-sigil)
  ("aa_" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("aa_" . php-function-call)
  ("();\n")
  ("$" . php-variable-sigil)
  ("a1c" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("a1c" . php-function-call)
  ("();\n")
  ("$" . php-variable-sigil)
  ("あ" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("あ" . php-function-call)
  ("();\n")
  ("$" . php-variable-sigil)
  ("_a" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("$" . php-variable-sigil)
  ("a" . php-variable-name)
  ("();\n"))
diff --git a/tests/lang/types/cast.php.faces b/tests/lang/types/cast.php.faces
index c87ef0be..d86373d3 100644
--- a/tests/lang/types/cast.php.faces
+++ b/tests/lang/types/cast.php.faces
@@ -3,7 +3,9 @@
  ("\n\n")
  ("$" . php-variable-sigil)
  ("var" . php-variable-name)
- (" = 1;\n\n(")
+ (" ")
+ ("=" . php-assignment-op)
+ (" 1;\n\n(")
  ("array" . font-lock-type-face)
  (")")
  ("$" . php-variable-sigil)