diff --git a/java/java-tests/testData/psi/cls/mirror/GrTrait.txt b/java/java-tests/testData/psi/cls/mirror/GrTrait.txt
new file mode 100644
index 000000000000..cde49246d284
--- /dev/null
+++ b/java/java-tests/testData/psi/cls/mirror/GrTrait.txt
@@ -0,0 +1,17 @@
+
+  // IntelliJ API Decompiler stub source generated from a class file
+  // Implementation of methods is not available
+
+package pkg;
+
+@groovy.transform.Trait
+public interface GrTrait {
+    @org.codehaus.groovy.transform.trait.Traits.Implemented
+    java.lang.Object myMethod();
+
+    @org.codehaus.groovy.transform.trait.Traits.Implemented
+    java.lang.Object getMyField();
+
+    @org.codehaus.groovy.transform.trait.Traits.Implemented
+    void setMyField(java.lang.Object o);
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/cls/mirror/pkg/GrTrait$Trait$FieldHelper.class b/java/java-tests/testData/psi/cls/mirror/pkg/GrTrait$Trait$FieldHelper.class
new file mode 100644
index 000000000000..85992893bbcb
Binary files /dev/null and b/java/java-tests/testData/psi/cls/mirror/pkg/GrTrait$Trait$FieldHelper.class differ
diff --git a/java/java-tests/testData/psi/cls/mirror/pkg/GrTrait$Trait$Helper.class b/java/java-tests/testData/psi/cls/mirror/pkg/GrTrait$Trait$Helper.class
new file mode 100644
index 000000000000..cacdbef7b18a
Binary files /dev/null and b/java/java-tests/testData/psi/cls/mirror/pkg/GrTrait$Trait$Helper.class differ
diff --git a/java/java-tests/testData/psi/cls/mirror/pkg/GrTrait.class b/java/java-tests/testData/psi/cls/mirror/pkg/GrTrait.class
new file mode 100644
index 000000000000..27d8cfa2da0a
Binary files /dev/null and b/java/java-tests/testData/psi/cls/mirror/pkg/GrTrait.class differ
diff --git a/java/java-tests/testData/psi/cls/mirror/src/pkg/GrTrait.groovy b/java/java-tests/testData/psi/cls/mirror/src/pkg/GrTrait.groovy
new file mode 100644
index 000000000000..bec2b8d19e9f
--- /dev/null
+++ b/java/java-tests/testData/psi/cls/mirror/src/pkg/GrTrait.groovy
@@ -0,0 +1,8 @@
+package pkg
+
+trait GrTrait {
+  def myField = 42
+  def myMethod() {
+    42
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/java/psi/ClsMirrorBuildingTest.java b/java/java-tests/testSrc/com/intellij/java/psi/ClsMirrorBuildingTest.java
index 45f973149d45..060dd7570af7 100644
--- a/java/java-tests/testSrc/com/intellij/java/psi/ClsMirrorBuildingTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/psi/ClsMirrorBuildingTest.java
@@ -1,17 +1,5 @@
 /*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 package com.intellij.java.psi;
 
@@ -64,6 +52,7 @@ public class ClsMirrorBuildingTest extends LightIdeaTestCase {
   public void testLocalClass() { doTest(); }
   public void testBounds() { doTest(); }
   public void testGrEnum() { doTest(); }
+  public void testGrTrait() { doTest(); }
   public void testSuspiciousParameterNames() { doTest(); }
   public void testTypeAnnotations() { doTest(); }