diff --git a/tests/Routers/Route.arrayParams.phpt b/tests/Routers/Route.arrayParams.phpt
index e6258ccc8..99fbf4b4c 100644
--- a/tests/Routers/Route.arrayParams.phpt
+++ b/tests/Routers/Route.arrayParams.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route(' ? arr=<arr>', [
diff --git a/tests/Routers/Route.basic.phpt b/tests/Routers/Route.basic.phpt
index c859699f3..c5e1d5c73 100644
--- a/tests/Routers/Route.basic.phpt
+++ b/tests/Routers/Route.basic.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('<presenter>/<action=default>/<id= \d{1,3}>');
diff --git a/tests/Routers/Route.camelcapsVsDash.phpt b/tests/Routers/Route.camelcapsVsDash.phpt
index a4f771698..8a0fa854b 100644
--- a/tests/Routers/Route.camelcapsVsDash.phpt
+++ b/tests/Routers/Route.camelcapsVsDash.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('<presenter>', [
diff --git a/tests/Routers/Route.closure.phpt b/tests/Routers/Route.closure.phpt
index 320579e86..10d29159a 100644
--- a/tests/Routers/Route.closure.phpt
+++ b/tests/Routers/Route.closure.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $closure = function() {};
diff --git a/tests/Routers/Route.combinedUrlParam.phpt b/tests/Routers/Route.combinedUrlParam.phpt
index efc4a3e36..e719b5355 100644
--- a/tests/Routers/Route.combinedUrlParam.phpt
+++ b/tests/Routers/Route.combinedUrlParam.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('extra<presenter>/<action>', [
diff --git a/tests/Routers/Route.extraDefaultParam.phpt b/tests/Routers/Route.extraDefaultParam.phpt
index 9fb39c1d3..43a6ebf8a 100644
--- a/tests/Routers/Route.extraDefaultParam.phpt
+++ b/tests/Routers/Route.extraDefaultParam.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('<presenter>/<action>/<id \d{1,3}>/', [
diff --git a/tests/Routers/Route.filter.global.phpt b/tests/Routers/Route.filter.global.phpt
index b29e946fa..f09a8f453 100644
--- a/tests/Routers/Route.filter.global.phpt
+++ b/tests/Routers/Route.filter.global.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('<presenter>', [
diff --git a/tests/Routers/Route.filter.query.phpt b/tests/Routers/Route.filter.query.phpt
index f75fdd0a3..ab9f673e1 100644
--- a/tests/Routers/Route.filter.query.phpt
+++ b/tests/Routers/Route.filter.query.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route(' ? action=<presenter>', [
diff --git a/tests/Routers/Route.filter.url.object.phpt b/tests/Routers/Route.filter.url.object.phpt
index 36e08d9d4..efd8c73ee 100644
--- a/tests/Routers/Route.filter.url.object.phpt
+++ b/tests/Routers/Route.filter.url.object.phpt
@@ -11,7 +11,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $identityMap = [];
diff --git a/tests/Routers/Route.filter.url.phpt b/tests/Routers/Route.filter.url.phpt
index 830fdf675..d8252dd24 100644
--- a/tests/Routers/Route.filter.url.phpt
+++ b/tests/Routers/Route.filter.url.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('<presenter>', [
diff --git a/tests/Routers/Route.filterTable.query.phpt b/tests/Routers/Route.filterTable.query.phpt
index afc95ed1a..bb0c903f7 100644
--- a/tests/Routers/Route.filterTable.query.phpt
+++ b/tests/Routers/Route.filterTable.query.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route(' ? action=<presenter>', [
diff --git a/tests/Routers/Route.filterTable.strict.phpt b/tests/Routers/Route.filterTable.strict.phpt
index 6d59f2d9f..5f736a265 100644
--- a/tests/Routers/Route.filterTable.strict.phpt
+++ b/tests/Routers/Route.filterTable.strict.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('<presenter>', [
diff --git a/tests/Routers/Route.filterTable.url.phpt b/tests/Routers/Route.filterTable.url.phpt
index bca18b2b6..e3b7a2664 100644
--- a/tests/Routers/Route.filterTable.url.phpt
+++ b/tests/Routers/Route.filterTable.url.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('<presenter>', [
diff --git a/tests/Routers/Route.firstOptionalParam.phpt b/tests/Routers/Route.firstOptionalParam.phpt
index 39ace0451..5eaa5a083 100644
--- a/tests/Routers/Route.firstOptionalParam.phpt
+++ b/tests/Routers/Route.firstOptionalParam.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('<presenter>/<action>/<id \d{1,3}>', [
diff --git a/tests/Routers/Route.fooParameter.default.phpt b/tests/Routers/Route.fooParameter.default.phpt
index 9ce0f1377..89f60428f 100644
--- a/tests/Routers/Route.fooParameter.default.phpt
+++ b/tests/Routers/Route.fooParameter.default.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('index<?.xml \.html?|\.php|>/', [
diff --git a/tests/Routers/Route.fooParameter.phpt b/tests/Routers/Route.fooParameter.phpt
index b09a7dbfb..f1891bcc5 100644
--- a/tests/Routers/Route.fooParameter.phpt
+++ b/tests/Routers/Route.fooParameter.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('index<?.xml>/', [
diff --git a/tests/Routers/Route.fullMatchParam.phpt b/tests/Routers/Route.fullMatchParam.phpt
index f3fed0f8f..22006d6d5 100644
--- a/tests/Routers/Route.fullMatchParam.phpt
+++ b/tests/Routers/Route.fullMatchParam.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('<param .+>', [
diff --git a/tests/Routers/Route.longParameter.phpt b/tests/Routers/Route.longParameter.phpt
index ac9fe8cf5..d5d69301c 100644
--- a/tests/Routers/Route.longParameter.phpt
+++ b/tests/Routers/Route.longParameter.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('<parameter-longer-than-32-characters>', [
diff --git a/tests/Routers/Route.mandatoryAction.phpt b/tests/Routers/Route.mandatoryAction.phpt
index 0ac19723f..96326b9e9 100644
--- a/tests/Routers/Route.mandatoryAction.phpt
+++ b/tests/Routers/Route.mandatoryAction.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('<action>', 'Default:');
diff --git a/tests/Routers/Route.modules.phpt b/tests/Routers/Route.modules.phpt
index fcfaaad20..3dbe7bfbb 100644
--- a/tests/Routers/Route.modules.phpt
+++ b/tests/Routers/Route.modules.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('<presenter>', [
diff --git a/tests/Routers/Route.noDefaultParams.phpt b/tests/Routers/Route.noDefaultParams.phpt
index f46c1954c..7175fff64 100644
--- a/tests/Routers/Route.noDefaultParams.phpt
+++ b/tests/Routers/Route.noDefaultParams.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('<presenter>/<action>/<extra>', [
diff --git a/tests/Routers/Route.noParams.phpt b/tests/Routers/Route.noParams.phpt
index ebdeff66e..b559701fb 100644
--- a/tests/Routers/Route.noParams.phpt
+++ b/tests/Routers/Route.noParams.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('index.php', [
diff --git a/tests/Routers/Route.oneWay.phpt b/tests/Routers/Route.oneWay.phpt
index af38d3c83..0f4236e9e 100644
--- a/tests/Routers/Route.oneWay.phpt
+++ b/tests/Routers/Route.oneWay.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('<presenter>/<action>', [
diff --git a/tests/Routers/Route.optional.autooptional1.phpt b/tests/Routers/Route.optional.autooptional1.phpt
index f6434a220..4071d7ff0 100644
--- a/tests/Routers/Route.optional.autooptional1.phpt
+++ b/tests/Routers/Route.optional.autooptional1.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('<presenter>/[<action>/[<id \d{1,3}>]]', [
diff --git a/tests/Routers/Route.optional.autooptional2.phpt b/tests/Routers/Route.optional.autooptional2.phpt
index f67d1eece..0fa84a114 100644
--- a/tests/Routers/Route.optional.autooptional2.phpt
+++ b/tests/Routers/Route.optional.autooptional2.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('<presenter>[/<action>[/<id \d{1,3}>]]', [
diff --git a/tests/Routers/Route.optional.module.phpt b/tests/Routers/Route.optional.module.phpt
index 442cdaf0a..2e8d762ce 100644
--- a/tests/Routers/Route.optional.module.phpt
+++ b/tests/Routers/Route.optional.module.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('[<module admin|image>/]<presenter>/<action>', [
diff --git a/tests/Routers/Route.optional.nested.phpt b/tests/Routers/Route.optional.nested.phpt
index 476267071..62e66bd2b 100644
--- a/tests/Routers/Route.optional.nested.phpt
+++ b/tests/Routers/Route.optional.nested.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('[<lang [a-z]{2}>[-<sub>]/]<name>[/page-<page>]', [
diff --git a/tests/Routers/Route.optional.phpt b/tests/Routers/Route.optional.phpt
index 8dc00dd91..6892b888f 100644
--- a/tests/Routers/Route.optional.phpt
+++ b/tests/Routers/Route.optional.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('index[.html]', [
diff --git a/tests/Routers/Route.optional.precedence.phpt b/tests/Routers/Route.optional.precedence.phpt
index 7f66913c0..b245bd6a3 100644
--- a/tests/Routers/Route.optional.precedence.phpt
+++ b/tests/Routers/Route.optional.precedence.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('[<one>/][<two>]', [
diff --git a/tests/Routers/Route.optional.preferred.nested1.phpt b/tests/Routers/Route.optional.preferred.nested1.phpt
index f60fbc0b1..d1d228a25 100644
--- a/tests/Routers/Route.optional.preferred.nested1.phpt
+++ b/tests/Routers/Route.optional.preferred.nested1.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('[!<lang [a-z]{2}>[-<sub>]/]<name>[/page-<page>]', [
diff --git a/tests/Routers/Route.optional.preferred.nested2.phpt b/tests/Routers/Route.optional.preferred.nested2.phpt
index 46ffc3a93..e10d35ba5 100644
--- a/tests/Routers/Route.optional.preferred.nested2.phpt
+++ b/tests/Routers/Route.optional.preferred.nested2.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('[<lang [a-z]{2}>[!-<sub>]/]<name>[/page-<page>]', [
diff --git a/tests/Routers/Route.optional.preferred.nested3.phpt b/tests/Routers/Route.optional.preferred.nested3.phpt
index 47ac3a726..fa2a1b9c6 100644
--- a/tests/Routers/Route.optional.preferred.nested3.phpt
+++ b/tests/Routers/Route.optional.preferred.nested3.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('[!<lang [a-z]{2}>[-<sub>]/]<name>[/page-<page>]', [
diff --git a/tests/Routers/Route.optional.preferred.phpt b/tests/Routers/Route.optional.preferred.phpt
index 98d604c0c..0b726e6d5 100644
--- a/tests/Routers/Route.optional.preferred.phpt
+++ b/tests/Routers/Route.optional.preferred.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('index[!.html]', [
diff --git a/tests/Routers/Route.optional.regexp.phpt b/tests/Routers/Route.optional.regexp.phpt
index e95f9e21d..dd0ccc510 100644
--- a/tests/Routers/Route.optional.regexp.phpt
+++ b/tests/Routers/Route.optional.regexp.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('[<one [a-z]+><two [0-9]+>]', [
diff --git a/tests/Routers/Route.inc b/tests/Routers/Route.php
similarity index 95%
rename from tests/Routers/Route.inc
rename to tests/Routers/Route.php
index 15761f4de..30a129b08 100644
--- a/tests/Routers/Route.inc
+++ b/tests/Routers/Route.php
@@ -10,10 +10,10 @@
 function testRouteIn(Nette\Application\IRouter $route, $url, $expectedPresenter = NULL, $expectedParams = NULL, $expectedUrl = NULL)
 {
 	$url = new Nette\Http\UrlScript("http://example.com$url");
-	$url->appendQuery(array(
+	$url->appendQuery([
 		'test' => 'testvalue',
 		'presenter' => 'querypresenter',
-	));
+	]);
 
 	$httpRequest = new Nette\Http\Request($url);
 
@@ -38,7 +38,7 @@ function testRouteIn(Nette\Application\IRouter $route, $url, $expectedPresenter
 }
 
 
-function testRouteOut(Nette\Application\IRouter $route, $presenter, $params = array())
+function testRouteOut(Nette\Application\IRouter $route, $presenter, $params = [])
 {
 	$url = new Nette\Http\Url('http://example.com');
 	$request = new Nette\Application\Request($presenter, 'GET', $params);
diff --git a/tests/Routers/Route.secured.phpt b/tests/Routers/Route.secured.phpt
index 490dc7080..0eb26d084 100644
--- a/tests/Routers/Route.secured.phpt
+++ b/tests/Routers/Route.secured.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('<param>', [
diff --git a/tests/Routers/Route.slash.phpt b/tests/Routers/Route.slash.phpt
index f125decd1..71ff23621 100644
--- a/tests/Routers/Route.slash.phpt
+++ b/tests/Routers/Route.slash.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('<param>', [
diff --git a/tests/Routers/Route.type.phpt b/tests/Routers/Route.type.phpt
index a91328217..a09057ce2 100644
--- a/tests/Routers/Route.type.phpt
+++ b/tests/Routers/Route.type.phpt
@@ -11,7 +11,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('<id=5>');
diff --git a/tests/Routers/Route.urlEncoding.phpt b/tests/Routers/Route.urlEncoding.phpt
index dfdf77e68..ed127a73e 100644
--- a/tests/Routers/Route.urlEncoding.phpt
+++ b/tests/Routers/Route.urlEncoding.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('<param .*>', [
diff --git a/tests/Routers/Route.utf8Param.phpt b/tests/Routers/Route.utf8Param.phpt
index cdeef21ea..7868f5f64 100644
--- a/tests/Routers/Route.utf8Param.phpt
+++ b/tests/Routers/Route.utf8Param.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('<param č>', [
diff --git a/tests/Routers/Route.variables.phpt b/tests/Routers/Route.variables.phpt
index e1d8eecf1..7a4e82d6e 100644
--- a/tests/Routers/Route.variables.phpt
+++ b/tests/Routers/Route.variables.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 testRouteIn(new Route('//<?%domain%>/<path>', 'Default:default'), '/abc', 'Default', [
diff --git a/tests/Routers/Route.withAbsolutePath.phpt b/tests/Routers/Route.withAbsolutePath.phpt
index 540be3da8..1aad20312 100644
--- a/tests/Routers/Route.withAbsolutePath.phpt
+++ b/tests/Routers/Route.withAbsolutePath.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('/<abspath>/', [
diff --git a/tests/Routers/Route.withDefaultPresenterAndAction.phpt b/tests/Routers/Route.withDefaultPresenterAndAction.phpt
index a3f969fd5..b99c417e7 100644
--- a/tests/Routers/Route.withDefaultPresenterAndAction.phpt
+++ b/tests/Routers/Route.withDefaultPresenterAndAction.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('<presenter>/<action>', [
diff --git a/tests/Routers/Route.withHost.phpt b/tests/Routers/Route.withHost.phpt
index 8854d823b..0c5ea821b 100644
--- a/tests/Routers/Route.withHost.phpt
+++ b/tests/Routers/Route.withHost.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('//<host>.<domain>/<path>', [
diff --git a/tests/Routers/Route.withNamedParamsInQuery.phpt b/tests/Routers/Route.withNamedParamsInQuery.phpt
index 5995fcb1f..f8e66f559 100644
--- a/tests/Routers/Route.withNamedParamsInQuery.phpt
+++ b/tests/Routers/Route.withNamedParamsInQuery.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('?action=<presenter> & act=<action [a-z]+>', [
diff --git a/tests/Routers/Route.withParamsInQuery.phpt b/tests/Routers/Route.withParamsInQuery.phpt
index b220c6e58..7778d9ef2 100644
--- a/tests/Routers/Route.withParamsInQuery.phpt
+++ b/tests/Routers/Route.withParamsInQuery.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('<action> ? <presenter>', [
diff --git a/tests/Routers/Route.withUserClassAlt.phpt b/tests/Routers/Route.withUserClassAlt.phpt
index 83138f6cc..5bc951ea3 100644
--- a/tests/Routers/Route.withUserClassAlt.phpt
+++ b/tests/Routers/Route.withUserClassAlt.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $route = new Route('<presenter>/<id>', [
diff --git a/tests/Routers/RouteList.basic.phpt b/tests/Routers/RouteList.basic.phpt
index 389430329..b068efecd 100644
--- a/tests/Routers/RouteList.basic.phpt
+++ b/tests/Routers/RouteList.basic.phpt
@@ -11,7 +11,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Route.inc';
+require __DIR__ . '/Route.php';
 
 
 $list = new RouteList();
diff --git a/tests/UI/Presenter.formatLayoutTemplateFiles.phpt b/tests/UI/Presenter.formatLayoutTemplateFiles.phpt
index 2672f6814..f92844996 100644
--- a/tests/UI/Presenter.formatLayoutTemplateFiles.phpt
+++ b/tests/UI/Presenter.formatLayoutTemplateFiles.phpt
@@ -9,8 +9,8 @@ use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/one/Presenter1.inc';
-require __DIR__ . '/two/Presenter2.inc';
+require __DIR__ . '/one/Presenter1.php';
+require __DIR__ . '/two/Presenter2.php';
 
 
 test(function () { // with subdir templates
diff --git a/tests/UI/Presenter.formatTemplateFiles.phpt b/tests/UI/Presenter.formatTemplateFiles.phpt
index b2bb677a9..0ff370996 100644
--- a/tests/UI/Presenter.formatTemplateFiles.phpt
+++ b/tests/UI/Presenter.formatTemplateFiles.phpt
@@ -9,8 +9,8 @@ use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/one/Presenter1.inc';
-require __DIR__ . '/two/Presenter2.inc';
+require __DIR__ . '/one/Presenter1.php';
+require __DIR__ . '/two/Presenter2.php';
 
 
 test(function () { // with subdir templates
diff --git a/tests/UI/one/Presenter1.inc b/tests/UI/one/Presenter1.php
similarity index 100%
rename from tests/UI/one/Presenter1.inc
rename to tests/UI/one/Presenter1.php
diff --git a/tests/UI/two/Presenter2.inc b/tests/UI/two/Presenter2.php
similarity index 100%
rename from tests/UI/two/Presenter2.inc
rename to tests/UI/two/Presenter2.php