diff --git a/.travis.yml b/.travis.yml
index 244a210..6007ef5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,5 @@
 language: php
 
-env:
-  - NETTE=default
-  - NETTE=nette-2.0
-  - NETTE=nette-2.1
-  - NETTE=nette-2.2
-
 php:
   - 5.3.3
   - 5.4
@@ -17,13 +11,15 @@ matrix:
   allow_failures:
     - php: hhvm
 
-before_script:
-  - php ./tests/prepare-composer.php
+install:
   - composer self-update
-  - composer install --dev --prefer-source --no-interaction
+  - composer install --prefer-source --no-interaction --optimize-autoloader
+
+before_script:
   - ./vendor/bin/parallel-lint -e php,phpt --exclude vendor .
 
-script: ./vendor/bin/tester -c ./tests/php.ini-unix ./tests/CronnerTests/
+script:
+  - ./vendor/bin/tester -s -j 32 -c ./tests/php.ini-unix ./tests/CronnerTests
 
 after_failure:
   - 'for i in $(find ./tests -name \*.actual); do echo "--- $i"; cat $i; echo; echo; done'
diff --git a/tests/composer-nette-2.0.json b/tests/composer-nette-2.0.json
deleted file mode 100644
index d7cf9e7..0000000
--- a/tests/composer-nette-2.0.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"name": "stekycz/cronner",
-	"type": "nette-addon",
-	"description": "Simple tool which helps with maintenance of cron tasks.",
-	"keywords": ["nette", "cron", "manager", "task"],
-	"license": "MIT",
-	"authors": [
-		{
-			"name": "Martin Štekl",
-			"email": "martin.stekl@gmail.com",
-			"role": "Developer"
-		}
-	],
-	"support": {
-		"email": "martin.stekl@gmail.com",
-		"issues": "https://github.com/stekycz/Cronner/issues",
-		"source": "https://github.com/stekycz/Cronner"
-	},
-	"require": {
-		"php": ">=5.3.3",
-		"nette/nette": "~2.0.0"
-	},
-	"require-dev": {
-		"nette/tester": "~1.2",
-		"janmarek/mockista": "~1.0",
-		"jakub-onderka/php-parallel-lint": "~0.7"
-	},
-	"suggest": {
-		"kdyby/events": "Events for Nette Framework",
-		"kdyby/console": "Symfony Console integration for Kdyby components"
-	},
-	"autoload": {
-		"classmap": ["Cronner/"]
-	}
-}
diff --git a/tests/composer-nette-2.1.json b/tests/composer-nette-2.1.json
deleted file mode 100644
index dd985e6..0000000
--- a/tests/composer-nette-2.1.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"name": "stekycz/cronner",
-	"type": "nette-addon",
-	"description": "Simple tool which helps with maintenance of cron tasks.",
-	"keywords": ["nette", "cron", "manager", "task"],
-	"license": "MIT",
-	"authors": [
-		{
-			"name": "Martin Štekl",
-			"email": "martin.stekl@gmail.com",
-			"role": "Developer"
-		}
-	],
-	"support": {
-		"email": "martin.stekl@gmail.com",
-		"issues": "https://github.com/stekycz/Cronner/issues",
-		"source": "https://github.com/stekycz/Cronner"
-	},
-	"require": {
-		"php": ">=5.3.3",
-		"nette/nette": "~2.1.0"
-	},
-	"require-dev": {
-		"nette/tester": "~1.2",
-		"janmarek/mockista": "~1.0",
-		"jakub-onderka/php-parallel-lint": "~0.7"
-	},
-	"suggest": {
-		"kdyby/events": "Events for Nette Framework",
-		"kdyby/console": "Symfony Console integration for Kdyby components"
-	},
-	"autoload": {
-		"classmap": ["Cronner/"]
-	}
-}
diff --git a/tests/composer-nette-2.2.json b/tests/composer-nette-2.2.json
deleted file mode 100644
index 092f900..0000000
--- a/tests/composer-nette-2.2.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"name": "stekycz/cronner",
-	"type": "nette-addon",
-	"description": "Simple tool which helps with maintenance of cron tasks.",
-	"keywords": ["nette", "cron", "manager", "task"],
-	"license": "MIT",
-	"authors": [
-		{
-			"name": "Martin Štekl",
-			"email": "martin.stekl@gmail.com",
-			"role": "Developer"
-		}
-	],
-	"support": {
-		"email": "martin.stekl@gmail.com",
-		"issues": "https://github.com/stekycz/Cronner/issues",
-		"source": "https://github.com/stekycz/Cronner"
-	},
-	"require": {
-		"php": ">=5.3.3",
-		"tracy/tracy": "~2.2.0",
-		"nette/di": "~2.2.0",
-		"nette/bootstrap": "~2.2.0",
-		"nette/utils": "~2.2.0",
-		"nette/reflection": "~2.2.0",
-		"nette/safe-stream": "~2.2.0"
-	},
-	"require-dev": {
-		"nette/tester": "~1.2",
-		"janmarek/mockista": "~1.0",
-		"jakub-onderka/php-parallel-lint": "~0.7"
-	},
-	"suggest": {
-		"kdyby/events": "Events for Nette Framework",
-		"kdyby/console": "Symfony Console integration for Kdyby components"
-	},
-	"autoload": {
-		"classmap": ["Cronner/"]
-	}
-}
diff --git a/tests/prepare-composer.php b/tests/prepare-composer.php
deleted file mode 100644
index ddc9590..0000000
--- a/tests/prepare-composer.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-$rootDir = __DIR__ . '/..';
-$testsDir = __DIR__;
-
-if (getenv('NETTE') !== 'default') {
-	$composerFile = $testsDir . '/composer-' . getenv('NETTE') . '.json';
-
-	unlink($rootDir . '/composer.json');
-	copy($composerFile, $rootDir . '/composer.json');
-
-	echo "Using tests/", basename($composerFile);
-
-} else {
-	echo "Using default composer.json";
-}