diff --git a/composer.json b/composer.json
index e65e3de..ef0784c 100644
--- a/composer.json
+++ b/composer.json
@@ -28,9 +28,11 @@
         "symfony/yaml": "~2.1"
     },
     "autoload": {
-        "psr-0": { "Sylius\\Bundle\\FlowBundle\\": "" }
+        "psr-4": { "Sylius\\Bundle\\FlowBundle\\": "" }
+    },
+    "autoload-dev": {
+        "psr-4": { "Sylius\\Bundle\\FlowBundle\\Tests\\": "Tests/" }
     },
-    "target-dir": "Sylius/Bundle/FlowBundle",
     "extra": {
         "branch-alias": {
             "dev-master": "0.10-dev"