diff --git a/composer.json b/composer.json
index d31a44e..5d144ad 100644
--- a/composer.json
+++ b/composer.json
@@ -13,8 +13,8 @@
         "php": ">=5.4.0"
     },
     "require-dev": {
-        "phpspec/phpspec": "~2.0.0",
-        "henrikbjorn/phpspec-code-coverage" : "~1.0.1"
+        "henrikbjorn/phpspec-code-coverage": "~1.0.1",
+        "phpspec/phpspec": "^2.2"
     },
     "autoload": {
         "psr-4": {
diff --git a/spec/League/Event/CallbackListenerSpec.php b/spec/CallbackListenerSpec.php
similarity index 100%
rename from spec/League/Event/CallbackListenerSpec.php
rename to spec/CallbackListenerSpec.php
diff --git a/spec/League/Event/EmitterSpec.php b/spec/EmitterSpec.php
similarity index 100%
rename from spec/League/Event/EmitterSpec.php
rename to spec/EmitterSpec.php
diff --git a/spec/League/Event/EventSpec.php b/spec/EventSpec.php
similarity index 100%
rename from spec/League/Event/EventSpec.php
rename to spec/EventSpec.php
diff --git a/spec/League/Event/GeneratorSpec.php b/spec/GeneratorSpec.php
similarity index 100%
rename from spec/League/Event/GeneratorSpec.php
rename to spec/GeneratorSpec.php
diff --git a/spec/League/Event/ListenerAcceptorSpec.php b/spec/ListenerAcceptorSpec.php
similarity index 100%
rename from spec/League/Event/ListenerAcceptorSpec.php
rename to spec/ListenerAcceptorSpec.php
diff --git a/spec/League/Event/OneTimeListenerSpec.php b/spec/OneTimeListenerSpec.php
similarity index 100%
rename from spec/League/Event/OneTimeListenerSpec.php
rename to spec/OneTimeListenerSpec.php
diff --git a/spec/League/Event/Stub/DomainEventSpec.php b/spec/Stub/DomainEventSpec.php
similarity index 100%
rename from spec/League/Event/Stub/DomainEventSpec.php
rename to spec/Stub/DomainEventSpec.php
diff --git a/spec/League/Event/Stub/DomainGeneratorSpec.php b/spec/Stub/DomainGeneratorSpec.php
similarity index 100%
rename from spec/League/Event/Stub/DomainGeneratorSpec.php
rename to spec/Stub/DomainGeneratorSpec.php
diff --git a/spec/League/Event/Stub/EmitterTraitSpec.php b/spec/Stub/EmitterTraitSpec.php
similarity index 100%
rename from spec/League/Event/Stub/EmitterTraitSpec.php
rename to spec/Stub/EmitterTraitSpec.php
diff --git a/spec/League/Event/Stub/ListenerSpec.php b/spec/Stub/ListenerSpec.php
similarity index 100%
rename from spec/League/Event/Stub/ListenerSpec.php
rename to spec/Stub/ListenerSpec.php