diff --git a/compiler/testData/diagnostics/tests/Abstract.jet b/compiler/testData/diagnostics/tests/Abstract.jet
index b22f0f9995a..6ada45c4784 100644
--- a/compiler/testData/diagnostics/tests/Abstract.jet
+++ b/compiler/testData/diagnostics/tests/Abstract.jet
@@ -1,186 +1,3 @@
-// FILE: a.kt
-// +JDK
-
-package abstract
-
-class MyClass() {
-    //properties
-    val <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>a<!>: Int
-    val a1: Int = 1
-    <!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> val a2: Int
-    <!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> val a3: Int = 1
-
-    var <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>b<!>: Int                private set
-    var b1: Int = 0;                         private set
-    <!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> var b2: Int      private set
-    <!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> var b3: Int = 0; private set
-
-    var <!MUST_BE_INITIALIZED!>c<!>: Int                set(v: Int) { $c = v }
-    var c1: Int = 0;                         set(v: Int) { $c1 = v }
-    <!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> var c2: Int      set(v: Int) { $c2 = v }
-    <!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> var c3: Int = 0; set(v: Int) { $c3 = v }
-
-    val e: Int                               get() = a
-    val e1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>;          get() = a
-    <!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> val e2: Int      get() = a
-    <!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> val e3: Int = 0; get() = a
-
-    //methods
-    fun <!NON_ABSTRACT_FUNCTION_WITH_NO_BODY!>f<!>()
-    fun g() {}
-    <!ABSTRACT_FUNCTION_IN_NON_ABSTRACT_CLASS!>abstract<!> fun h()
-    <!ABSTRACT_FUNCTION_IN_NON_ABSTRACT_CLASS, ABSTRACT_FUNCTION_WITH_BODY!>abstract<!> fun j() {}
-
-    //property accessors
-    var i: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
-    var i1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>;  <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
-
-    var j: Int                       get() = i;    <!ILLEGAL_MODIFIER!>abstract<!> set
-    var j1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>;  get() = i;    <!ILLEGAL_MODIFIER!>abstract<!> set
-
-    var <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>k<!>: Int        <!ILLEGAL_MODIFIER!>abstract<!> set
-    var k1: Int = 0;                 <!ILLEGAL_MODIFIER!>abstract<!> set
-
-    var l: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
-    var l1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>;  <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
-
-    var n: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get <!ILLEGAL_MODIFIER!>abstract<!> set(v: Int) {}
-}
-
-abstract class MyAbstractClass() {
-    //properties
-    val <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>a<!>: Int
-    val a1: Int = 1
-    abstract val a2: Int
-    abstract val a3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>1<!>
-
-    var <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>b<!>: Int                private set
-    var b1: Int = 0;                         private set
-    abstract var b2: Int      private set
-    abstract var b3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; private set
-
-    var <!MUST_BE_INITIALIZED!>c<!>: Int                set(v: Int) { $c = v }
-    var c1: Int = 0;                         set(v: Int) { $c1 = v }
-    abstract var c2: Int                     <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { $c2 = v }<!>
-    abstract var c3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { $c3 = v }<!>
-
-    val e: Int                               get() = a
-    val e1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>;          get() = a
-    abstract val e2: Int                     <!ABSTRACT_PROPERTY_WITH_GETTER!>get() = a<!>
-    abstract val e3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; <!ABSTRACT_PROPERTY_WITH_GETTER!>get() = a<!>
-
-    //methods
-    fun <!NON_ABSTRACT_FUNCTION_WITH_NO_BODY!>f<!>()
-    fun g() {}
-    abstract fun h()
-    <!ABSTRACT_FUNCTION_WITH_BODY!>abstract<!> fun j() {}
-
-    //property accessors
-    var i: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
-    var i1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>;  <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
-
-    var j: Int                       get() = i;    <!ILLEGAL_MODIFIER!>abstract<!> set
-    var j1: Int                      get() = i;    <!ILLEGAL_MODIFIER!>abstract<!> set
-
-    var <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>k<!>: Int        <!ILLEGAL_MODIFIER!>abstract<!> set
-    var k1: Int = 0;                 <!ILLEGAL_MODIFIER!>abstract<!> set
-
-    var l: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
-    var l1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>;  <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
-
-    var n: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get <!ILLEGAL_MODIFIER!>abstract<!> set(v: Int) {}
-}
-
-trait MyTrait {
-    //properties
-    val a: Int
-    val a1: Int = <!PROPERTY_INITIALIZER_IN_TRAIT!>1<!>
-    <!REDUNDANT_MODIFIER_IN_TRAIT!>abstract<!> val a2: Int
-    <!REDUNDANT_MODIFIER_IN_TRAIT!>abstract<!> val a3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>1<!>
-
-    var b: Int                                                  private set
-    var b1: Int = <!PROPERTY_INITIALIZER_IN_TRAIT!>0<!>;                             private set
-    <!REDUNDANT_MODIFIER_IN_TRAIT!>abstract<!> var b2: Int                     private set
-    <!REDUNDANT_MODIFIER_IN_TRAIT!>abstract<!> var b3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; private set
-
-    var <!BACKING_FIELD_IN_TRAIT!>c<!>: Int                                   set(v: Int) { $c = v }
-    var <!BACKING_FIELD_IN_TRAIT!>c1<!>: Int = <!PROPERTY_INITIALIZER_IN_TRAIT!>0<!>;              set(v: Int) { $c1 = v }
-    <!REDUNDANT_MODIFIER_IN_TRAIT!>abstract<!> var c2: Int                     <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { $c2 = v }<!>
-    <!REDUNDANT_MODIFIER_IN_TRAIT!>abstract<!> var c3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { $c3 = v }<!>
-
-    val e: Int                                                  get() = a
-    val e1: Int = <!PROPERTY_INITIALIZER_IN_TRAIT!>0<!>;                             get() = a
-    <!REDUNDANT_MODIFIER_IN_TRAIT!>abstract<!> val e2: Int                     <!ABSTRACT_PROPERTY_WITH_GETTER!>get() = a<!>
-    <!REDUNDANT_MODIFIER_IN_TRAIT!>abstract<!> val e3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; <!ABSTRACT_PROPERTY_WITH_GETTER!>get() = a<!>
-
-    //methods
-    fun f()
-    fun g() {}
-    <!REDUNDANT_MODIFIER_IN_TRAIT!>abstract<!> fun h()
-    <!REDUNDANT_MODIFIER_IN_TRAIT, ABSTRACT_FUNCTION_WITH_BODY!>abstract<!> fun j() {}
-
-    //property accessors
-    var i: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
-    var i1: Int = <!PROPERTY_INITIALIZER_IN_TRAIT!>0<!>;  <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
-
-    var j: Int                       get() = i;    <!ILLEGAL_MODIFIER!>abstract<!> set
-    var j1: Int = <!PROPERTY_INITIALIZER_IN_TRAIT!>0<!>;  get() = i;    <!ILLEGAL_MODIFIER!>abstract<!> set
-
-    var k: Int                       <!ILLEGAL_MODIFIER!>abstract<!> set
-    var k1: Int = <!PROPERTY_INITIALIZER_IN_TRAIT!>0<!>;  <!ILLEGAL_MODIFIER!>abstract<!> set
-
-    var l: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
-    var l1: Int = <!PROPERTY_INITIALIZER_IN_TRAIT!>0<!>;  <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
-
-    var n: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get <!ILLEGAL_MODIFIER!>abstract<!> set(v: Int) {}
-}
-
-enum class MyEnum() {
-    //properties
-    val <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>a<!>: Int
-    val a1: Int = 1
-    abstract val a2: Int
-    abstract val a3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>1<!>
-
-    var <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>b<!>: Int                private set
-    var b1: Int = 0;                         private set
-    abstract var b2: Int      private set
-    abstract var b3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; private set
-
-    var <!MUST_BE_INITIALIZED!>c<!>: Int                set(v: Int) { $c = v }
-    var c1: Int = 0;                         set(v: Int) { $c1 = v }
-    abstract var c2: Int                     <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { $c2 = v }<!>
-    abstract var c3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { $c3 = v }<!>
-
-    val e: Int                               get() = a
-    val e1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>;          get() = a
-    abstract val e2: Int                     <!ABSTRACT_PROPERTY_WITH_GETTER!>get() = a<!>
-    abstract val e3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; <!ABSTRACT_PROPERTY_WITH_GETTER!>get() = a<!>
-
-    //methods
-    fun <!NON_ABSTRACT_FUNCTION_WITH_NO_BODY!>f<!>()
-    fun g() {}
-    abstract fun h()
-    <!ABSTRACT_FUNCTION_WITH_BODY!>abstract<!> fun j() {}
-
-    //property accessors
-    var i: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
-    var i1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>;  <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
-
-    var j: Int                       get() = i;    <!ILLEGAL_MODIFIER!>abstract<!> set
-    var j1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>;  get() = i;    <!ILLEGAL_MODIFIER!>abstract<!> set
-
-    var <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>k<!>: Int        <!ILLEGAL_MODIFIER!>abstract<!> set
-    var k1: Int = 0;                 <!ILLEGAL_MODIFIER!>abstract<!> set
-
-    var l: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
-    var l1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>;   <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
-
-    var n: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get <!ILLEGAL_MODIFIER!>abstract<!> set(v: Int) {}
-}
-
-abstract enum class MyAbstractEnum() {}
-
 // FILE: b.kt
 package MyNamespace
     //properties
@@ -242,4 +59,4 @@ abstract class B3(i: Int) {
 fun foo(<!UNUSED_PARAMETER!>c<!>: B3) {
     val <!UNUSED_VARIABLE!>a<!> = <!CREATING_AN_INSTANCE_OF_ABSTRACT_CLASS!>B3()<!>
     val <!UNUSED_VARIABLE!>b<!> = <!CREATING_AN_INSTANCE_OF_ABSTRACT_CLASS!>B1(2, "s")<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/AbstractEnum.jet b/compiler/testData/diagnostics/tests/AbstractEnum.jet
new file mode 100644
index 00000000000..27471439f64
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/AbstractEnum.jet
@@ -0,0 +1,6 @@
+// FILE: a.kt
+// +JDK
+
+package abstract
+
+abstract enum class MyAbstractEnum() {}
diff --git a/compiler/testData/diagnostics/tests/AbstractInAbstractClass.jet b/compiler/testData/diagnostics/tests/AbstractInAbstractClass.jet
new file mode 100644
index 00000000000..71eed8302aa
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/AbstractInAbstractClass.jet
@@ -0,0 +1,49 @@
+// FILE: a.kt
+// +JDK
+
+package abstract
+
+abstract class MyAbstractClass() {
+    //properties
+    val <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>a<!>: Int
+    val a1: Int = 1
+    abstract val a2: Int
+    abstract val a3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>1<!>
+
+    var <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>b<!>: Int                private set
+    var b1: Int = 0;                         private set
+    abstract var b2: Int      private set
+    abstract var b3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; private set
+
+    var <!MUST_BE_INITIALIZED!>c<!>: Int                set(v: Int) { $c = v }
+    var c1: Int = 0;                         set(v: Int) { $c1 = v }
+    abstract var c2: Int                     <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { $c2 = v }<!>
+    abstract var c3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { $c3 = v }<!>
+
+    val e: Int                               get() = a
+    val e1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>;          get() = a
+    abstract val e2: Int                     <!ABSTRACT_PROPERTY_WITH_GETTER!>get() = a<!>
+    abstract val e3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; <!ABSTRACT_PROPERTY_WITH_GETTER!>get() = a<!>
+
+    //methods
+    fun <!NON_ABSTRACT_FUNCTION_WITH_NO_BODY!>f<!>()
+    fun g() {}
+    abstract fun h()
+    <!ABSTRACT_FUNCTION_WITH_BODY!>abstract<!> fun j() {}
+
+    //property accessors
+    var i: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
+    var i1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>;  <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
+
+    var j: Int                       get() = i;    <!ILLEGAL_MODIFIER!>abstract<!> set
+    var j1: Int                      get() = i;    <!ILLEGAL_MODIFIER!>abstract<!> set
+
+    var <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>k<!>: Int        <!ILLEGAL_MODIFIER!>abstract<!> set
+    var k1: Int = 0;                 <!ILLEGAL_MODIFIER!>abstract<!> set
+
+    var l: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
+    var l1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>;  <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
+
+    var n: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get <!ILLEGAL_MODIFIER!>abstract<!> set(v: Int) {}
+}
+
diff --git a/compiler/testData/diagnostics/tests/AbstractInClass.jet b/compiler/testData/diagnostics/tests/AbstractInClass.jet
new file mode 100644
index 00000000000..f21d50ead35
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/AbstractInClass.jet
@@ -0,0 +1,49 @@
+// FILE: a.kt
+// +JDK
+
+package abstract
+
+class MyClass() {
+    //properties
+    val <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>a<!>: Int
+    val a1: Int = 1
+    <!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> val a2: Int
+    <!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> val a3: Int = 1
+
+    var <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>b<!>: Int                private set
+    var b1: Int = 0;                         private set
+    <!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> var b2: Int      private set
+    <!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> var b3: Int = 0; private set
+
+    var <!MUST_BE_INITIALIZED!>c<!>: Int                set(v: Int) { $c = v }
+    var c1: Int = 0;                         set(v: Int) { $c1 = v }
+    <!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> var c2: Int      set(v: Int) { $c2 = v }
+    <!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> var c3: Int = 0; set(v: Int) { $c3 = v }
+
+    val e: Int                               get() = a
+    val e1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>;          get() = a
+    <!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> val e2: Int      get() = a
+    <!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> val e3: Int = 0; get() = a
+
+    //methods
+    fun <!NON_ABSTRACT_FUNCTION_WITH_NO_BODY!>f<!>()
+    fun g() {}
+    <!ABSTRACT_FUNCTION_IN_NON_ABSTRACT_CLASS!>abstract<!> fun h()
+    <!ABSTRACT_FUNCTION_IN_NON_ABSTRACT_CLASS, ABSTRACT_FUNCTION_WITH_BODY!>abstract<!> fun j() {}
+
+    //property accessors
+    var i: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
+    var i1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>;  <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
+
+    var j: Int                       get() = i;    <!ILLEGAL_MODIFIER!>abstract<!> set
+    var j1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>;  get() = i;    <!ILLEGAL_MODIFIER!>abstract<!> set
+
+    var <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>k<!>: Int        <!ILLEGAL_MODIFIER!>abstract<!> set
+    var k1: Int = 0;                 <!ILLEGAL_MODIFIER!>abstract<!> set
+
+    var l: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
+    var l1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>;  <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
+
+    var n: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get <!ILLEGAL_MODIFIER!>abstract<!> set(v: Int) {}
+}
+
diff --git a/compiler/testData/diagnostics/tests/AbstractInEnum.jet b/compiler/testData/diagnostics/tests/AbstractInEnum.jet
new file mode 100644
index 00000000000..bc95f8b79ee
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/AbstractInEnum.jet
@@ -0,0 +1,50 @@
+// FILE: a.kt
+// +JDK
+
+package abstract
+
+
+enum class MyEnum() {
+    //properties
+    val <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>a<!>: Int
+    val a1: Int = 1
+    abstract val a2: Int
+    abstract val a3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>1<!>
+
+    var <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>b<!>: Int                private set
+    var b1: Int = 0;                         private set
+    abstract var b2: Int      private set
+    abstract var b3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; private set
+
+    var <!MUST_BE_INITIALIZED!>c<!>: Int                set(v: Int) { $c = v }
+    var c1: Int = 0;                         set(v: Int) { $c1 = v }
+    abstract var c2: Int                     <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { $c2 = v }<!>
+    abstract var c3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { $c3 = v }<!>
+
+    val e: Int                               get() = a
+    val e1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>;          get() = a
+    abstract val e2: Int                     <!ABSTRACT_PROPERTY_WITH_GETTER!>get() = a<!>
+    abstract val e3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; <!ABSTRACT_PROPERTY_WITH_GETTER!>get() = a<!>
+
+    //methods
+    fun <!NON_ABSTRACT_FUNCTION_WITH_NO_BODY!>f<!>()
+    fun g() {}
+    abstract fun h()
+    <!ABSTRACT_FUNCTION_WITH_BODY!>abstract<!> fun j() {}
+
+    //property accessors
+    var i: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
+    var i1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>;  <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
+
+    var j: Int                       get() = i;    <!ILLEGAL_MODIFIER!>abstract<!> set
+    var j1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>;  get() = i;    <!ILLEGAL_MODIFIER!>abstract<!> set
+
+    var <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>k<!>: Int        <!ILLEGAL_MODIFIER!>abstract<!> set
+    var k1: Int = 0;                 <!ILLEGAL_MODIFIER!>abstract<!> set
+
+    var l: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
+    var l1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>;   <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
+
+    var n: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get <!ILLEGAL_MODIFIER!>abstract<!> set(v: Int) {}
+}
+
diff --git a/compiler/testData/diagnostics/tests/AbstractInTrait.jet b/compiler/testData/diagnostics/tests/AbstractInTrait.jet
new file mode 100644
index 00000000000..4f1f0345e74
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/AbstractInTrait.jet
@@ -0,0 +1,49 @@
+// FILE: a.kt
+// +JDK
+
+package abstract
+
+trait MyTrait {
+    //properties
+    val a: Int
+    val a1: Int = <!PROPERTY_INITIALIZER_IN_TRAIT!>1<!>
+    <!REDUNDANT_MODIFIER_IN_TRAIT!>abstract<!> val a2: Int
+    <!REDUNDANT_MODIFIER_IN_TRAIT!>abstract<!> val a3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>1<!>
+
+    var b: Int                                                  private set
+    var b1: Int = <!PROPERTY_INITIALIZER_IN_TRAIT!>0<!>;                             private set
+    <!REDUNDANT_MODIFIER_IN_TRAIT!>abstract<!> var b2: Int                     private set
+    <!REDUNDANT_MODIFIER_IN_TRAIT!>abstract<!> var b3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; private set
+
+    var <!BACKING_FIELD_IN_TRAIT!>c<!>: Int                                   set(v: Int) { $c = v }
+    var <!BACKING_FIELD_IN_TRAIT!>c1<!>: Int = <!PROPERTY_INITIALIZER_IN_TRAIT!>0<!>;              set(v: Int) { $c1 = v }
+    <!REDUNDANT_MODIFIER_IN_TRAIT!>abstract<!> var c2: Int                     <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { $c2 = v }<!>
+    <!REDUNDANT_MODIFIER_IN_TRAIT!>abstract<!> var c3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { $c3 = v }<!>
+
+    val e: Int                                                  get() = a
+    val e1: Int = <!PROPERTY_INITIALIZER_IN_TRAIT!>0<!>;                             get() = a
+    <!REDUNDANT_MODIFIER_IN_TRAIT!>abstract<!> val e2: Int                     <!ABSTRACT_PROPERTY_WITH_GETTER!>get() = a<!>
+    <!REDUNDANT_MODIFIER_IN_TRAIT!>abstract<!> val e3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; <!ABSTRACT_PROPERTY_WITH_GETTER!>get() = a<!>
+
+    //methods
+    fun f()
+    fun g() {}
+    <!REDUNDANT_MODIFIER_IN_TRAIT!>abstract<!> fun h()
+    <!REDUNDANT_MODIFIER_IN_TRAIT, ABSTRACT_FUNCTION_WITH_BODY!>abstract<!> fun j() {}
+
+    //property accessors
+    var i: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
+    var i1: Int = <!PROPERTY_INITIALIZER_IN_TRAIT!>0<!>;  <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
+
+    var j: Int                       get() = i;    <!ILLEGAL_MODIFIER!>abstract<!> set
+    var j1: Int = <!PROPERTY_INITIALIZER_IN_TRAIT!>0<!>;  get() = i;    <!ILLEGAL_MODIFIER!>abstract<!> set
+
+    var k: Int                       <!ILLEGAL_MODIFIER!>abstract<!> set
+    var k1: Int = <!PROPERTY_INITIALIZER_IN_TRAIT!>0<!>;  <!ILLEGAL_MODIFIER!>abstract<!> set
+
+    var l: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
+    var l1: Int = <!PROPERTY_INITIALIZER_IN_TRAIT!>0<!>;  <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
+
+    var n: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get <!ILLEGAL_MODIFIER!>abstract<!> set(v: Int) {}
+}
+