diff --git a/composer.json b/composer.json
index 5ea5bf9..34ef366 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,6 @@
 {
   "name": "cleantalk/antispam",
   "description": "CleanTalk APBCT Antispam classes",
-  "type": "cleantalk-apbct-lib",
   "authors": [
     {
       "name": "CleanTalk Team",
@@ -10,7 +9,6 @@
   ],
   "license": "GPL-3.0-or-later",
   "require": {
-    "cleantalk/apbct-installer": "*",
     "cleantalk/http": "*",
     "cleantalk/helper": "*",
     "cleantalk/mloader": "*",
@@ -18,13 +16,12 @@
   },
   "require-dev": {
     "vimeo/psalm": "^4.8",
-    "phpunit/phpunit": "^7.5",
+    "phpunit/phpunit": "^8.5.52",
     "squizlabs/php_codesniffer": "3.*",
     "phpcompatibility/php-compatibility": "^9.3"
   },
   "config": {
     "allow-plugins": {
-      "cleantalk/apbct-installer": true,
       "dealerdirect/phpcodesniffer-composer-installer": true
     }
   },
@@ -36,5 +33,10 @@
       "vendor/bin/psalm --no-cache --config=tests/psalm.xml",
       "vendor/bin/psalm --no-cache --config=tests/psalm.xml --taint-analysis"
     ]
+  },
+  "autoload": {
+    "psr-4": {
+      "Cleantalk\\Common\\Antispam\\": "/"
+    }
   }
 }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index 39ee1b3..0000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Autoloader for \CleantalkSP\* classes
- *
- * @param string $class
- *
- * @return void
- */
-
-spl_autoload_register(function ($class) {
-
-    // Register class auto loader
-    // Custom modules1
-    if ( strpos($class, 'Cleantalk') !== false ) {
-        $class      = str_replace('Cleantalk\Common\Antispam\\', DIRECTORY_SEPARATOR, $class);
-        $class_file = dirname(__DIR__) . $class . '.php';
-        if ( file_exists($class_file) ) {
-            require_once($class_file);
-        }
-        $lib_class_file = dirname(__DIR__) . '\lib\\' . $class . '.php';
-        if ( file_exists($lib_class_file) ) {
-            require_once($lib_class_file);
-        }
-    }
-});
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index b45853a..df01333 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <phpunit
-        bootstrap="bootstrap.php"
         colors="true"
         convertErrorsToExceptions="true"
         convertNoticesToExceptions="true"
diff --git a/tests/psalm.xml b/tests/psalm.xml
index b34f498..a17d758 100644
--- a/tests/psalm.xml
+++ b/tests/psalm.xml
@@ -3,7 +3,6 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns="https://getpsalm.org/schema/config"
         name="Psalm for Cleantalk AntiSpam Protection"
-        autoloader="./bootstrap.php"
         errorLevel="3"
         throwExceptionOnError="0"
         findUnusedCode="true"
@@ -27,4 +26,4 @@
             <directory name="../src" />
         </ignoreFiles>
     </projectFiles>
-</psalm>
\ No newline at end of file
+</psalm>