diff --git a/scalariform/src/test/scala/scalariform/formatter/AnnoatationFormatterTest.scala b/scalariform/src/test/scala/scalariform/formatter/AnnoatationFormatterTest.scala
new file mode 100644
index 00000000..ff5c87ac
--- /dev/null
+++ b/scalariform/src/test/scala/scalariform/formatter/AnnoatationFormatterTest.scala
@@ -0,0 +1,55 @@
+package scalariform.formatter
+
+import scalariform.parser.{CompilationUnit, ScalaParser}
+
+/**
+ * Created by bambucha on 02.03.14.
+ */
+class AnnoatationFormatterTest extends AbstractFormatterTest {
+
+  override def debug: Boolean = false
+
+  def parse(parser: ScalaParser) = parser.compilationUnitOrScript()
+
+  type Result = CompilationUnit
+
+  def format(formatter: ScalaFormatter, result: Result) = formatter.format(result)(FormatterState(indentLevel = 0))
+
+  "def asdf(@annotation one: Int, @a @b(c) two: String)" ==> "def asdf(@annotation one: Int, @a @b(c) two: String)"
+
+
+  """class X {
+    |  def asdf(
+    |    @annotation one: Int,
+    |    @a @b(c) two: String
+    |    ) = ???
+    |}
+  """.stripMargin ==>
+  """
+    |class X {
+    |  def asdf(
+    |    @annotation
+    |    one: Int,
+    |    @a @b(c)
+    |    two: String
+    |  )
+    |}
+  """.stripMargin
+
+  """class A extends B {
+    |  @SomeImportantAnnotation(param = true) override val param: Int = 1
+    |
+    |  @NotSoImportantAnnotation(param = false) val description: String = "Not so important"
+    |}
+  """.stripMargin ==>
+  """class A extends B {
+    |  @SomeImportantAnnotation(param = true)
+    |  override val param: Int = 1
+    |
+    |  @NotSoImportantAnnotation(param = false)
+    |  val description: String = "Not so important"
+    |}
+  """.stripMargin
+
+
+}