2 files changed, 26 insertions, 5 deletions
diff --git a/test/files/neg/t6558.check b/test/files/neg/t6558.check
index bd118edec8..ea627b49ea 100644
--- a/test/files/neg/t6558.check
+++ b/test/files/neg/t6558.check
@@ -1,4 +1,10 @@
-t6558.scala:5: error: not found: type sth
-    @sth
-     ^
-one error found
+t6558.scala:16: error: not found: type classs
+  @classs
+   ^
+t6558.scala:19: error: not found: type typeparam
+  class D[@typeparam T]
+           ^
+t6558.scala:22: error: not found: type valueparam
+  	@valueparam x: Any
+         ^
+three errors found
diff --git a/test/files/neg/t6558.scala b/test/files/neg/t6558.scala
index 92c788f21e..cedd587c84 100644
--- a/test/files/neg/t6558.scala
+++ b/test/files/neg/t6558.scala
@@ -2,8 +2,23 @@ class AnnotNotFound {
   def foo(a: Any) = ()
 
   foo {
-    @sth
+    @inargument
     def foo = 0
     foo
   }
+
+  () => {
+    @infunction
+    def foo = 0
+    ()
+  }
+
+  @classs
+  class C
+
+  class D[@typeparam T]
+
+  class E(
+  	@valueparam x: Any
+  )
 }