diff --git a/src/EventListener/UpdateListener.php b/src/Core/DB/UpdateListener.php
similarity index 97%
rename from src/EventListener/UpdateListener.php
rename to src/Core/DB/UpdateListener.php
index 4a1c7786f2..a06a8cc12e 100644
--- a/src/EventListener/UpdateListener.php
+++ b/src/Core/DB/UpdateListener.php
@@ -17,7 +17,7 @@
 // along with GNU social.  If not, see <http://www.gnu.org/licenses/>.
 // }}}
 
-namespace App\EventListener;
+namespace App\Core\DB;
 
 use DateTime;
 use Doctrine\ORM\Event\PreUpdateEventArgs;
diff --git a/tests/EventListener/UpdateListenerTest.php b/tests/Core/DB/UpdateListenerTest.php
similarity index 86%
rename from tests/EventListener/UpdateListenerTest.php
rename to tests/Core/DB/UpdateListenerTest.php
index b794ec65a3..b902d8677b 100644
--- a/tests/EventListener/UpdateListenerTest.php
+++ b/tests/Core/DB/UpdateListenerTest.php
@@ -26,12 +26,13 @@ use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Event\PreUpdateEventArgs;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\UnitOfWork;
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
-class UpdateListenerTest extends WebTestCase
+class UpdateListenerTest extends KernelTestCase
 {
     public function testPreUpdate()
     {
+        static::bootKernel();
         $actor = new GSActor();
         $actor->setModified(new DateTime('1999-09-23'));
         static::assertSame($actor->getModified(), new DateTime('1999-09-23'));
@@ -39,13 +40,13 @@ class UpdateListenerTest extends WebTestCase
         $em  = $this->createMock(EntityManager::class);
         $uow = $this->createMock(UnitOfWork::class);
         $em->expects(static::once())
-            ->method('getUnitOfWork')
-            ->willReturn($uow);
+           ->method('getUnitOfWork')
+           ->willReturn($uow);
 
         $md = $this->createMock(ClassMetadata::class);
         $em->expects(static::once())
-            ->method('getClassMetadata')
-            ->willReturn($md);
+           ->method('getClassMetadata')
+           ->willReturn($md);
 
         $change_set = [];
         $args       = new PreUpdateEventArgs($actor, $em, $change_set);
diff --git a/tests/Core/I18n/I18nTest.php b/tests/Core/I18n/I18nTest.php
index 545989d4eb..66be1556fb 100644
--- a/tests/Core/I18n/I18nTest.php
+++ b/tests/Core/I18n/I18nTest.php
@@ -19,15 +19,13 @@
 
 namespace App\Tests\Core\I18n;
 
-require_once __DIR__ . '/../../../config/bootstrap.php';
-
 use function App\Core\I18n\_m;
 use App\Core\I18n\I18n;
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 // use Jchook\AssertThrows\AssertThrows;
 
-class I18nTest extends WebTestCase
+class I18nTest extends KernelTestCase
 {
     // use AssertThrows;
 
diff --git a/tests/Twig/ExtensionTest.php b/tests/Twig/ExtensionTest.php
index f402340fee..b6a4a76dca 100644
--- a/tests/Twig/ExtensionTest.php
+++ b/tests/Twig/ExtensionTest.php
@@ -1,6 +1,7 @@
 <?php
 
 // {{{ License
+
 // This file is part of GNU social - https://www.gnu.org/software/social
 //
 // GNU social is free software: you can redistribute it and/or modify
@@ -15,6 +16,7 @@
 //
 // You should have received a copy of the GNU Affero General Public License
 // along with GNU social.  If not, see <http://www.gnu.org/licenses/>.
+
 // }}} License
 
 /**
@@ -63,7 +65,7 @@ class ExtensionTest extends KernelTestCase
 
             $icon_template_render = $twig->render('@public_path/assets/icons/' . $icon_file_name, ['iconClass' => 'icon icon-' . $icon_name]);
 
-            $icons_extension       = new Extension();
+            $icons_extension       = new Runtime();
             $icon_extension_render = $icons_extension->embedSvgIcon($twig, $icon_name, 'icon icon-' . $icon_name);
 
             static::assertSame($icon_template_render, $icon_extension_render);