diff --git a/.gitignore b/.gitignore
index 85f9bc689c..de4a392c33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/tools
+/vendor
 /composer.lock
diff --git a/composer.json b/composer.json
index a9e4b55e47..b53dd8eb2d 100644
--- a/composer.json
+++ b/composer.json
@@ -30,9 +30,6 @@
 	"require-dev": {
 		"nette/tester": "@dev"
 	},
-	"config": {
-		"vendor-dir": "tools"
-	},
 	"autoload": {
 		"files": ["Nette/loader.php"]
 	},
diff --git a/tests/Nette/bootstrap.php b/tests/Nette/bootstrap.php
index b1c6d57035..cf6802384c 100644
--- a/tests/Nette/bootstrap.php
+++ b/tests/Nette/bootstrap.php
@@ -8,7 +8,7 @@
  */
 
 
-if (@!include __DIR__ . '/../../tools/autoload.php') {
+if (@!include __DIR__ . '/../../vendor/autoload.php') {
 	echo 'Install Nette Tester using `composer update --dev`';
 	exit(1);
 }
diff --git a/tests/RunTests.bat b/tests/RunTests.bat
index 024c86af84..d15624316a 100644
--- a/tests/RunTests.bat
+++ b/tests/RunTests.bat
@@ -1,6 +1,6 @@
 @ECHO OFF
 
-SET testRunner="%~dp0..\tools\nette\tester\Tester\tester.php"
+SET testRunner="%~dp0..\vendor\nette\tester\Tester\tester.php"
 
 IF NOT EXIST %testRunner% (
 	ECHO Nette Tester is missing. You can install it using Composer:
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index f57f9a62ab..ff71cc58f1 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -4,7 +4,7 @@
 dir=$(cd `dirname $0` && pwd)
 
 # Path to test runner script
-runnerScript="$dir/../tools/nette/tester/Tester/tester.php"
+runnerScript="$dir/../vendor/nette/tester/Tester/tester.php"
 if [ ! -f "$runnerScript" ]; then
 	echo "Nette Tester is missing. You can install it using Composer:" >&2
 	echo "php composer.phar update --dev." >&2