diff --git a/.gitignore b/.gitignore
index 018f0f0..2bc9dba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 composer.lock
 vendor/
-bin/
 docs/build
diff --git a/.travis.yml b/.travis.yml
index ca41392..7700946 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,8 +18,4 @@ install:
     - if [ "$DEPENDENCIES" == "lowest" ]; then composer update --prefer-lowest; fi;
 
 script:
-    - bin/behat -f progress
-    - bin/phpunit
-    - bin/phpspec run -f progress
-    - bin/phpcs -p --colors --standard=PSR2 src/ features/bootstrap/
-    - bin/phpcs -p --colors --standard=vendor/jakubzapletal/php_codesniffer-rules/psr2-without-camel-case-method-name.xml spec/ integrations/
+    - composer test
diff --git a/README.md b/README.md
index 121d2ee..78770e6 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,14 @@ $ vendor/bin/phpzone db
 This will compose a proper Docker Compose command `docker-compose -f docker-compose.yml -p myproject up` and
 execute it.
 
+## Development
+
+To run tests, run:
+
+```bash
+$ composer test
+```
+
 ## Documentation
 
 For more details visit [PhpZone Docker documentation].
diff --git a/composer.json b/composer.json
index 5c15490..faae728 100644
--- a/composer.json
+++ b/composer.json
@@ -40,8 +40,8 @@
         }
     },
 
-    "config": {
-        "bin-dir": "bin/"
+    "scripts": {
+        "test": "phpzone tests"
     },
 
     "conflict": {
diff --git a/phpzone.yml b/phpzone.yml
index 5e6d0aa..98c1441 100644
--- a/phpzone.yml
+++ b/phpzone.yml
@@ -3,8 +3,8 @@ extensions:
         tests:
             description: Run all tests
             script:
-                - bin/behat -f progress
-                - bin/phpunit
-                - bin/phpspec run -f progress
-                - bin/phpcs -p --colors --standard=PSR2 src/ features/bootstrap/
-                - bin/phpcs -p --colors --standard=vendor/jakubzapletal/php_codesniffer-rules/psr2-without-camel-case-method-name.xml spec/ integrations/
+                - behat -f progress
+                - phpunit
+                - phpspec run -f progress
+                - phpcs -p --colors --standard=PSR2 src/ features/bootstrap/
+                - phpcs -p --colors --standard=vendor/jakubzapletal/php_codesniffer-rules/psr2-without-camel-case-method-name.xml spec/ integrations/