diff --git a/src/Tokenizer/Token.php b/src/Tokenizer/Token.php
index 4d139f6afe8..9a2456e27bf 100644
--- a/src/Tokenizer/Token.php
+++ b/src/Tokenizer/Token.php
@@ -318,7 +318,7 @@ public static function getKeywords()
                 'T_INTERFACE', 'T_ISSET', 'T_LIST', 'T_LOGICAL_AND', 'T_LOGICAL_OR', 'T_LOGICAL_XOR',
                 'T_NAMESPACE', 'T_NEW', 'T_PRINT', 'T_PRIVATE', 'T_PROTECTED', 'T_PUBLIC', 'T_REQUIRE',
                 'T_REQUIRE_ONCE', 'T_RETURN', 'T_STATIC', 'T_SWITCH', 'T_THROW', 'T_TRAIT', 'T_TRY',
-                'T_UNSET', 'T_USE', 'T_VAR', 'T_WHILE', 'T_YIELD',
+                'T_UNSET', 'T_USE', 'T_VAR', 'T_WHILE', 'T_YIELD', 'T_YIELD_FROM',
             ]) + [
                 CT::T_ARRAY_TYPEHINT => CT::T_ARRAY_TYPEHINT,
                 CT::T_CLASS_CONSTANT => CT::T_CLASS_CONSTANT,
diff --git a/tests/Fixtures/Integration/misc/PHP7.test b/tests/Fixtures/Integration/misc/PHP7.test
index ad91ff8842a..45e09ab50c3 100644
--- a/tests/Fixtures/Integration/misc/PHP7.test
+++ b/tests/Fixtures/Integration/misc/PHP7.test
@@ -205,7 +205,7 @@ class Foo implements FooInterface
         yield 1;
 
         // generator delegation
-        yield from $this->gen2();
+        yield FROM $this->gen2();
     }
 
     public function gen2()