diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index a6366b71b..8ca3db465 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -40,6 +40,7 @@ jobs:
           php-version: "${{ matrix.php-version }}"
           extensions: apcu
           ini-values: apc.enable_cli=1
+          tools: phpunit:9
 
       - name: Get composer cache directory
         id: composer-cache
@@ -58,5 +59,8 @@ jobs:
       - name: Run Check configuration
         run: php data/bin/check_configuration.php
 
-      - name: Run Tests
+      - name: Run Lime Tests
         run: php data/bin/symfony symfony:test --trace
+
+      - name: Run PHPUnit Tests
+        run: phpunit
diff --git a/.gitignore b/.gitignore
index 3c17d4767..0644b20d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,6 @@ lib/plugins/sfDoctrinePlugin/test/functional/fixtures/log/
 /vendor
 /composer.lock
 .php-cs-fixer.cache
+.phpunit.result.cache
+phpunit.xml
+/tests/fixtures/symfony/log
diff --git a/composer.json b/composer.json
index 096711cad..d2f51a21f 100755
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,8 @@
         "swiftmailer/swiftmailer": "^5.2 || ^6.0"
     },
     "require-dev": {
-        "psr/log": "*"
+        "psr/log": "*",
+        "symfony/phpunit-bridge": "^7.0"
     },
     "autoload": {
         "files": ["autoload.php"]
@@ -26,5 +27,13 @@
     "replace": {
         "lexpress/symfony1": "^1.5"
     },
+    "scripts": {
+        "test": [
+            "@test:lime",
+            "@test:phpunit"
+        ],
+        "test:lime": "php data/bin/symfony symfony:test --trace",
+        "test:phpunit": "phpunit-9"
+    },
     "bin": ["data/bin/symfony"]
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 000000000..02172c0a2
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
+         colors="true"
+         bootstrap="tests/bootstrap.php"
+         failOnRisky="true"
+         failOnWarning="true"
+         stderr="true">
+    <php>
+        <ini name="error_reporting" value="32767" />
+        <ini name="intl.default_locale" value="en" />
+        <ini name="intl.error_level" value="0" />
+        <ini name="memory_limit" value="-1" />
+    </php>
+
+    <testsuites>
+        <testsuite name="Symfony Test Suite">
+            <directory>./tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <coverage>
+        <include>
+            <directory>./lib/</directory>
+        </include>
+    </coverage>
+</phpunit>
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 000000000..e4dbb773a
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Bridge\PhpUnit\DeprecationErrorHandler;
+
+require_once __DIR__.'/../vendor/autoload.php';
+
+if ('disabled' !== getenv('SYMFONY_DEPRECATIONS_HELPER')) {
+    DeprecationErrorHandler::register(getenv('SYMFONY_DEPRECATIONS_HELPER'));
+}