diff --git a/composer.json b/composer.json
index b1e983612..4917e6dc0 100644
--- a/composer.json
+++ b/composer.json
@@ -31,5 +31,10 @@
         "psr-4": {
             "SqlParser\\": "src"
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "SqlParser\\Tests\\": "tests"
+        }
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
index f3076227d..ac6932618 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
-         bootstrap="tests/bootstrap.php"
+         bootstrap="vendor/autoload.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
diff --git a/tests/bootstrap.php b/tests/TestCase.php
similarity index 98%
rename from tests/bootstrap.php
rename to tests/TestCase.php
index 3c3c446ab..712bf97d0 100644
--- a/tests/bootstrap.php
+++ b/tests/TestCase.php
@@ -8,8 +8,7 @@
 
 use SqlParser\Lexer;
 use SqlParser\Parser;
-
-require_once 'vendor/autoload.php';
+use SqlParser\TokensList;
 
 /**
  * Implements useful methods for testing.