diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php
index bc54f495d..95f5256dc 100644
--- a/src/Composer/Autoload/AutoloadGenerator.php
+++ b/src/Composer/Autoload/AutoloadGenerator.php
@@ -343,7 +343,7 @@ AUTOLOAD;
         // - https://bugs.php.net/bug.php?id=59298
 
         if ($filesCode) {
-            $filesCode = "\n".$filesCode;
+            $filesCode = "\n\n".rtrim($filesCode);
         }
 
         $file = <<<HEADER
@@ -406,8 +406,7 @@ REGISTER_AUTOLOAD;
         }
 
         $file .= <<<METHOD_FOOTER
-        \$loader->register();
-$filesCode
+        \$loader->register();{$filesCode}
 
         return \$loader;
     }
diff --git a/tests/Composer/Test/Autoload/Fixtures/php5.4/traits.php b/tests/Composer/Test/Autoload/Fixtures/php5.4/traits.php
index 34257c712..2d92c378e 100644
--- a/tests/Composer/Test/Autoload/Fixtures/php5.4/traits.php
+++ b/tests/Composer/Test/Autoload/Fixtures/php5.4/traits.php
@@ -1,7 +1,7 @@
 <?php
 namespace {
-    trait TFoo {
-
+    trait TFoo
+    {
     }
 
     class CFoo
@@ -11,16 +11,16 @@ namespace {
 }
 
 namespace Foo {
-    trait TBar {
-
+    trait TBar
+    {
     }
 
-    interface IBar {
-
+    interface IBar
+    {
     }
 
-    trait TFooBar {
-
+    trait TFooBar
+    {
     }
 
     class CBar implements IBar
diff --git a/tests/Composer/Test/FunctionalTest.php b/tests/Composer/Test/FunctionalTest.php
index 66161498c..cbc8f2598 100644
--- a/tests/Composer/Test/FunctionalTest.php
+++ b/tests/Composer/Test/FunctionalTest.php
@@ -143,4 +143,4 @@ class AllFunctionalTest extends \PHPUnit_Framework_TestCase
 
         return $processed;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Composer/Test/Json/JsonFileTest.php b/tests/Composer/Test/Json/JsonFileTest.php
index 491c8ea5e..159017aa6 100644
--- a/tests/Composer/Test/Json/JsonFileTest.php
+++ b/tests/Composer/Test/Json/JsonFileTest.php
@@ -13,7 +13,6 @@
 namespace Composer\Test\Json;
 
 use Seld\JsonLint\ParsingException;
-use Composer\Json\JsonValidationException;
 use Composer\Json\JsonFile;
 
 class JsonFileTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/Composer/Test/Mock/FactoryMock.php b/tests/Composer/Test/Mock/FactoryMock.php
index c4014a0f3..8d23f4d43 100644
--- a/tests/Composer/Test/Mock/FactoryMock.php
+++ b/tests/Composer/Test/Mock/FactoryMock.php
@@ -17,7 +17,6 @@ use Composer\Factory;
 use Composer\Repository;
 use Composer\Repository\RepositoryManager;
 use Composer\Installer;
-use Composer\Downloader;
 use Composer\IO\IOInterface;
 
 class FactoryMock extends Factory