diff --git a/.travis.yml b/.travis.yml
index 130c3bf..028138e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,7 @@ branches:
     - master
 
 php:
-  - 7.1
   - 7.2
-  - 7.3
   - 7.4
 
 env:
@@ -18,9 +16,9 @@ matrix:
   fast_finish: true
 
   include:
-    - php: 7.2
+    - php: 7.4
       env: PHPCS=1 DEFAULT=0
-    - php: 7.2
+    - php: 7.4
       env: PHPSTAN=1 DEFAULT=0
 
 install:
diff --git a/composer.json b/composer.json
index 572bbd8..f4ab89c 100644
--- a/composer.json
+++ b/composer.json
@@ -4,12 +4,12 @@
     "type": "cakephp-plugin",
     "license": "MIT",
     "require": {
-        "cakephp/cakephp": ">=3.5.0 <4.0.0",
-        "ishanvyas22/asset-mix": "^0.6"
+        "cakephp/cakephp": "^4.1.0",
+        "ishanvyas22/asset-mix": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7.14|^6.0",
-        "cakephp/cakephp-codesniffer": "^3.0",
+        "phpunit/phpunit": "~8.5.0",
+        "cakephp/cakephp-codesniffer": "^4.2",
         "phpstan/phpstan": "^0.12.37"
     },
     "autoload": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index db83917..08c1708 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -3,7 +3,6 @@
     colors="true"
     processIsolation="false"
     stopOnFailure="false"
-    syntaxCheck="false"
     bootstrap="tests/bootstrap.php"
     >
     <php>
diff --git a/src/Controller/InertiaResponseTrait.php b/src/Controller/InertiaResponseTrait.php
index c034ae4..e00dc36 100644
--- a/src/Controller/InertiaResponseTrait.php
+++ b/src/Controller/InertiaResponseTrait.php
@@ -1,8 +1,9 @@
 <?php
+declare(strict_types=1);
 
 namespace Inertia\Controller;
 
-use Cake\Event\Event;
+use Cake\Event\EventInterface;
 use Inertia\Utility\Message;
 
 trait InertiaResponseTrait
@@ -10,7 +11,7 @@ trait InertiaResponseTrait
     /**
      * @inheritDoc
      */
-    public function beforeRender(Event $event)
+    public function beforeRender(EventInterface $event)
     {
         if ($this->isErrorStatus() || $this->isFailureStatus()) {
             return null;
@@ -83,7 +84,7 @@ private function isFailureStatus()
      */
     protected function setFlashData()
     {
-        /** @var \Cake\Http\Session */
+        /** @var \Cake\Http\Session $session */
         $session = $this->getRequest()->getSession();
 
         $this->set('flash', function () use ($session) {
@@ -108,6 +109,6 @@ protected function setFlashData()
      */
     private function setCsrfToken()
     {
-        $this->set('_csrfToken', $this->getRequest()->getParam('_csrfToken'));
+        $this->set('_csrfToken', $this->getRequest()->getAttribute('csrfToken'));
     }
 }
diff --git a/src/Middleware/InertiaMiddleware.php b/src/Middleware/InertiaMiddleware.php
index 92dbd12..34d56c2 100644
--- a/src/Middleware/InertiaMiddleware.php
+++ b/src/Middleware/InertiaMiddleware.php
@@ -1,33 +1,36 @@
 <?php
+declare(strict_types=1);
 
 namespace Inertia\Middleware;
 
+use Cake\Http\ServerRequest;
 use Inertia\Utility\Message;
 use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 
-class InertiaMiddleware
+class InertiaMiddleware implements MiddlewareInterface
 {
     /**
      * Invoke method.
      *
-     * @param \Cake\Http\ServerRequest $request The request.
-     * @param \Cake\Http\Response $response The response.
-     * @param callable $next Callback to invoke the next middleware.
-     * @return \Cake\Http\Response A response
+     * @param \Psr\Http\Message\ServerRequestInterface $request The request.
+     * @param \Psr\Http\Server\RequestHandlerInterface $handler The request handler.
+     * @return \Psr\Http\Message\ResponseInterface A response.
      */
-    public function __invoke($request, $response, $next)
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-        if (! $request->hasHeader('X-Inertia')) {
-            return $next($request, $response);
+        if (!$request->hasHeader('X-Inertia')) {
+            return $handler->handle($request);
+        }
+        if ($request instanceof ServerRequest) {
+            $this->setupDetectors($request);
         }
 
-        $this->setupDetectors($request);
-
-        $response = $next($request, $response);
-
+        $response = $handler->handle($request);
         if (
-            $response instanceof ResponseInterface
-            && $response->getStatusCode() === Message::STATUS_FOUND
+            $response->getStatusCode() === Message::STATUS_FOUND
             && in_array($request->getMethod(), [Message::METHOD_PUT, Message::METHOD_PATCH, Message::METHOD_DELETE])
         ) {
             $response = $response->withStatus(Message::STATUS_SEE_OTHER);
@@ -44,7 +47,7 @@ public function __invoke($request, $response, $next)
      * @param  \Cake\Http\ServerRequest $request The request.
      * @return void
      */
-    private function setupDetectors($request)
+    private function setupDetectors(ServerRequest $request): void
     {
         $request->addDetector('inertia', function ($request) {
             return $request->hasHeader('X-Inertia');
diff --git a/src/Plugin.php b/src/Plugin.php
index 38e3ff6..6d2e1c0 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -1,10 +1,12 @@
 <?php
+declare(strict_types=1);
 
 namespace Inertia;
 
 use AssetMix\Plugin as AssetMixPlugin;
 use Cake\Core\BasePlugin;
 use Cake\Core\PluginApplicationInterface;
+use Cake\Http\MiddlewareQueue;
 use Inertia\Middleware\InertiaMiddleware;
 
 /**
@@ -18,7 +20,7 @@ class Plugin extends BasePlugin
      * @param \Cake\Http\MiddlewareQueue $middleware The middleware queue to update.
      * @return \Cake\Http\MiddlewareQueue
      */
-    public function middleware($middleware)
+    public function middleware(MiddlewareQueue $middleware): MiddlewareQueue
     {
         // Add middleware here.
         $middleware->add(new InertiaMiddleware());
@@ -27,9 +29,9 @@ public function middleware($middleware)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
-    public function bootstrap(PluginApplicationInterface $app)
+    public function bootstrap(PluginApplicationInterface $app): void
     {
         parent::bootstrap($app);
 
diff --git a/src/Utility/Message.php b/src/Utility/Message.php
index cd34032..bbce5ee 100644
--- a/src/Utility/Message.php
+++ b/src/Utility/Message.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Inertia\Utility;
 
 use Cake\Http\Client\Message as CakeMessage;
@@ -10,26 +12,26 @@ class Message extends CakeMessage
      *
      * @var int
      */
-    const STATUS_NOT_FOUND = 404;
+    public const STATUS_NOT_FOUND = 404;
 
     /**
      * HTTP 409 code
      *
      * @var int
      */
-    const STATUS_CONFLICT = 409;
+    public const STATUS_CONFLICT = 409;
 
     /**
      * HTTP 422 code
      *
      * @var int
      */
-    const STATUS_UNPROCESSABLE_ENTITY = 422;
+    public const STATUS_UNPROCESSABLE_ENTITY = 422;
 
     /**
      * HTTP 500 code
      *
      * @var int
      */
-    const STATUS_INTERNAL_SERVER = 500;
+    public const STATUS_INTERNAL_SERVER = 500;
 }
diff --git a/src/View/BaseViewTrait.php b/src/View/BaseViewTrait.php
index 8d4ca94..e1d154b 100644
--- a/src/View/BaseViewTrait.php
+++ b/src/View/BaseViewTrait.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Inertia\View;
 
 use Cake\Routing\Router;
@@ -38,7 +40,7 @@ private function getComponentName()
         return sprintf(
             '%s/%s',
             $this->getRequest()->getParam('controller'),
-            ucwords($this->getRequest()->getParam('action'))
+            ucwords((string)$this->getRequest()->getParam('action'))
         );
     }
 
@@ -51,7 +53,7 @@ private function getProps()
     {
         $props = [];
         $only = $this->getPartialData();
-        $onlyViewVars = (! empty($only)) ? $only : array_keys($this->viewVars);
+        $onlyViewVars = ! empty($only) ? $only : array_keys($this->viewVars);
         $passedViewVars = $this->viewVars;
 
         $this->viewVars = [];
diff --git a/src/View/Helper/InertiaHelper.php b/src/View/Helper/InertiaHelper.php
index b35044a..6e04dd3 100644
--- a/src/View/Helper/InertiaHelper.php
+++ b/src/View/Helper/InertiaHelper.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Inertia\View\Helper;
 
 use Cake\View\Helper;
@@ -8,7 +10,6 @@
  */
 class InertiaHelper extends Helper
 {
-
     /**
      * Returns inertia div.
      *
diff --git a/src/View/InertiaJsonView.php b/src/View/InertiaJsonView.php
index 03f3cc9..9b5d72b 100644
--- a/src/View/InertiaJsonView.php
+++ b/src/View/InertiaJsonView.php
@@ -1,8 +1,9 @@
 <?php
+declare(strict_types=1);
+
 namespace Inertia\View;
 
 use Cake\View\JsonView;
-use Inertia\View\BaseViewTrait;
 
 /**
  * Returns json response with provided view vars.
@@ -14,7 +15,7 @@ class InertiaJsonView extends JsonView
     /**
      * @inheritDoc
      */
-    public function render($view = null, $layout = null)
+    public function render(?string $view = null, $layout = null): string
     {
         $page = [
             'component' => $this->getComponentName(),
@@ -22,8 +23,8 @@ public function render($view = null, $layout = null)
             'props' => $this->getProps(),
         ];
 
+        $this->setConfig('serialize', 'page');
         $this->set([
-            '_serialize' => 'page',
             'page' => $page,
         ]);
 
diff --git a/src/View/InertiaWebView.php b/src/View/InertiaWebView.php
index 2f819d2..a3ed15c 100644
--- a/src/View/InertiaWebView.php
+++ b/src/View/InertiaWebView.php
@@ -1,8 +1,9 @@
 <?php
+declare(strict_types=1);
+
 namespace Inertia\View;
 
 use Cake\View\View;
-use Inertia\View\BaseViewTrait;
 
 /**
  * Renders `Inertia./Inertia/app` view with provided view vars.
@@ -14,7 +15,7 @@ class InertiaWebView extends View
     /**
      * @inheritDoc
      */
-    public function initialize()
+    public function initialize(): void
     {
         $this->loadHelper('Inertia.Inertia');
         $this->loadHelper('AssetMix.AssetMix');
@@ -23,7 +24,7 @@ public function initialize()
     /**
      * @inheritDoc
      */
-    public function render($view = null, $layout = null)
+    public function render(?string $view = null, $layout = null): string
     {
         $page = [
             'component' => $this->getComponentName(),
diff --git a/src/Template/Inertia/app.ctp b/templates/Inertia/app.php
similarity index 100%
rename from src/Template/Inertia/app.ctp
rename to templates/Inertia/app.php
diff --git a/tests/TestCase/Controller/UsersControllerTest.php b/tests/TestCase/Controller/UsersControllerTest.php
index b55d287..2c41d28 100644
--- a/tests/TestCase/Controller/UsersControllerTest.php
+++ b/tests/TestCase/Controller/UsersControllerTest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Inertia\Test\TestCase\Controller;
 
diff --git a/tests/TestCase/PluginTest.php b/tests/TestCase/PluginTest.php
index 8957917..942365d 100644
--- a/tests/TestCase/PluginTest.php
+++ b/tests/TestCase/PluginTest.php
@@ -1,10 +1,11 @@
 <?php
+declare(strict_types=1);
 
 namespace Inertia\Test;
 
 use Cake\Error\Middleware\ErrorHandlerMiddleware;
-use Cake\Http\MiddlewareQueue;
 use Cake\Http\Middleware\BodyParserMiddleware;
+use Cake\Http\MiddlewareQueue;
 use Cake\Routing\Middleware\AssetMiddleware;
 use Cake\Routing\Middleware\RoutingMiddleware;
 use Cake\TestSuite\IntegrationTestTrait;
@@ -36,9 +37,10 @@ public function testMiddleware()
 
         $middleware = $app->middleware($middleware);
 
-        $this->assertInstanceOf(ErrorHandlerMiddleware::class, $middleware->get(0));
-        $this->assertInstanceOf(AssetMiddleware::class, $middleware->get(1));
-        $this->assertInstanceOf(BodyParserMiddleware::class, $middleware->get(2));
-        $this->assertInstanceOf(RoutingMiddleware::class, $middleware->get(3));
+        $results = iterator_to_array($middleware);
+        $this->assertInstanceOf(ErrorHandlerMiddleware::class, $results[0]);
+        $this->assertInstanceOf(AssetMiddleware::class, $results[1]);
+        $this->assertInstanceOf(BodyParserMiddleware::class, $results[2]);
+        $this->assertInstanceOf(RoutingMiddleware::class, $results[3]);
     }
 }
diff --git a/tests/TestCase/View/Helper/InertiaHelperTest.php b/tests/TestCase/View/Helper/InertiaHelperTest.php
index b2ca92f..6f166b5 100644
--- a/tests/TestCase/View/Helper/InertiaHelperTest.php
+++ b/tests/TestCase/View/Helper/InertiaHelperTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Inertia\Test\TestCase\View\Helper;
 
 use Cake\TestSuite\TestCase;
@@ -10,7 +12,6 @@
  */
 class InertiaHelperTest extends TestCase
 {
-
     /**
      * Test subject
      *
@@ -23,25 +24,13 @@ class InertiaHelperTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $view = new View();
         $this->Inertia = new InertiaHelper($view);
     }
 
-    /**
-     * tearDown method
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this->Inertia);
-
-        parent::tearDown();
-    }
-
     /**
      * Test initial setup
      *
@@ -62,8 +51,8 @@ public function testItReturnsRootTemplateDiv()
 
         $result = $this->Inertia->make($page, 'app', 'container');
 
-        $this->assertContains('<div id="app"', $result);
-        $this->assertContains('page="{&quot;component&quot;:&quot;Users', $result);
-        $this->assertContains('class="container"></div>', $result);
+        $this->assertStringContainsString('<div id="app"', $result);
+        $this->assertStringContainsString('page="{&quot;component&quot;:&quot;Users', $result);
+        $this->assertStringContainsString('class="container"></div>', $result);
     }
 }
diff --git a/tests/TestCase/View/InertiaJsonViewTest.php b/tests/TestCase/View/InertiaJsonViewTest.php
index 3b189c7..be8bd47 100644
--- a/tests/TestCase/View/InertiaJsonViewTest.php
+++ b/tests/TestCase/View/InertiaJsonViewTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Inertia\Test\TestCase\View;
 
 use Cake\Http\Response;
@@ -8,7 +10,7 @@
 
 class InertiaJsonViewTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/TestCase/View/InertiaWebViewTest.php b/tests/TestCase/View/InertiaWebViewTest.php
index 3dd1930..5713829 100644
--- a/tests/TestCase/View/InertiaWebViewTest.php
+++ b/tests/TestCase/View/InertiaWebViewTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Inertia\Test\TestCase\View;
 
 use Cake\Http\Response;
@@ -8,7 +10,7 @@
 
 class InertiaWebViewTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -23,8 +25,8 @@ public function testRendersDivWithIdAppAttribute()
 
         $result = $this->View->render();
 
-        $this->assertContains('<div id="app"', $result);
-        $this->assertContains(htmlentities('"props":{"user":{"id":1,"name":"John Doe"}}'), $result);
+        $this->assertStringContainsString('<div id="app"', $result);
+        $this->assertStringContainsString(htmlentities('"props":{"user":{"id":1,"name":"John Doe"}}'), $result);
     }
 
     public function testRendersComponentName()
@@ -34,6 +36,6 @@ public function testRendersComponentName()
 
         $result = $this->View->render();
 
-        $this->assertContains('&quot;Users\/Index&quot', $result);
+        $this->assertStringContainsString('&quot;Users\/Index&quot', $result);
     }
 }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 4129c23..18ac9e4 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,10 +1,12 @@
 <?php
+declare(strict_types=1);
 
 use Cake\Cache\Cache;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\Datasource\ConnectionManager;
 use Cake\Error\ExceptionRenderer;
+use Cake\Utility\Security;
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
@@ -44,7 +46,7 @@
     'cssBaseUrl' => 'css/',
     'paths' => [
         'plugins' => [TEST_APP_DIR . 'plugins' . DS],
-        'templates' => [TEST_APP_DIR . 'src' . DS . 'Template' . DS],
+        'templates' => [TEST_APP_DIR . 'templates' . DS],
     ],
 ]);
 Configure::write('Error', [
@@ -82,5 +84,6 @@
     'timezone' => 'UTC',
 ];
 ConnectionManager::setConfig('test', $config);
+Security::setSalt('a long value no one will guess ever');
 
 Plugin::getCollection()->add(new \Inertia\Plugin());
diff --git a/tests/test_app/config/routes.php b/tests/test_app/config/routes.php
index f2aa769..a2b09d7 100644
--- a/tests/test_app/config/routes.php
+++ b/tests/test_app/config/routes.php
@@ -1,16 +1,16 @@
 <?php
 
 use Cake\Http\Middleware\CsrfProtectionMiddleware;
+use Cake\Routing\Route\DashedRoute;
 use Cake\Routing\RouteBuilder;
 use Cake\Routing\Router;
-use Cake\Routing\Route\DashedRoute;
 
 Router::reload();
 
 Router::scope('/', function (RouteBuilder $routes) {
     // Register scoped middleware for in scopes.
     $routes->registerMiddleware('csrf', new CsrfProtectionMiddleware([
-        'httpOnly' => true,
+        'httponly' => true,
     ]));
     $routes->applyMiddleware('csrf');
 
diff --git a/tests/test_app/src/Application.php b/tests/test_app/src/Application.php
index ea7c527..adb39e8 100644
--- a/tests/test_app/src/Application.php
+++ b/tests/test_app/src/Application.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace TestApp;
 
@@ -6,6 +7,7 @@
 use Cake\Error\Middleware\ErrorHandlerMiddleware;
 use Cake\Http\BaseApplication;
 use Cake\Http\Middleware\BodyParserMiddleware;
+use Cake\Http\MiddlewareQueue;
 use Cake\Routing\Middleware\AssetMiddleware;
 use Cake\Routing\Middleware\RoutingMiddleware;
 
@@ -17,10 +19,10 @@ class Application extends BaseApplication
      * @param \Cake\Http\MiddlewareQueue $middlewareQueue The middleware queue to setup.
      * @return \Cake\Http\MiddlewareQueue The updated middleware queue.
      */
-    public function middleware($middlewareQueue)
+    public function middleware(MiddlewareQueue $middlewareQueue): MiddlewareQueue
     {
         return $middlewareQueue
-            ->add(new ErrorHandlerMiddleware(null, Configure::read('Error')))
+            ->add(new ErrorHandlerMiddleware(Configure::read('Error')))
             ->add(new AssetMiddleware())
             ->add(new BodyParserMiddleware())
             ->add(new RoutingMiddleware($this));
diff --git a/tests/test_app/src/Controller/AppController.php b/tests/test_app/src/Controller/AppController.php
index 4e2219b..add2846 100644
--- a/tests/test_app/src/Controller/AppController.php
+++ b/tests/test_app/src/Controller/AppController.php
@@ -1,16 +1,17 @@
 <?php
+declare(strict_types=1);
 
 namespace TestApp\Controller;
 
 use Cake\Controller\Controller;
-use Cake\Event\Event;
+use Cake\Event\EventInterface;
 use Inertia\Controller\InertiaResponseTrait;
 
 class AppController extends Controller
 {
     use InertiaResponseTrait;
 
-    public function initialize()
+    public function initialize(): void
     {
         parent::initialize();
 
@@ -20,7 +21,7 @@ public function initialize()
         $this->loadComponent('Flash');
     }
 
-    public function beforeFilter(Event $event)
+    public function beforeFilter(EventInterface $event)
     {
         parent::beforeFilter($event);
 
diff --git a/tests/test_app/src/Controller/ErrorController.php b/tests/test_app/src/Controller/ErrorController.php
index 52ef31d..7413402 100644
--- a/tests/test_app/src/Controller/ErrorController.php
+++ b/tests/test_app/src/Controller/ErrorController.php
@@ -1,8 +1,9 @@
 <?php
+declare(strict_types=1);
 
 namespace TestApp\Controller;
 
-use Cake\Event\Event;
+use Cake\Event\EventInterface;
 use Inertia\Controller\InertiaResponseTrait;
 
 /**
@@ -21,7 +22,7 @@ class ErrorController extends AppController
      *
      * @return void
      */
-    public function initialize()
+    public function initialize(): void
     {
         $this->loadComponent('RequestHandler', [
             'enableBeforeRedirect' => false,
@@ -31,20 +32,20 @@ public function initialize()
     /**
      * beforeFilter callback.
      *
-     * @param \Cake\Event\Event $event Event.
+     * @param \Cake\Event\EventInterface $event Event.
      * @return \Cake\Http\Response|null|void
      */
-    public function beforeFilter(Event $event)
+    public function beforeFilter(EventInterface $event)
     {
     }
 
     /**
      * beforeRender callback.
      *
-     * @param \Cake\Event\Event $event Event.
+     * @param \Cake\Event\EventInterface $event Event.
      * @return \Cake\Http\Response|null|void
      */
-    public function beforeRender(Event $event)
+    public function beforeRender(EventInterface $event)
     {
         parent::beforeRender($event);
 
@@ -54,10 +55,10 @@ public function beforeRender(Event $event)
     /**
      * afterFilter callback.
      *
-     * @param \Cake\Event\Event $event Event.
+     * @param \Cake\Event\EventInterface $event Event.
      * @return \Cake\Http\Response|null|void
      */
-    public function afterFilter(Event $event)
+    public function afterFilter(EventInterface $event)
     {
     }
 }
diff --git a/tests/test_app/src/Controller/UsersController.php b/tests/test_app/src/Controller/UsersController.php
index a943a13..c6bcd7b 100644
--- a/tests/test_app/src/Controller/UsersController.php
+++ b/tests/test_app/src/Controller/UsersController.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace TestApp\Controller;
 
diff --git a/tests/test_app/src/Template/Error/error400.ctp b/tests/test_app/templates/Error/error400.php
similarity index 100%
rename from tests/test_app/src/Template/Error/error400.ctp
rename to tests/test_app/templates/Error/error400.php
diff --git a/tests/test_app/src/Template/Error/error500.ctp b/tests/test_app/templates/Error/error500.php
similarity index 100%
rename from tests/test_app/src/Template/Error/error500.ctp
rename to tests/test_app/templates/Error/error500.php
diff --git a/tests/test_app/src/Template/Layout/default.ctp b/tests/test_app/templates/layout/default.php
similarity index 100%
rename from tests/test_app/src/Template/Layout/default.ctp
rename to tests/test_app/templates/layout/default.php