diff --git a/compiler/testData/diagnostics/tests/Properties.kt b/compiler/testData/diagnostics/tests/Properties.kt
index 7f348f05692..332142bc57c 100644
--- a/compiler/testData/diagnostics/tests/Properties.kt
+++ b/compiler/testData/diagnostics/tests/Properties.kt
@@ -1,4 +1,4 @@
-var x : Int = 1 + x
+var x : Int = 1 + <!UNINITIALIZED_VARIABLE!>x<!>
    get() : Int = 1
    set(value : <!WRONG_SETTER_PARAMETER_TYPE!>Long<!>) {
       $x = value.toInt()
diff --git a/compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.kt b/compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.kt
index 9e466c32fe6..773971716b9 100644
--- a/compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.kt
+++ b/compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.kt
@@ -131,9 +131,9 @@ class T() {
     }
 
     val a =  object {
-        val x = <!NO_BACKING_FIELD_CUSTOM_ACCESSORS, NO_BACKING_FIELD_CUSTOM_ACCESSORS!>$z<!>
+        val x = <!NO_BACKING_FIELD_CUSTOM_ACCESSORS!>$z<!>
         {
-            <!NO_BACKING_FIELD_CUSTOM_ACCESSORS, NO_BACKING_FIELD_CUSTOM_ACCESSORS!>$z<!> = 23
+            <!NO_BACKING_FIELD_CUSTOM_ACCESSORS!>$z<!> = 23
         }
     }
 
@@ -169,4 +169,4 @@ class T() {
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2960.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2960.kt
index 13f88409d76..11d89f6ac4c 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2960.kt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2960.kt
@@ -15,7 +15,7 @@ val o = object {
         <!INVISIBLE_SETTER!>p.x<!> = 4
 
         val z : Int
-        doSmth(<!UNINITIALIZED_VARIABLE, UNINITIALIZED_VARIABLE!>z<!>)
+        doSmth(<!UNINITIALIZED_VARIABLE!>z<!>)
     }
 }
 
@@ -24,4 +24,13 @@ val g = { ->
     doSmth(<!UNINITIALIZED_VARIABLE!>x<!>)
 }
 
+class A {
+    val a : Int = 1
+      get() {
+          val x : Int
+          doSmth(<!UNINITIALIZED_VARIABLE!>x<!>)
+          return $a
+      }
+}
+
 fun doSmth(i: Int) = i
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet81.kt b/compiler/testData/diagnostics/tests/regressions/Jet81.kt
index 95a427a5766..6151bd7a1ec 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet81.kt
+++ b/compiler/testData/diagnostics/tests/regressions/Jet81.kt
@@ -1,7 +1,7 @@
 // JET-81 Assertion fails when processing self-referring anonymous objects
 
 val y = object {
-  val a = <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>y<!>;
+  val a = <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM, UNINITIALIZED_VARIABLE!>y<!>;
 }
 
 val z = y.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>a<!>;
@@ -12,7 +12,7 @@ object A {
 
 val a = object {
   {
-    <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>b<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> 1
+    <!UNINITIALIZED_VARIABLE, DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>b<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> 1
   }
   val x = <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>b<!>
   val y = 1
diff --git a/compiler/testData/diagnostics/tests/regressions/kt328.kt b/compiler/testData/diagnostics/tests/regressions/kt328.kt
index f396b3f67e1..59a9f9b57b7 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt328.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt328.kt
@@ -18,7 +18,7 @@ class A() {
 val x = { <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>x<!> }
 
 //KT-787 AssertionError on code 'val x = x'
-val z = <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>z<!>
+val z = <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM, UNINITIALIZED_VARIABLE!>z<!>
 
 //KT-329 Assertion failure on local function
 fun block(f : () -> Unit) = f()
diff --git a/idea/testData/checker/Properties.kt b/idea/testData/checker/Properties.kt
index 6455f1aaac6..5824b335560 100644
--- a/idea/testData/checker/Properties.kt
+++ b/idea/testData/checker/Properties.kt
@@ -1,4 +1,4 @@
- var x : Int = 1 + x
+ var x : Int = 1 + <error>x</error>
    get() : Int = 1
    set(value : <error>Long</error>) {
       $x = value.toInt()