diff --git a/src/Tokenizers/PHP.php b/src/Tokenizers/PHP.php
index 2c460889fd..89749c6ecb 100644
--- a/src/Tokenizers/PHP.php
+++ b/src/Tokenizers/PHP.php
@@ -608,8 +608,11 @@ protected function tokenize($string)
             ) {
                 $preserveKeyword = false;
 
-                // `new class` should be preserved
-                if ($token[0] === T_CLASS && $finalTokens[$lastNotEmptyToken]['code'] === T_NEW) {
+                // `new class`, and `new static` should be preserved.
+                if ($finalTokens[$lastNotEmptyToken]['code'] === T_NEW
+                    && ($token[0] === T_CLASS
+                    || $token[0] === T_STATIC)
+                ) {
                     $preserveKeyword = true;
                 }
 
@@ -1968,16 +1971,24 @@ function return types. We want to keep the parenthesis map clean,
                     && $token[0] === T_STRING
                     && isset($this->tstringContexts[$finalTokens[$lastNotEmptyToken]['code']]) === true
                 ) {
-                    // Special case for syntax like: return new self
-                    // where self should not be a string.
+                    // Special case for syntax like: return new self/new parent
+                    // where self/parent should not be a string.
+                    $tokenContentLower = strtolower($token[1]);
                     if ($finalTokens[$lastNotEmptyToken]['code'] === T_NEW
-                        && strtolower($token[1]) === 'self'
+                        && ($tokenContentLower === 'self' || $tokenContentLower === 'parent')
                     ) {
                         $finalTokens[$newStackPtr] = [
                             'content' => $token[1],
-                            'code'    => T_SELF,
-                            'type'    => 'T_SELF',
                         ];
+                        if ($tokenContentLower === 'self') {
+                            $finalTokens[$newStackPtr]['code'] = T_SELF;
+                            $finalTokens[$newStackPtr]['type'] = 'T_SELF';
+                        }
+
+                        if ($tokenContentLower === 'parent') {
+                            $finalTokens[$newStackPtr]['code'] = T_PARENT;
+                            $finalTokens[$newStackPtr]['type'] = 'T_PARENT';
+                        }
                     } else {
                         $finalTokens[$newStackPtr] = [
                             'content' => $token[1],
diff --git a/tests/Core/Tokenizer/ContextSensitiveKeywordsTest.inc b/tests/Core/Tokenizer/ContextSensitiveKeywordsTest.inc
index eb1ca72058..0b073fcadf 100644
--- a/tests/Core/Tokenizer/ContextSensitiveKeywordsTest.inc
+++ b/tests/Core/Tokenizer/ContextSensitiveKeywordsTest.inc
@@ -1,210 +1,214 @@
-<?php
-
-/* testNamespaceIsKeyword */
-namespace SomeNamespace;
-
-class ContextSensitiveKeywords
-{
-    const /* testAbstract */ ABSTRACT = 'ABSTRACT';
-    const /* testArray */ ARRAY = 'ARRAY';
-    const /* testAs */ AS = 'AS';
-    const /* testBreak */ BREAK = 'BREAK';
-    const /* testCallable */ CALLABLE = 'CALLABLE';
-    const /* testCase */ CASE = 'CASE';
-    const /* testCatch */ CATCH = 'CATCH';
-    const /* testClass */ CLASS = 'CLASS';
-    const /* testClone */ CLONE = 'CLONE';
-    const /* testConst */ CONST = 'CONST';
-    const /* testContinue */ CONTINUE = 'CONTINUE';
-    const /* testDeclare */ DECLARE = 'DECLARE';
-    const /* testDefault */ DEFAULT = 'DEFAULT';
-    const /* testDo */ DO = 'DO';
-    const /* testEcho */ ECHO = 'ECHO';
-    const /* testElse */ ELSE = 'ELSE';
-    const /* testElseIf */ ELSEIF = 'ELSEIF';
-    const /* testEndDeclare */ ENDDECLARE = 'ENDDECLARE';
-    const /* testEndFor */ ENDFOR = 'ENDFOR';
-    const /* testEndForeach */ ENDFOREACH = 'ENDFOREACH';
-    const /* testEndIf */ ENDIF = 'ENDIF';
-    const /* testEndSwitch */ ENDSWITCH = 'ENDSWITCH';
-    const /* testEndWhile */ ENDWHILE = 'ENDWHILE';
-    const /* testEnum */ ENUM = 'ENUM';
-    const /* testExit */ EXIT = 'EXIT';
-    const /* testExtends */ EXTENDS = 'EXTENDS';
-    const /* testFinal */ FINAL = 'FINAL';
-    const /* testFinally */ FINALLY = 'FINALLY';
-    const /* testFn */ FN = 'FN';
-    const /* testFor */ FOR = 'FOR';
-    const /* testForeach */ FOREACH = 'FOREACH';
-    const /* testFunction */ FUNCTION = 'FUNCTION';
-    const /* testGlobal */ GLOBAL = 'GLOBAL';
-    const /* testGoto */ GOTO = 'GOTO';
-    const /* testIf */ IF = 'IF';
-    const /* testImplements */ IMPLEMENTS = 'IMPLEMENTS';
-    const /* testInclude */ INCLUDE = 'INCLUDE';
-    const /* testIncludeOnce */ INCLUDE_ONCE = 'INCLUDE_ONCE';
-    const /* testInstanceOf */ INSTANCEOF = 'INSTANCEOF';
-    const /* testInsteadOf */ INSTEADOF = 'INSTEADOF';
-    const /* testInterface */ INTERFACE = 'INTERFACE';
-    const /* testList */ LIST = 'LIST';
-    const /* testMatch */ MATCH = 'MATCH';
-    const /* testNamespace */ NAMESPACE = 'NAMESPACE';
-    const /* testNew */ NEW = 'NEW';
-    const /* testParent */ PARENT = 'PARENT';
-    const /* testPrint */ PRINT = 'PRINT';
-    const /* testPrivate */ PRIVATE = 'PRIVATE';
-    const /* testProtected */ PROTECTED = 'PROTECTED';
-    const /* testPublic */ PUBLIC = 'PUBLIC';
-    const /* testReadonly */ READONLY = 'READONLY';
-    const /* testRequire */ REQUIRE = 'REQUIRE';
-    const /* testRequireOnce */ REQUIRE_ONCE = 'REQUIRE_ONCE';
-    const /* testReturn */ RETURN = 'RETURN';
-    const /* testSelf */ SELF = 'SELF';
-    const /* testStatic */ STATIC = 'STATIC';
-    const /* testSwitch */ SWITCH = 'SWITCH';
-    const /* testThrows */ THROW = 'THROW';
-    const /* testTrait */ TRAIT = 'TRAIT';
-    const /* testTry */ TRY = 'TRY';
-    const /* testUse */ USE = 'USE';
-    const /* testVar */ VAR = 'VAR';
-    const /* testWhile */ WHILE = 'WHILE';
-    const /* testYield */ YIELD = 'YIELD';
-    const /* testYieldFrom */ YIELD_FROM = 'YIELD_FROM';
-
-    const /* testAnd */ AND = 'LOGICAL_AND';
-    const /* testOr */ OR = 'LOGICAL_OR';
-    const /* testXor */ XOR = 'LOGICAL_XOR';
-}
-
-namespace /* testKeywordAfterNamespaceShouldBeString */ class;
-namespace /* testNamespaceNameIsString1 */ my\ /* testNamespaceNameIsString2 */ class\ /* testNamespaceNameIsString3 */ foreach;
-
-/* testAbstractIsKeyword */ abstract /* testClassIsKeyword */ class SomeClass
-    /* testExtendsIsKeyword */ extends SomeParent
-    /* testImplementsIsKeyword */ implements SomeInterface
-{
-    /* testUseIsKeyword */ use SomeTrait, OtherTrait {
-        SomeTrait::a /* testInsteadOfIsKeyword */ insteadof A;
-        OtherTrait::a /* testAsIsKeyword */ as B;
-    }
-
-    /* testConstIsKeyword */ const CONSTANT = 'c';
-
-    /* testPrivateIsKeyword */ private $private;
-    /* testProtectedIsKeyword */ protected $protected;
-    /* testPublicIsKeyword */ public $public;
-
-    /* testVarIsKeyword */ var $var;
-    /* testStaticIsKeyword */ static $static;
-
-    /* testReadonlyIsKeyword */ readonly $readonly;
-
-    /* testFinalIsKeyword */ final /* testFunctionIsKeyword */ function someFunction(
-        /* testCallableIsKeyword */
-        callable $callable,
-        /* testSelfIsKeyword */
-        self $self,
-        /* testParentIsKeyword */
-        parent $parent
-    ) {
-        /* testReturnIsKeyword */
-        return $this;
-    }
-}
-
-/* testInterfaceIsKeyword */ interface SomeInterface {}
-/* testTraitIsKeyword */ trait SomeTrait {}
-/* testEnumIsKeyword */ enum SomeEnum {}
-
-$object = /* testNewIsKeyword */ new SomeClass();
-$object /* testInstanceOfIsKeyword */ instanceof SomeClass;
-$copy = /* testCloneIsKeyword */ clone $object;
-
-/* testIfIsKeyword */ if (true):
-/* testElseIfIsKeyword */ elseif (false):
-/* testElseIsKeyword */ else:
-/* testEndIfIsKeyword */ endif;
-
-/* testForIsKeyword */ for ($i = 0; $i < 100; $i++):
-/* testEndForIsKeyword */ endfor;
-
-/* testForeachIsKeyword */ foreach ($array as $value):
-/* testEndForeachIsKeyword */ endforeach;
-
-/* testSwitchIsKeyword */ switch (true):
-    /* testCaseIsKeyword */case false:
-        /* testBreakIsKeyword */
-        break;
-    /* testDefaultIsKeyword */ default:
-        /* testContinueIsKeyword */
-        continue;
-/* testEndSwitchIsKeyword */ endswitch;
-
-/* testDoIsKeyword */ do {
-
-} while (false);
-
-/* testWhileIsKeyword */ while (false):
-/* testEndWhileIsKeyword */ endwhile;
-
-/* testTryIsKeyword */
-try {
-    /* testThrowIsKeyword */
-    throw new Exception();
-} /* testCatchIsKeyword */ catch (Exception $e) {
-
-} /* testFinallyIsKeyword */ finally {
-
-}
-
-/* testGlobalIsKeyword */
-global $foo;
-/* testEchoIsKeyword */
-echo $foo;
-/* testPrintIsKeyword */
-print $foo;
-/* testDieIsKeyword */
-die($foo);
-/* testExitIsKeyword */
-exit;
-
-/* testIncludeIsKeyword */
-include 'file.php';
-/* testIncludeOnceIsKeyword */
-include_once 'file.php';
-/* testRequireIsKeyword */
-require 'file.php';
-/* testRequireOnceIsKeyword */
-require_once 'file.php';
-
-[$a, $b] = /* testListIsKeyword */ list($array);
-
-/* testGotoIsKeyword */
-goto label;
-
-$match = /* testMatchIsKeyword */ match ($test) {
-    1 => 'a',
-    2 => 'b',
-    /* testMatchDefaultIsKeyword */ default => 'default',
-};
-
-$closure = /* testFnIsKeyword */ fn () => 'string';
-
-function () {
-    /* testYieldIsKeyword */ yield $f;
-    /* testYieldFromIsKeyword */ yield from someFunction();
-};
-
-/* testDeclareIsKeyword */ declare(ticks=1):
-/* testEndDeclareIsKeyword */ enddeclare;
-
-if (true /* testAndIsKeyword */ and false /* testOrIsKeyword */ or null /* testXorIsKeyword */ xor 0) {
-
-}
-
-$anonymousClass = new /* testAnonymousClassIsKeyword */ class {};
-$anonymousClass2 = new class /* testExtendsInAnonymousClassIsKeyword */ extends SomeParent {};
-$anonymousClass3 = new class /* testImplementsInAnonymousClassIsKeyword */ implements SomeInterface {};
-
-class Foo extends /* testNamespaceInNameIsKeyword */ namespace\Exception
-{}
+<?php
+
+/* testNamespaceIsKeyword */
+namespace SomeNamespace;
+
+class ContextSensitiveKeywords
+{
+    const /* testAbstract */ ABSTRACT = 'ABSTRACT';
+    const /* testArray */ ARRAY = 'ARRAY';
+    const /* testAs */ AS = 'AS';
+    const /* testBreak */ BREAK = 'BREAK';
+    const /* testCallable */ CALLABLE = 'CALLABLE';
+    const /* testCase */ CASE = 'CASE';
+    const /* testCatch */ CATCH = 'CATCH';
+    const /* testClass */ CLASS = 'CLASS';
+    const /* testClone */ CLONE = 'CLONE';
+    const /* testConst */ CONST = 'CONST';
+    const /* testContinue */ CONTINUE = 'CONTINUE';
+    const /* testDeclare */ DECLARE = 'DECLARE';
+    const /* testDefault */ DEFAULT = 'DEFAULT';
+    const /* testDo */ DO = 'DO';
+    const /* testEcho */ ECHO = 'ECHO';
+    const /* testElse */ ELSE = 'ELSE';
+    const /* testElseIf */ ELSEIF = 'ELSEIF';
+    const /* testEndDeclare */ ENDDECLARE = 'ENDDECLARE';
+    const /* testEndFor */ ENDFOR = 'ENDFOR';
+    const /* testEndForeach */ ENDFOREACH = 'ENDFOREACH';
+    const /* testEndIf */ ENDIF = 'ENDIF';
+    const /* testEndSwitch */ ENDSWITCH = 'ENDSWITCH';
+    const /* testEndWhile */ ENDWHILE = 'ENDWHILE';
+    const /* testEnum */ ENUM = 'ENUM';
+    const /* testExit */ EXIT = 'EXIT';
+    const /* testExtends */ EXTENDS = 'EXTENDS';
+    const /* testFinal */ FINAL = 'FINAL';
+    const /* testFinally */ FINALLY = 'FINALLY';
+    const /* testFn */ FN = 'FN';
+    const /* testFor */ FOR = 'FOR';
+    const /* testForeach */ FOREACH = 'FOREACH';
+    const /* testFunction */ FUNCTION = 'FUNCTION';
+    const /* testGlobal */ GLOBAL = 'GLOBAL';
+    const /* testGoto */ GOTO = 'GOTO';
+    const /* testIf */ IF = 'IF';
+    const /* testImplements */ IMPLEMENTS = 'IMPLEMENTS';
+    const /* testInclude */ INCLUDE = 'INCLUDE';
+    const /* testIncludeOnce */ INCLUDE_ONCE = 'INCLUDE_ONCE';
+    const /* testInstanceOf */ INSTANCEOF = 'INSTANCEOF';
+    const /* testInsteadOf */ INSTEADOF = 'INSTEADOF';
+    const /* testInterface */ INTERFACE = 'INTERFACE';
+    const /* testList */ LIST = 'LIST';
+    const /* testMatch */ MATCH = 'MATCH';
+    const /* testNamespace */ NAMESPACE = 'NAMESPACE';
+    const /* testNew */ NEW = 'NEW';
+    const /* testParent */ PARENT = 'PARENT';
+    const /* testPrint */ PRINT = 'PRINT';
+    const /* testPrivate */ PRIVATE = 'PRIVATE';
+    const /* testProtected */ PROTECTED = 'PROTECTED';
+    const /* testPublic */ PUBLIC = 'PUBLIC';
+    const /* testReadonly */ READONLY = 'READONLY';
+    const /* testRequire */ REQUIRE = 'REQUIRE';
+    const /* testRequireOnce */ REQUIRE_ONCE = 'REQUIRE_ONCE';
+    const /* testReturn */ RETURN = 'RETURN';
+    const /* testSelf */ SELF = 'SELF';
+    const /* testStatic */ STATIC = 'STATIC';
+    const /* testSwitch */ SWITCH = 'SWITCH';
+    const /* testThrows */ THROW = 'THROW';
+    const /* testTrait */ TRAIT = 'TRAIT';
+    const /* testTry */ TRY = 'TRY';
+    const /* testUse */ USE = 'USE';
+    const /* testVar */ VAR = 'VAR';
+    const /* testWhile */ WHILE = 'WHILE';
+    const /* testYield */ YIELD = 'YIELD';
+    const /* testYieldFrom */ YIELD_FROM = 'YIELD_FROM';
+
+    const /* testAnd */ AND = 'LOGICAL_AND';
+    const /* testOr */ OR = 'LOGICAL_OR';
+    const /* testXor */ XOR = 'LOGICAL_XOR';
+}
+
+namespace /* testKeywordAfterNamespaceShouldBeString */ class;
+namespace /* testNamespaceNameIsString1 */ my\ /* testNamespaceNameIsString2 */ class\ /* testNamespaceNameIsString3 */ foreach;
+
+/* testAbstractIsKeyword */ abstract /* testClassIsKeyword */ class SomeClass
+    /* testExtendsIsKeyword */ extends SomeParent
+    /* testImplementsIsKeyword */ implements SomeInterface
+{
+    /* testUseIsKeyword */ use SomeTrait, OtherTrait {
+        SomeTrait::a /* testInsteadOfIsKeyword */ insteadof A;
+        OtherTrait::a /* testAsIsKeyword */ as B;
+    }
+
+    /* testConstIsKeyword */ const CONSTANT = 'c';
+
+    /* testPrivateIsKeyword */ private $private;
+    /* testProtectedIsKeyword */ protected $protected;
+    /* testPublicIsKeyword */ public $public;
+
+    /* testVarIsKeyword */ var $var;
+    /* testStaticIsKeyword */ static $static;
+
+    /* testReadonlyIsKeyword */ readonly $readonly;
+
+    /* testFinalIsKeyword */ final /* testFunctionIsKeyword */ function someFunction(
+        /* testCallableIsKeyword */
+        callable $callable,
+        /* testSelfIsKeyword */
+        self $self,
+        /* testParentIsKeyword */
+        parent $parent
+    ) {
+        /* testReturnIsKeyword */
+        return $this;
+    }
+}
+
+/* testInterfaceIsKeyword */ interface SomeInterface {}
+/* testTraitIsKeyword */ trait SomeTrait {}
+/* testEnumIsKeyword */ enum SomeEnum {}
+
+$object = /* testNewIsKeyword */ new SomeClass();
+$object /* testInstanceOfIsKeyword */ instanceof SomeClass;
+$copy = /* testCloneIsKeyword */ clone $object;
+
+/* testIfIsKeyword */ if (true):
+/* testElseIfIsKeyword */ elseif (false):
+/* testElseIsKeyword */ else:
+/* testEndIfIsKeyword */ endif;
+
+/* testForIsKeyword */ for ($i = 0; $i < 100; $i++):
+/* testEndForIsKeyword */ endfor;
+
+/* testForeachIsKeyword */ foreach ($array as $value):
+/* testEndForeachIsKeyword */ endforeach;
+
+/* testSwitchIsKeyword */ switch (true):
+    /* testCaseIsKeyword */case false:
+        /* testBreakIsKeyword */
+        break;
+    /* testDefaultIsKeyword */ default:
+        /* testContinueIsKeyword */
+        continue;
+/* testEndSwitchIsKeyword */ endswitch;
+
+/* testDoIsKeyword */ do {
+
+} while (false);
+
+/* testWhileIsKeyword */ while (false):
+/* testEndWhileIsKeyword */ endwhile;
+
+/* testTryIsKeyword */
+try {
+    /* testThrowIsKeyword */
+    throw new Exception();
+} /* testCatchIsKeyword */ catch (Exception $e) {
+
+} /* testFinallyIsKeyword */ finally {
+
+}
+
+/* testGlobalIsKeyword */
+global $foo;
+/* testEchoIsKeyword */
+echo $foo;
+/* testPrintIsKeyword */
+print $foo;
+/* testDieIsKeyword */
+die($foo);
+/* testExitIsKeyword */
+exit;
+
+/* testIncludeIsKeyword */
+include 'file.php';
+/* testIncludeOnceIsKeyword */
+include_once 'file.php';
+/* testRequireIsKeyword */
+require 'file.php';
+/* testRequireOnceIsKeyword */
+require_once 'file.php';
+
+[$a, $b] = /* testListIsKeyword */ list($array);
+
+/* testGotoIsKeyword */
+goto label;
+
+$match = /* testMatchIsKeyword */ match ($test) {
+    1 => 'a',
+    2 => 'b',
+    /* testMatchDefaultIsKeyword */ default => 'default',
+};
+
+$closure = /* testFnIsKeyword */ fn () => 'string';
+
+function () {
+    /* testYieldIsKeyword */ yield $f;
+    /* testYieldFromIsKeyword */ yield from someFunction();
+};
+
+/* testDeclareIsKeyword */ declare(ticks=1):
+/* testEndDeclareIsKeyword */ enddeclare;
+
+if (true /* testAndIsKeyword */ and false /* testOrIsKeyword */ or null /* testXorIsKeyword */ xor 0) {
+
+}
+
+$anonymousClass = new /* testAnonymousClassIsKeyword */ class {};
+$anonymousClass2 = new class /* testExtendsInAnonymousClassIsKeyword */ extends SomeParent {};
+$anonymousClass3 = new class /* testImplementsInAnonymousClassIsKeyword */ implements SomeInterface {};
+
+$instantiated1 = new /* testClassInstantiationParentIsKeyword */ parent();
+$instantiated2 = new /* testClassInstantiationSelfIsKeyword */ SELF;
+$instantiated3 = new /* testClassInstantiationStaticIsKeyword */ static($param);
+
+class Foo extends /* testNamespaceInNameIsKeyword */ namespace\Exception
+{}
diff --git a/tests/Core/Tokenizer/ContextSensitiveKeywordsTest.php b/tests/Core/Tokenizer/ContextSensitiveKeywordsTest.php
index 72aeac6859..7420fd38bf 100644
--- a/tests/Core/Tokenizer/ContextSensitiveKeywordsTest.php
+++ b/tests/Core/Tokenizer/ContextSensitiveKeywordsTest.php
@@ -462,6 +462,18 @@ public function dataKeywords()
                 '/* testImplementsInAnonymousClassIsKeyword */',
                 'T_IMPLEMENTS',
             ],
+            [
+                '/* testClassInstantiationParentIsKeyword */',
+                'T_PARENT',
+            ],
+            [
+                '/* testClassInstantiationSelfIsKeyword */',
+                'T_SELF',
+            ],
+            [
+                '/* testClassInstantiationStaticIsKeyword */',
+                'T_STATIC',
+            ],
             [
                 '/* testNamespaceInNameIsKeyword */',
                 'T_NAMESPACE',