diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolvePropertyViaAliasedImportTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolvePropertyViaAliasedImportTest.groovy
index 9ae3d6c04fc7..b8c11e37cea6 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolvePropertyViaAliasedImportTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolvePropertyViaAliasedImportTest.groovy
@@ -21,7 +21,7 @@ class ResolvePropertyViaAliasedImportTest extends GrHighlightingTestBase {
     fixture.addFileToProject 'com/foo/Bar.groovy', '''\
 package com.foo
 class Bar {
-  static String myProperty = 'hello'
+  static def myProperty = 'hello'
 }
 '''
   }
@@ -42,4 +42,16 @@ class Bar {
   void 'test getter with setter alias'() {
     doTest()
   }
+
+  void 'test property with alias'() {
+    doTest()
+  }
+
+  void 'test property with getter alias'() {
+    doTest()
+  }
+
+  void 'test property with setter alias'() {
+    doTest()
+  }
 }
diff --git a/plugins/groovy/testdata/resolve/imports/propertyWithAlias.groovy b/plugins/groovy/testdata/resolve/imports/propertyWithAlias.groovy
new file mode 100644
index 000000000000..4ad6bf487dd2
--- /dev/null
+++ b/plugins/groovy/testdata/resolve/imports/propertyWithAlias.groovy
@@ -0,0 +1,25 @@
+package imports
+
+import static com.foo.Bar.myProperty as abc
+
+class PropertyWithAlias {
+  def usage() {
+    abc<warning descr="'abc' cannot be applied to '()'">()</warning>
+    abc<warning descr="'abc' cannot be applied to '(java.lang.Integer)'">(1)</warning>
+    abc<warning descr="'abc' cannot be applied to '(java.lang.Integer, java.lang.Integer)'">(2, 3)</warning>
+
+    abc
+    abc = 1
+
+    <warning descr="Cannot resolve symbol 'getAbc'">getAbc</warning>
+    getAbc()
+    getAbc<warning descr="'getMyProperty' in 'com.foo.Bar' cannot be applied to '(java.lang.Integer)'">(0)</warning>
+
+    <warning descr="Cannot resolve symbol 'setAbc'">setAbc</warning>
+    setAbc()
+    setAbc(3)
+    setAbc<warning descr="'setMyProperty' in 'com.foo.Bar' cannot be applied to '(java.lang.Integer, java.lang.Integer)'">(4, 5)</warning>
+  }
+}
+
+new PropertyWithAlias().usage()
diff --git a/plugins/groovy/testdata/resolve/imports/propertyWithGetterAlias.groovy b/plugins/groovy/testdata/resolve/imports/propertyWithGetterAlias.groovy
new file mode 100644
index 000000000000..dcb274a2e7cb
--- /dev/null
+++ b/plugins/groovy/testdata/resolve/imports/propertyWithGetterAlias.groovy
@@ -0,0 +1,41 @@
+package imports
+
+import static com.foo.Bar.myProperty as getAbc
+
+class PropertyWithGetterAlias {
+  def usage() {
+    <warning descr="Cannot resolve symbol 'abc'">abc</warning>         // https://issues.apache.org/jira/browse/GROOVY-8263
+    getAbc<warning descr="'getAbc' cannot be applied to '()'">()</warning>
+    getAbc<warning descr="'getAbc' cannot be applied to '(java.lang.Integer)'">(0)</warning>
+
+    <warning descr="Cannot resolve symbol 'abc'">abc</warning> = 1
+    <warning descr="Cannot resolve symbol 'setAbc'">setAbc</warning>()
+    <warning descr="Cannot resolve symbol 'setAbc'">setAbc</warning>(3)
+    <warning descr="Cannot resolve symbol 'setAbc'">setAbc</warning>(4, 5)
+
+    getAbc
+    getGetAbc()
+    getGetAbc<warning descr="'getMyProperty' in 'com.foo.Bar' cannot be applied to '(java.lang.Integer)'">(2)</warning>
+
+    getAbc = 1
+    setGetAbc()
+    setGetAbc(3)
+    setGetAbc<warning descr="'setMyProperty' in 'com.foo.Bar' cannot be applied to '(java.lang.Integer, java.lang.Integer)'">(4, 5)</warning>
+
+    <warning descr="Cannot resolve symbol 'setAbc'">setAbc</warning>
+    <warning descr="Cannot resolve symbol 'getSetAbc'">getSetAbc</warning>()
+    <warning descr="Cannot resolve symbol 'getSetAbc'">getSetAbc</warning>(0)
+
+    <warning descr="Cannot resolve symbol 'setAbc'">setAbc</warning> = 1
+    <warning descr="Cannot resolve symbol 'setSetAbc'">setSetAbc</warning>()
+    <warning descr="Cannot resolve symbol 'setSetAbc'">setSetAbc</warning>(1)
+    <warning descr="Cannot resolve symbol 'setSetAbc'">setSetAbc</warning>(2, 3)
+
+    <warning descr="Cannot resolve symbol 'getGetAbc'">getGetAbc</warning>
+    <warning descr="Cannot resolve symbol 'setGetAbc'">setGetAbc</warning>
+    <warning descr="Cannot resolve symbol 'getSetAbc'">getSetAbc</warning>
+    <warning descr="Cannot resolve symbol 'setSetAbc'">setSetAbc</warning>
+  }
+}
+
+new PropertyWithGetterAlias().usage()
diff --git a/plugins/groovy/testdata/resolve/imports/propertyWithSetterAlias.groovy b/plugins/groovy/testdata/resolve/imports/propertyWithSetterAlias.groovy
new file mode 100644
index 000000000000..dc962205705c
--- /dev/null
+++ b/plugins/groovy/testdata/resolve/imports/propertyWithSetterAlias.groovy
@@ -0,0 +1,41 @@
+package imports
+
+import static com.foo.Bar.myProperty as setAbc
+
+class PropertyWithSetterAlias {
+  def usage() {
+    <warning descr="Cannot resolve symbol 'abc'">abc</warning>
+    <warning descr="Cannot resolve symbol 'getAbc'">getAbc</warning>()
+    <warning descr="Cannot resolve symbol 'getAbc'">getAbc</warning>(0)
+
+    <warning descr="Cannot resolve symbol 'abc'">abc</warning> = 1       // https://issues.apache.org/jira/browse/GROOVY-8263
+    setAbc<warning descr="'setAbc' cannot be applied to '()'">()</warning>
+    setAbc<warning descr="'setAbc' cannot be applied to '(java.lang.Integer)'">(3)</warning>
+    setAbc<warning descr="'setAbc' cannot be applied to '(java.lang.Integer, java.lang.Integer)'">(4, 5)</warning>
+
+    <warning descr="Cannot resolve symbol 'getAbc'">getAbc</warning>
+    <warning descr="Cannot resolve symbol 'getGetAbc'">getGetAbc</warning>()
+    <warning descr="Cannot resolve symbol 'getGetAbc'">getGetAbc</warning>(2)
+
+    <warning descr="Cannot resolve symbol 'getAbc'">getAbc</warning> = 1
+    <warning descr="Cannot resolve symbol 'setGetAbc'">setGetAbc</warning>()
+    <warning descr="Cannot resolve symbol 'setGetAbc'">setGetAbc</warning>(3)
+    <warning descr="Cannot resolve symbol 'setGetAbc'">setGetAbc</warning>(4, 5)
+
+    setAbc
+    getSetAbc()
+    getSetAbc<warning descr="'getMyProperty' in 'com.foo.Bar' cannot be applied to '(java.lang.Integer)'">(0)</warning>
+
+    setAbc = 1
+    setSetAbc()
+    setSetAbc(1)
+    setSetAbc<warning descr="'setMyProperty' in 'com.foo.Bar' cannot be applied to '(java.lang.Integer, java.lang.Integer)'">(2, 3)</warning>
+
+    <warning descr="Cannot resolve symbol 'getGetAbc'">getGetAbc</warning>
+    <warning descr="Cannot resolve symbol 'setGetAbc'">setGetAbc</warning>
+    <warning descr="Cannot resolve symbol 'getSetAbc'">getSetAbc</warning>
+    <warning descr="Cannot resolve symbol 'setSetAbc'">setSetAbc</warning>
+  }
+}
+
+new PropertyWithSetterAlias().usage()