diff --git a/.github/workflows/code-analysis.yaml b/.github/workflows/code-analysis.yaml
index c64abe6..e7864db 100644
--- a/.github/workflows/code-analysis.yaml
+++ b/.github/workflows/code-analysis.yaml
@@ -19,7 +19,7 @@ jobs:
           - name: 'Coding Standards'
             run: composer check-cs
           - name: 'Pest tests'
-            run: vendor/bin/pest
+            run: composer test
     name: ${{ matrix.actions.name }}
     runs-on: ubuntu-latest
     services:
diff --git a/composer.json b/composer.json
index e062344..8591a61 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
     "check-cs": "ecs check --ansi",
     "fix-cs": "ecs check --ansi --fix",
     "phpstan": "phpstan --memory-limit=1G",
-    "test": "pest"
+    "test": "vendor/bin/pest"
   },
   "config": {
     "allow-plugins": {
diff --git a/phpunit.xml b/phpunit.xml
index 27a4a51..956378c 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/|version|/phpunit.xsd"
-         bootstrap="tests/pest/bootstrap.php"
+         bootstrap="tests/bootstrap.php"
          colors="true"
 >
     <testsuites>
         <testsuite name="Test Suite">
-            <directory suffix="Test.php">tests/pest</directory>
+            <directory suffix="Test.php">tests</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/tests/pest/.gitignore b/tests/.gitignore
similarity index 100%
rename from tests/pest/.gitignore
rename to tests/.gitignore
diff --git a/tests/pest/Architecture/ArchitectureTest.php b/tests/Architecture/ArchitectureTest.php
similarity index 100%
rename from tests/pest/Architecture/ArchitectureTest.php
rename to tests/Architecture/ArchitectureTest.php
diff --git a/tests/pest/Feature/FunctionsTest.php b/tests/Feature/FunctionsTest.php
similarity index 100%
rename from tests/pest/Feature/FunctionsTest.php
rename to tests/Feature/FunctionsTest.php
diff --git a/tests/pest/Feature/StoreTest.php b/tests/Feature/StoreTest.php
similarity index 100%
rename from tests/pest/Feature/StoreTest.php
rename to tests/Feature/StoreTest.php
diff --git a/tests/pest/Pest.php b/tests/Pest.php
similarity index 100%
rename from tests/pest/Pest.php
rename to tests/Pest.php
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 0000000..3ff1ed7
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,5 @@
+<?php
+
+define('PROJECT_VENDOR_DIR', getenv('PROJECT_VENDOR_DIR') ?: dirname(__DIR__) . '/vendor');
+
+require realpath(PROJECT_VENDOR_DIR . '/autoload.php');
diff --git a/tests/pest/bootstrap.php b/tests/pest/bootstrap.php
deleted file mode 100644
index 169726b..0000000
--- a/tests/pest/bootstrap.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-define('PROJECT_VENDOR_DIR', getenv('PROJECT_VENDOR_DIR') ?: dirname(__DIR__, 2) . '/vendor');
-
-require realpath(PROJECT_VENDOR_DIR . '/autoload.php');
-
-// Manually require the Craft class
-require realpath(PROJECT_VENDOR_DIR . '/craftcms/cms/src/Craft.php');