diff --git a/Formatter/MarkdownFormatter.php b/Formatter/MarkdownFormatter.php
index 74ae888..15c50a5 100644
--- a/Formatter/MarkdownFormatter.php
+++ b/Formatter/MarkdownFormatter.php
@@ -80,7 +80,7 @@ class MarkdownFormatter extends AbstractFormatter
             $markdown .= "\n";
         }
 
-        return $markdown;
+        return trim($markdown);
     }
 
     private function renderResourceSection($resource, array $arrayOfData)
diff --git a/Tests/Formatter/MarkdownFormatterTest.php b/Tests/Formatter/MarkdownFormatterTest.php
new file mode 100644
index 0000000..5eb2418
--- /dev/null
+++ b/Tests/Formatter/MarkdownFormatterTest.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * This file is part of the NelmioApiDocBundle.
+ *
+ * (c) Nelmio <hello@nelm.io>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Nelmio\ApiDocBundle\Tests\Formatter;
+
+use Nelmio\ApiDocBundle\Tests\WebTestCase;
+
+class MarkdownFormatterTest extends WebTestCase
+{
+    public function testFormat()
+    {
+        $container = $this->getContainer();
+
+        $extractor = $container->get('nelmio_api_doc.extractor.api_doc_extractor');
+        $data = $extractor->all();
+        $result = $container->get('nelmio_api_doc.formatter.markdown_formatter')->format($data);
+
+        $expected = <<<MARKDOWN
+# /tests #
+
+### `GET` /tests ###
+
+_index action_
+
+#### Filters ####
+
+a:
+
+  * dataType: integer
+
+b:
+
+  * dataType: string
+  * arbitrary: ["arg1","arg2"]
+
+
+### `POST` /tests ###
+
+_create test_
+
+#### Parameters ####
+
+a:
+
+  * type: string
+  * required: true
+  * description: A nice description
+
+b:
+
+  * type: string
+  * required: true
+MARKDOWN;
+
+        $this->assertEquals($expected, $result);
+    }
+}
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 8d27747..930c1c4 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!-- http://www.phpunit.de/manual/current/en/appendixes.configuration.html -->
 <phpunit
     backupGlobals               = "false"
     backupStaticAttributes      = "false"
@@ -11,10 +9,10 @@
     processIsolation            = "false"
     stopOnFailure               = "false"
     syntaxCheck                 = "false"
-    bootstrap                   = "Tests/bootstrap.php" >
+    bootstrap                   = "Tests/bootstrap.php">
 
     <testsuites>
-        <testsuite name="Project Test Suite">
+        <testsuite name="NelmioApiDocBundle Test Suite">
             <directory>Tests</directory>
         </testsuite>
     </testsuites>