diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f4337ee75..eb61c82ea 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -24,9 +24,13 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           ini-values: apc.enable_cli=1
+          tools: composer:v2
         env:
             fail-fast: true
 
+      - name: Install dependencies
+        run: composer install --no-dev --classmap-authoritative
+        
       - name: "Run Tests"
         run: |
           php ./tests/run.php
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index ef3942d7a..e14aa7a67 100755
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -12,6 +12,14 @@
 
 define('DOCTRINE_DIR', $_SERVER['DOCTRINE_DIR']);
 
+/**
+ * Composer autoloader
+ */
+require DOCTRINE_DIR . '/vendor/autoload.php';
+
+/**
+ * Doctrine autoloader
+ */
 require_once(DOCTRINE_DIR . '/lib/Doctrine.php');
 
 spl_autoload_register(array('Doctrine', 'autoload'));