diff --git a/composer.json b/composer.json
index 296c5b921..e0e529ab0 100644
--- a/composer.json
+++ b/composer.json
@@ -63,6 +63,11 @@
             "**/Database/Migrations/**"
         ]
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\": "tests/"
+        }
+    },
     "config": {
         "allow-plugins": {
             "phpstan/extension-installer": true
diff --git a/tests/Helpers/UrlHelperTest.php b/tests/Helpers/UrlHelperTest.php
new file mode 100644
index 000000000..cdcd8301a
--- /dev/null
+++ b/tests/Helpers/UrlHelperTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Tests\Helpers;
+
+use PHPUnit\Framework\TestCase;
+
+class UrlHelperTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        require_once __DIR__ . '/../../app/Helpers/url_helper.php';
+    }
+
+    public function testBase64urlEncode(): void
+    {
+        $data = 'Test data';
+        $encoded = base64url_encode($data);
+
+        $this->assertMatchesRegularExpression('/^[A-Za-z0-9\-_]+$/', $encoded);
+
+        $decoded = base64url_decode($encoded);
+        $this->assertEquals($data, $decoded);
+    }
+}
\ No newline at end of file
diff --git a/tests/helpers/UrlHelperTest.php b/tests/helpers/UrlHelperTest.php
deleted file mode 100644
index d49bc279c..000000000
--- a/tests/helpers/UrlHelperTest.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-    use PHPUnit\Framework\TestCase;
-
-    class UrlHelperTest extends TestCase
-    {
-        protected function setUp(): void
-        {
-            // Include the url_helper.php file
-            require_once __DIR__ . '/../../app/Helpers/url_helper.php';
-        }
-
-        public function testBase64urlEncode(): void
-        {
-            $data = 'Test data';
-            $encoded = base64url_encode($data);
-
-            // Assert that the encoded string is URL-safe
-            $this->assertMatchesRegularExpression('/^[A-Za-z0-9\-_]+$/', $encoded);
-
-            // Assert that decoding the encoded string returns the original data
-            $decoded = base64url_decode($encoded);
-            $this->assertEquals($data, $decoded);
-        }
-    }