diff --git a/composer.json b/composer.json
index 4dc61e4..d16722b 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
         }
     ],
     "scripts": {
-	"test": "phpunit -c ./test/config/config.xml test",
+	"test": "phpunit -c ./test/config.xml test",
 	"test-debug": "XDEBUG_CONFIG='idekey=ap_session' php ./vendor/bin/phpunit test"
     },
     "repositories": [
@@ -33,6 +33,11 @@
 	    "ActivityPub\\": "src/"
 	}
     },
+    "autoload-dev": {
+	"psr-4": {
+	    "ActivityPub\\Test\\": "test/"
+	}
+    },
     "config": {
 	"sort-packages": true
     }
diff --git a/test/ActivityPubTest.php b/test/ActivityPubTest.php
index 279cf5e..21450d6 100644
--- a/test/ActivityPubTest.php
+++ b/test/ActivityPubTest.php
@@ -1,10 +1,9 @@
 <?php
-require_once dirname( __FILE__ ) . '/config/SQLiteTestCase.php';
-require_once dirname( __FILE__ ) . '/config/ArrayDataSet.php';
+namespace ActivityPub\Test;
     
 use ActivityPub\ActivityPub;
-use ActivityPub\Config\SQLiteTestCase;
-use ActivityPub\Config\ArrayDataSet;
+use ActivityPub\Test\Config\SQLiteTestCase;
+use ActivityPub\Test\Config\ArrayDataSet;
 
 class ActivityPubTest extends SQLiteTestCase
 {
diff --git a/test/config/ArrayDataSet.php b/test/Config/ArrayDataSet.php
similarity index 97%
rename from test/config/ArrayDataSet.php
rename to test/Config/ArrayDataSet.php
index 5730891..e79d3be 100644
--- a/test/config/ArrayDataSet.php
+++ b/test/Config/ArrayDataSet.php
@@ -1,5 +1,5 @@
 <?php
-namespace ActivityPub\Config;
+namespace ActivityPub\Test\Config;
 
 use PHPUnit\DbUnit\DataSet\AbstractDataSet;
 use PHPUnit\DbUnit\DataSet\DefaultTableMetadata;
diff --git a/test/config/SQLiteTestCase.php b/test/Config/SQLiteTestCase.php
similarity index 97%
rename from test/config/SQLiteTestCase.php
rename to test/Config/SQLiteTestCase.php
index 0a1cadf..3542a09 100644
--- a/test/config/SQLiteTestCase.php
+++ b/test/Config/SQLiteTestCase.php
@@ -1,5 +1,5 @@
 <?php
-namespace ActivityPub\Config;
+namespace ActivityPub\Test\Config;
 
 use ActivityPub\ActivityPub;
 use PHPUnit\Framework\TestCase;
diff --git a/test/ObjectsServiceTest.php b/test/ObjectsServiceTest.php
index 4115324..1ceeee2 100644
--- a/test/ObjectsServiceTest.php
+++ b/test/ObjectsServiceTest.php
@@ -1,10 +1,8 @@
 <?php
-require_once dirname( __FILE__ ) . '/config/SQLiteTestCase.php';
-require_once dirname( __FILE__ ) . '/config/ArrayDataSet.php';
-require_once dirname( __FILE__ ) . '/../src/Objects/ObjectsService.php';
+namespace ActivityPub\Test;
 
-use ActivityPub\Config\SQLiteTestCase;
-use ActivityPub\Config\ArrayDataSet;
+use ActivityPub\Test\Config\SQLiteTestCase;
+use ActivityPub\Test\Config\ArrayDataSet;
 use ActivityPub\Entities\Field;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Tools\Setup;
diff --git a/test/config/bootstrap.php b/test/bootstrap.php
similarity index 91%
rename from test/config/bootstrap.php
rename to test/bootstrap.php
index efa5f47..379e1fb 100644
--- a/test/config/bootstrap.php
+++ b/test/bootstrap.php
@@ -1,4 +1,6 @@
 <?php
+namespace ActivityPub\Test;
+
 use ActivityPub\ActivityPub;
 
 $dbPath = dirname( __FILE__ ) . '/../db.sqlite';
diff --git a/test/config/config.xml b/test/config.xml
similarity index 100%
rename from test/config/config.xml
rename to test/config.xml