2 files changed, 20 insertions, 1 deletions
diff --git a/test/files/neg/warn-unused-imports/sample_1.scala b/test/files/neg/warn-unused-imports/sample_1.scala
index d2f86239db..eea4d0eb4c 100644
--- a/test/files/neg/warn-unused-imports/sample_1.scala
+++ b/test/files/neg/warn-unused-imports/sample_1.scala
@@ -15,3 +15,18 @@ object Sample {
   def f(x: X) = ???
   def g(y: Y) = ???
 }
+
+import scala.language.experimental.macros
+import scala.reflect.macros.blackbox.Context
+ 
+object Macro {
+  def f: Int = macro fImpl
+  def fImpl(c: Context): c.Tree = {
+    import c.universe._
+ 
+    q"""
+     import scala.util.Random
+     42 // TODO randomize
+    """
+  }
+}
diff --git a/test/files/neg/warn-unused-imports/warn-unused-imports_2.scala b/test/files/neg/warn-unused-imports/warn-unused-imports_2.scala
index ded1186209..58fe0131d9 100644
--- a/test/files/neg/warn-unused-imports/warn-unused-imports_2.scala
+++ b/test/files/neg/warn-unused-imports/warn-unused-imports_2.scala
@@ -96,7 +96,7 @@ trait Warn {
 trait Nested {
   {
     import p1._   // warn
-    trait Warn {  // warn about unused local trait for good measure
+    trait Warn {  // don't warn about unused local trait with -Ywarn-unused:imports
       import p2._
       println(new A)
       println("abc".bippy)
@@ -153,3 +153,7 @@ trait Outsiders {
     //Future("abc".bippy)
   }
 }
+
+class MacroClient {
+  def x = Macro.f  // warn, not crash
+}