diff --git a/tests/Entity/PollTest.php b/tests/Entity/PollTest.php
index 94e851e4bc..dc5a8e53f4 100644
--- a/tests/Entity/PollTest.php
+++ b/tests/Entity/PollTest.php
@@ -19,9 +19,9 @@
 namespace App\Tests\Util\Form\ActorArrayTransformer;
 
 use App\Entity\Poll;
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use PHPUnit\Framework\TestCase;
 
-class PollTest extends WebTestCase
+class PollTest extends TestCase
 {
     public function testPoll()
     {
diff --git a/tests/Twig/ExtensionTest.php b/tests/Twig/ExtensionTest.php
index b6a4a76dca..83c2af6d77 100644
--- a/tests/Twig/ExtensionTest.php
+++ b/tests/Twig/ExtensionTest.php
@@ -53,12 +53,13 @@ class ExtensionTest extends KernelTestCase
 
         //Check if every icon file as a ".svg.twig" extension
         foreach ($icon_file_names as $icon_file_name) {
-            static::assertRegExp('/.svg.twig/', $icon_file_name);
+            static::assertMatchesRegularExpression('/.svg.twig/', $icon_file_name);
         }
 
         //Check if the function gives a valid HTML with a class attribute equal to the one passed
         static::bootKernel();
-        $twig = self::$kernel->getContainer()->get('twig');
+        $container = self::$kernel->getContainer()->get('test.service_container');
+        $twig      = $container->get('twig');
 
         foreach ($icon_file_names as $icon_file_name) {
             $icon_name = basename($icon_file_name, '.svg.twig');