diff --git a/bin/phptal-lint b/bin/phptal-lint
index a47e778..9e25e65 100755
--- a/bin/phptal-lint
+++ b/bin/phptal-lint
@@ -1,6 +1,6 @@
 #!/usr/bin/env php
 <?php
-require __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__ . '/../vendor/autoload.php';
 
 use Scn\PhpTalLint\PhpTalLintCli;
 use Scn\PhpTalLint\TestRunner;
diff --git a/composer.json b/composer.json
index 4e109d9..1854c0e 100644
--- a/composer.json
+++ b/composer.json
@@ -28,14 +28,16 @@
             "Scn\\PhpTalLint\\": "src/"
         }
     },
+	"bin": [
+		"bin/phptal-lint"
+	],
     "config": {
         "platform": {
             "php": "5.6"
-        },
-        "bin-dir": "bin"
+        }
     },
     "scripts": {
-        "tests": "bin/phpunit -c phpunit.xml",
+        "tests": "./vendor/bin/phpunit -c phpunit.xml",
         "lint-tests": "bin/phptal-lint -d tests/files"
     },
     "scripts-descriptions": {