diff --git a/composer.json b/composer.json
index 2887d5f..7d140d7 100644
--- a/composer.json
+++ b/composer.json
@@ -23,8 +23,12 @@
     ],
     "autoload": {
         "psr-0": {
-            "Spreadsheet": "./",
-            "Test": "./test"
+            "Spreadsheet": ""
+        }
+    },
+    "autoload-dev": {
+        "psr-0": {
+            "Test": "test"
         }
     },
     "description": "More info available on: http://pear.php.net/package/Spreadsheet_Excel_Writer",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index d25b855..5c26d15 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,4 +1,4 @@
-<phpunit bootstrap="test/bootstrap.php"
+<phpunit bootstrap="vendor/autoload.php"
          cacheTokens="false"
          colors="true"
          convertErrorsToExceptions="true"
diff --git a/test/Test/Spreadsheet/Excel/Writer/Test_Spreadsheet_Excel_Writer_WorkbookTest.php b/test/Test/Spreadsheet/Excel/Writer/WorkbookTest.php
similarity index 100%
rename from test/Test/Spreadsheet/Excel/Writer/Test_Spreadsheet_Excel_Writer_WorkbookTest.php
rename to test/Test/Spreadsheet/Excel/Writer/WorkbookTest.php
diff --git a/test/Test/Spreadsheet/Excel/Writer/Test_Spreadsheet_Excel_WriterTestCase.php b/test/Test/Spreadsheet/Excel/WriterTestCase.php
similarity index 100%
rename from test/Test/Spreadsheet/Excel/Writer/Test_Spreadsheet_Excel_WriterTestCase.php
rename to test/Test/Spreadsheet/Excel/WriterTestCase.php
diff --git a/test/bootstrap.php b/test/bootstrap.php
deleted file mode 100644
index 0ddc4c5..0000000
--- a/test/bootstrap.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-require_once __DIR__ . '/../vendor/autoload.php';
-require_once __DIR__ . '/Test/Spreadsheet/Excel/Writer/Test_Spreadsheet_Excel_WriterTestCase.php'; //@todo fix this