diff --git a/python/testData/highlighting/returnWithArgumentsInGenerator.py b/python/testData/highlighting/returnWithArgumentsInGenerator.py
new file mode 100644
index 000000000000..2f3e1d88ace0
--- /dev/null
+++ b/python/testData/highlighting/returnWithArgumentsInGenerator.py
@@ -0,0 +1,3 @@
+def f():
+  yield 42
+  <error descr="'return' with argument inside generator">return 28</error>
\ No newline at end of file
diff --git a/python/testData/highlighting/yieldOutsideOfFunction.py b/python/testData/highlighting/yieldOutsideOfFunction.py
new file mode 100644
index 000000000000..25829f35c6d0
--- /dev/null
+++ b/python/testData/highlighting/yieldOutsideOfFunction.py
@@ -0,0 +1 @@
+<error descr="'yield' outside of function">yield 42</error>
\ No newline at end of file
diff --git a/python/testData/psi/YieldAsArgument.py b/python/testData/psi/YieldAsArgument.py
new file mode 100644
index 000000000000..450791aec7d2
--- /dev/null
+++ b/python/testData/psi/YieldAsArgument.py
@@ -0,0 +1,2 @@
+def f():
+  foo(yield 42)
\ No newline at end of file
diff --git a/python/testData/psi/YieldAsArgument.txt b/python/testData/psi/YieldAsArgument.txt
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/testData/psi/YieldInAssignment.py b/python/testData/psi/YieldInAssignment.py
new file mode 100644
index 000000000000..cca45e032e02
--- /dev/null
+++ b/python/testData/psi/YieldInAssignment.py
@@ -0,0 +1,2 @@
+def f():
+  x = yield 42
diff --git a/python/testData/psi/YieldInAssignment.txt b/python/testData/psi/YieldInAssignment.txt
new file mode 100644
index 000000000000..d62e57d8642e
--- /dev/null
+++ b/python/testData/psi/YieldInAssignment.txt
@@ -0,0 +1,22 @@
+PyFile:YieldInAssignment.py
+  PyFunction
+    PsiElement(Py:DEF_KEYWORD)('def')
+    PsiWhiteSpace(' ')
+    PsiElement(Py:IDENTIFIER)('f')
+    PyParameterList
+      PsiElement(Py:LPAR)('(')
+      PsiElement(Py:RPAR)(')')
+    PsiElement(Py:COLON)(':')
+    PsiWhiteSpace('\n  ')
+    PyStatementList
+      PyAssignmentStatement
+        PyReferenceExpression: x
+          PsiElement(Py:IDENTIFIER)('x')
+        PsiWhiteSpace(' ')
+        PsiElement(Py:EQ)('=')
+        PsiWhiteSpace(' ')
+        PyYieldExpression
+          PsiElement(Py:YIELD_KEYWORD)('yield')
+          PsiWhiteSpace(' ')
+          PyNumericLiteralExpression
+            PsiElement(Py:INTEGER_LITERAL)('42')
\ No newline at end of file
diff --git a/python/testData/psi/YieldInAugAssignment.py b/python/testData/psi/YieldInAugAssignment.py
new file mode 100644
index 000000000000..efda3dae6090
--- /dev/null
+++ b/python/testData/psi/YieldInAugAssignment.py
@@ -0,0 +1,3 @@
+def g():
+  x = 0
+  x += yield 42  
\ No newline at end of file
diff --git a/python/testData/psi/YieldInAugAssignment.txt b/python/testData/psi/YieldInAugAssignment.txt
new file mode 100644
index 000000000000..0e9675f13b4c
--- /dev/null
+++ b/python/testData/psi/YieldInAugAssignment.txt
@@ -0,0 +1,31 @@
+PyFile:YieldInAugAssignment.py
+  PyFunction
+    PsiElement(Py:DEF_KEYWORD)('def')
+    PsiWhiteSpace(' ')
+    PsiElement(Py:IDENTIFIER)('g')
+    PyParameterList
+      PsiElement(Py:LPAR)('(')
+      PsiElement(Py:RPAR)(')')
+    PsiElement(Py:COLON)(':')
+    PsiWhiteSpace('\n  ')
+    PyStatementList
+      PyAssignmentStatement
+        PyReferenceExpression: x
+          PsiElement(Py:IDENTIFIER)('x')
+        PsiWhiteSpace(' ')
+        PsiElement(Py:EQ)('=')
+        PsiWhiteSpace(' ')
+        PyNumericLiteralExpression
+          PsiElement(Py:INTEGER_LITERAL)('0')
+      PsiWhiteSpace('\n  ')
+      PyAugAssignmentStatement
+        PyReferenceExpression: x
+          PsiElement(Py:IDENTIFIER)('x')
+        PsiWhiteSpace(' ')
+        PsiElement(Py:PLUSEQ)('+=')
+        PsiWhiteSpace(' ')
+        PyYieldExpression
+          PsiElement(Py:YIELD_KEYWORD)('yield')
+          PsiWhiteSpace(' ')
+          PyNumericLiteralExpression
+            PsiElement(Py:INTEGER_LITERAL)('42')
\ No newline at end of file
diff --git a/python/testData/psi/YieldInParentheses.py b/python/testData/psi/YieldInParentheses.py
new file mode 100644
index 000000000000..a58949e7c1b2
--- /dev/null
+++ b/python/testData/psi/YieldInParentheses.py
@@ -0,0 +1,2 @@
+def f():
+  x = 12 + (yield)    
\ No newline at end of file
diff --git a/python/testData/psi/YieldInParentheses.txt b/python/testData/psi/YieldInParentheses.txt
new file mode 100644
index 000000000000..d023400e6c37
--- /dev/null
+++ b/python/testData/psi/YieldInParentheses.txt
@@ -0,0 +1,28 @@
+PyFile:YieldInParentheses.py
+  PyFunction
+    PsiElement(Py:DEF_KEYWORD)('def')
+    PsiWhiteSpace(' ')
+    PsiElement(Py:IDENTIFIER)('f')
+    PyParameterList
+      PsiElement(Py:LPAR)('(')
+      PsiElement(Py:RPAR)(')')
+    PsiElement(Py:COLON)(':')
+    PsiWhiteSpace('\n  ')
+    PyStatementList
+      PyAssignmentStatement
+        PyReferenceExpression: x
+          PsiElement(Py:IDENTIFIER)('x')
+        PsiWhiteSpace(' ')
+        PsiElement(Py:EQ)('=')
+        PsiWhiteSpace(' ')
+        PyBinaryExpression
+          PyNumericLiteralExpression
+            PsiElement(Py:INTEGER_LITERAL)('12')
+          PsiWhiteSpace(' ')
+          PsiElement(Py:PLUS)('+')
+          PsiWhiteSpace(' ')
+          PyParenthesizedExpression
+            PsiElement(Py:LPAR)('(')
+            PyYieldExpression
+              PsiElement(Py:YIELD_KEYWORD)('yield')
+            PsiElement(Py:RPAR)(')')
\ No newline at end of file
diff --git a/python/testData/psi/YieldStatement.py b/python/testData/psi/YieldStatement.py
new file mode 100644
index 000000000000..c793fe617796
--- /dev/null
+++ b/python/testData/psi/YieldStatement.py
@@ -0,0 +1,2 @@
+def f():
+  yield 42
\ No newline at end of file
diff --git a/python/testData/psi/YieldStatement.txt b/python/testData/psi/YieldStatement.txt
new file mode 100644
index 000000000000..a5c3897eced1
--- /dev/null
+++ b/python/testData/psi/YieldStatement.txt
@@ -0,0 +1,17 @@
+PyFile:YieldStatement.py
+  PyFunction
+    PsiElement(Py:DEF_KEYWORD)('def')
+    PsiWhiteSpace(' ')
+    PsiElement(Py:IDENTIFIER)('f')
+    PyParameterList
+      PsiElement(Py:LPAR)('(')
+      PsiElement(Py:RPAR)(')')
+    PsiElement(Py:COLON)(':')
+    PsiWhiteSpace('\n  ')
+    PyStatementList
+      PyExpressionStatement
+        PyYieldExpression
+          PsiElement(Py:YIELD_KEYWORD)('yield')
+          PsiWhiteSpace(' ')
+          PyNumericLiteralExpression
+            PsiElement(Py:INTEGER_LITERAL)('42')
\ No newline at end of file