diff --git a/tests/codeception/api/functional.suite.yml b/tests/codeception/api/functional.suite.yml
index 4669215..232c933 100644
--- a/tests/codeception/api/functional.suite.yml
+++ b/tests/codeception/api/functional.suite.yml
@@ -12,6 +12,7 @@ modules:
     config:
         Yii2:
             configFile: '../config/api/functional.php'
+            cleanup: true
         Redis:
             host: testredis
             port: 6379
diff --git a/tests/codeception/api/functional/AccountsChangeEmailConfirmNewEmailCest.php b/tests/codeception/api/functional/AccountsChangeEmailConfirmNewEmailCest.php
index 40fd8eb..0b8016d 100644
--- a/tests/codeception/api/functional/AccountsChangeEmailConfirmNewEmailCest.php
+++ b/tests/codeception/api/functional/AccountsChangeEmailConfirmNewEmailCest.php
@@ -1,7 +1,6 @@
 <?php
 namespace tests\codeception\api\functional;
 
-use Codeception\Specify;
 use tests\codeception\api\_pages\AccountsRoute;
 use tests\codeception\api\FunctionalTester;
 
diff --git a/tests/codeception/api/functional/_bootstrap.php b/tests/codeception/api/functional/_bootstrap.php
index d9488ac..b3d9bbc 100644
--- a/tests/codeception/api/functional/_bootstrap.php
+++ b/tests/codeception/api/functional/_bootstrap.php
@@ -1,4 +1 @@
 <?php
-new yii\web\Application(require __DIR__ . '/../../config/api/functional.php');
-
-\Codeception\Util\Autoload::registerSuffix('Steps', __DIR__ . DIRECTORY_SEPARATOR);
diff --git a/tests/codeception/common/_support/FixtureHelper.php b/tests/codeception/common/_support/FixtureHelper.php
index 5d198df..6e5dfd0 100644
--- a/tests/codeception/common/_support/FixtureHelper.php
+++ b/tests/codeception/common/_support/FixtureHelper.php
@@ -16,6 +16,8 @@ use yii\test\InitDbFixture;
 /**
  * This helper is used to populate the database with needed fixtures before any tests are run.
  * All fixtures will be loaded before the suite is started and unloaded after it completes.
+ *
+ * TODO: try to remove
  */
 class FixtureHelper extends Module {
 
@@ -52,14 +54,8 @@ class FixtureHelper extends Module {
             'accountSessions' => AccountSessionFixture::class,
             'emailActivations' => EmailActivationFixture::class,
             'usernamesHistory' => UsernameHistoryFixture::class,
-            'oauthClients' => [
-                'class' => OauthClientFixture::class,
-                'dataFile' => '@tests/codeception/common/fixtures/data/oauth-clients.php',
-            ],
-            'oauthSessions' => [
-                'class' => OauthSessionFixture::class,
-                'dataFile' => '@tests/codeception/common/fixtures/data/oauth-sessions.php',
-            ],
+            'oauthClients' => OauthClientFixture::class,
+            'oauthSessions' => OauthSessionFixture::class,
             'minecraftAccessKeys' => MinecraftAccessKeyFixture::class,
         ];
     }