diff --git a/queries/php_only/highlights.scm b/queries/php_only/highlights.scm
index 557421d9f..0bba534d0 100644
--- a/queries/php_only/highlights.scm
+++ b/queries/php_only/highlights.scm
@@ -216,6 +216,7 @@
 
 (named_label_statement) @label
 
+
 ; Keywords
 [
   "and"
diff --git a/tests/query/highlights/php/keywords.php b/tests/query/highlights/php/keywords.php
new file mode 100644
index 000000000..e11a9f351
--- /dev/null
+++ b/tests/query/highlights/php/keywords.php
@@ -0,0 +1,173 @@
+<?php
+//^^^ @punctuation.bracket
+
+declare(strict_types=1);
+//^^^^^ @keyword
+//      ^^^^^^^^^^^^ @variable.parameter
+//                  ^ @operator
+//                   ^ @number
+//                     ^ @punctuation.delimiter
+
+include "file.php";
+//^^^^^ @keyword.import
+//      ^^^^^^^^^ @string
+include_once "file.php";
+//^^^^^^^^^^ @keyword.import
+require "file.php";
+//^^^^^ @keyword.import
+require_once "file.php";
+//^^^^^^^^^^ @keyword.import
+
+namespace A\B;
+//^^^^^^^ @keyword
+//        ^^^ @module
+
+if ($a and $b or $c xor $d) {} elseif ($b) {} else {}
+// <- @keyword.conditional
+//     ^^^ @keyword.operator
+//            ^^ @keyword.operator
+//                  ^^^ @keyword.operator
+//                             ^^^^^^ @keyword.conditional
+//                                            ^^^^ @keyword.conditional
+
+for ($i = 0; $i < 1; $i++) { continue; }
+// <- @keyword.repeat
+//              ^ @operator
+//                     ^^ @operator
+//                           ^^^^^^^^ @keyword.repeat
+
+while ($b) {}
+//^^^ @keyword.repeat
+
+do { } while ($c);
+// <- @keyword.repeat
+//     ^^^^^ @keyword.repeat
+
+foreach ($foos as $foo) {}
+//^^^^^ @keyword.repeat
+//             ^^ @keyword.operator
+
+try {} catch (Exception $e) {} finally {}
+//^ @keyword.exception
+//     ^^^^^ @keyword.exception
+//            ^^^^^^^^^ @type
+//                             ^^^^^^^ @keyword.exception
+
+function a() {}
+//^^^^^^ @keyword.function
+//       ^ @function
+
+abstract class A
+//^^^^^^ @keyword.modifier
+//       ^^^^^ @keyword
+//             ^ @type
+{
+  private const BAR = 1;
+//^^^^^^^ @keyword.modifier
+//        ^^^^^ @keyword.modifier
+  //            ^^^ @constant
+  protected readonly static $a;
+//^^^^^^^^^ @keyword.modifier
+//          ^^^^^^^^ @keyword.modifier
+//                   ^^^^^^ @keyword.modifier
+  //                        ^^ @property
+  final public $b;
+//^^^^^ @keyword.modifier
+  public static function foo(): static {}
+//^^^^^^ @keyword.modifier
+//       ^^^^^^ @keyword.modifier
+//              ^^^^^^^^ @keyword.function
+//                       ^^^ @function.method
+//                              ^^^^^^ @type.builtin
+  public function __construct() {}
+//                ^^^^^^^^^^^ @constructor
+}
+
+class B extends A implements T
+//    ^ @type
+//      ^^^^^^^ @keyword
+//              ^ @type
+//                ^^^^^^^^^^ @keyword
+//                           ^ @type
+{
+  use T, U {
+//^^^ @keyword.import
+//     ^ @punctuation.delimiter
+    U::small insteadof T;
+//  ^ @type
+//   ^^ @operator
+//     ^^^^^ @constant
+//           ^^^^^^^^^ @keyword
+//                     ^ @type
+  }
+  public function foo(callable $call): self
+//                    ^^^^^^^^ @type.builtin
+//                                     ^^^^ @type.builtin
+  {
+    $call instanceof Closure;
+//  ^^^^^ @variable
+//        ^^^^^^^^^^ @keyword
+//                   ^^^^^^^ @type
+    fn ($a, $b) => $a + $b;
+//  ^^ @keyword.function
+    static $a;
+//  ^^^^^^ @keyword.modifier
+    global $a;
+//  ^^^^^^ @keyword
+    clone $call;
+//  ^^^^^ @keyword
+    match ($a) {
+//  ^^^^^ @keyword.conditional
+      default => "other",
+//    ^^^^^^^ @keyword
+//            ^^ @operator
+    };
+
+    switch ($a) {
+//  ^^^^^^ @keyword.conditional
+      case 'value':
+//    ^^^^ @keyword.conditional
+        break;
+//      ^^^^^ @keyword
+      default:
+//    ^^^^^^^ @keyword
+    }
+    yield $a;
+//  ^^^^^ @keyword.return
+    yield from $a;
+//        ^^^^ @keyword.return
+    return $a;
+//  ^^^^^^ @keyword.return
+    goto a;
+//  ^^^^ @keyword
+    echo "a";
+//  ^^^^ @keyword
+    print "a";
+//  ^^^^^ @keyword
+    print("a");
+//  ^^^^^ @keyword
+    exit;
+//  ^^^^ @keyword
+    exit();
+//  ^^^^ @function.builtin
+    exit(1);
+//  ^^^^ @function.builtin
+  }
+}
+
+throw new Exception("oh");
+//^^^ @keyword.exception
+//    ^^^ @keyword
+//        ^^^^^^^^^ @constructor
+
+interface T {}
+//^^^^^^^ @keyword
+//        ^ @type
+
+trait T { public function small(): void {} }
+//^^^ @keyword
+//    ^ @type
+//                                 ^^^^ @type.builtin
+enum Foo { case Bar; }
+//^^ @keyword
+//         ^^^^  @keyword.conditional
diff --git a/tests/query/highlights/php/literals.php b/tests/query/highlights/php/literals.php
new file mode 100644
index 000000000..17b539362
--- /dev/null
+++ b/tests/query/highlights/php/literals.php
@@ -0,0 +1,26 @@
+<?php
+
+echo <<<OMG
+//   ^^^ @operator
+//      ^^^ @label
+              something
+OMG;
+//^ @label
+
+echo true, TRUE, false, FALSE;
+//   ^^^^ @boolean
+//         ^^^^ @boolean
+//               ^^^^^ @boolean
+//                      ^^^^^ @boolean
+
+echo PI_314;
+//   ^^^^^^ @constant
+
+echo __DIR__;
+//   ^^^^^^^ @constant.builtin
+
+echo null, 42, 42.524, "Testing\n";
+//   ^^^^ @constant.builtin
+//         ^^ @number
+//             ^^^^^^ @number.float
+//                             ^^ @string.escape
diff --git a/tests/query/highlights/php/types.php b/tests/query/highlights/php/types.php
new file mode 100644
index 000000000..7a3adb233
--- /dev/null
+++ b/tests/query/highlights/php/types.php
@@ -0,0 +1,23 @@
+<?php
+
+function b(int $a, string $b, Person $e): Foo\Dog {}
+//         ^^^ @type.builtin
+//             ^^ @variable
+//                 ^^^^^^ @type.builtin
+//                            ^^^^^^ @type
+//                                        ^^^ @module
+//                                            ^^^ @type
+
+function a(array $b) {
+//         ^^^^^ @type.builtin
+  echo (int) $foo;
+//      ^^^ @type.builtin
+}
+
+class A {
+  public function foo(self $a): self {}
+//                    ^^^^ @type.builtin
+//                              ^^^^ @type.builtin
+  private function baz(): static {}
+//                        ^^^^^^ @type.builtin
+}
diff --git a/tests/query/highlights/php/variables.php b/tests/query/highlights/php/variables.php
new file mode 100644
index 000000000..6a466357c
--- /dev/null
+++ b/tests/query/highlights/php/variables.php
@@ -0,0 +1,28 @@
+<?php
+
+class A {
+  public function foo(self $a): self {
+//                          ^ @variable
+    new self();
+//      ^^^^ @constructor
+    new static();
+//      ^^^^^^ @constructor
+    new parent();
+//      ^^^^^^ @constructor
+    $this->foo();
+//   ^^^^ @variable.builtin
+//       ^^ @operator
+//         ^^^ @function.method.call
+    self::foo();
+//  ^^^^ @variable.builtin
+//        ^^^ @function.call
+    static::foo();
+//  ^^^^^^ @variable.builtin
+    parent::foo();
+//  ^^^^^^ @variable.builtin
+    $this->foo;
+//         ^^^ @variable.member
+    $this->foo(a: 5);
+//             ^ @variable.parameter
+  }
+}