diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 10fdd38..4756bda 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -12,7 +12,7 @@ permissions:
 
 jobs:
     test:
-        name: PHP ${{ matrix.php-version }} + ${{ matrix.dependencies }} + ${{ matrix.variant }}
+        name: PHP ${{ matrix.php-version }} + ${{ matrix.driver-version }} + ${{ matrix.dependencies }} + ${{ matrix.variant }}
 
         runs-on: ubuntu-latest
 
@@ -46,6 +46,8 @@ jobs:
                     - '8.2'
                     - '8.3'
                     - '8.4'
+                driver-version:
+                    - 'stable'
                 dependencies:
                     - 'highest'
                     - 'lowest'
@@ -56,6 +58,12 @@ jobs:
                     - 'symfony/symfony:"6.3.*"'
                     - 'symfony/symfony:"6.4.*"'
                     - 'symfony/symfony:"7.0.*"'
+                include:
+                    - php-version: '8.4'
+                      driver-version: 'mongodb/mongo-php-driver@v2.x'
+                      dependencies: 'highest'
+                      symfony-require: ''
+                      variant: 'normal'
 
         steps:
             - name: Checkout
@@ -65,6 +73,7 @@ jobs:
               uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php-version }}
+                  extensions: "mongodb-${{ matrix.driver-version }}"
 
             - name: Add PHPUnit matcher
               run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
diff --git a/composer.json b/composer.json
index cba6e6b..a5a803e 100644
--- a/composer.json
+++ b/composer.json
@@ -13,8 +13,8 @@
     ],
     "require": {
         "php": ">=8.1",
-        "ext-mongodb": "^1.21",
-        "mongodb/mongodb": "^1.21",
+        "ext-mongodb": "^1.21 || ^2.0@dev",
+        "mongodb/mongodb": "^1.21 || ^2.0@dev",
         "symfony/config": "^6.3 || ^7.0",
         "symfony/console": "^6.3 || ^7.0",
         "symfony/dependency-injection": "^6.3.5 || ^7.0",
diff --git a/src/Attribute/AutowireCollection.php b/src/Attribute/AutowireCollection.php
index a442bd7..5627157 100644
--- a/src/Attribute/AutowireCollection.php
+++ b/src/Attribute/AutowireCollection.php
@@ -34,7 +34,6 @@
 use Symfony\Component\DependencyInjection\Reference;
 
 use function is_string;
-use function ltrim;
 use function sprintf;
 
 /**
diff --git a/tests/Functional/DataCollector/DriverEventSubscriberTest.php b/tests/Functional/DataCollector/DriverEventSubscriberTest.php
index b729e89..2f9a2ce 100644
--- a/tests/Functional/DataCollector/DriverEventSubscriberTest.php
+++ b/tests/Functional/DataCollector/DriverEventSubscriberTest.php
@@ -31,7 +31,7 @@ public function collectCommandEvent(int $clientId, string $requestId, array $dat
             }
         };
 
-        $this->stopwatch = new Stopwatch();;
+        $this->stopwatch = new Stopwatch();
     }
 
     public function testCommandSucceeded(): void
diff --git a/tests/Unit/Attribute/AttributeTestCase.php b/tests/Unit/Attribute/AttributeTestCase.php
index e7ee39e..0a9ec3a 100644
--- a/tests/Unit/Attribute/AttributeTestCase.php
+++ b/tests/Unit/Attribute/AttributeTestCase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MongoDB\Bundle\Tests\Unit\Attribute;
 
 use Generator;