diff --git a/composer.json b/composer.json
index 188a3eb..7a73fec 100644
--- a/composer.json
+++ b/composer.json
@@ -37,7 +37,8 @@
         "yiisoft/yii2-debug": "*",
         "yiisoft/yii2-faker": "*",
         "flow/jsonpath": "^0.3.1",
-        "codeception/codeception": "2.2.10",
+        "phpunit/phpunit": "^5.7",
+        "codeception/codeception": "~2.3",
         "codeception/specify": "*",
         "codeception/verify": "*",
         "phploc/phploc": "^3.0.1",
diff --git a/tests/codeception/api/functional.suite.yml b/tests/codeception/api/functional.suite.yml
index 713312d..3dd11ab 100644
--- a/tests/codeception/api/functional.suite.yml
+++ b/tests/codeception/api/functional.suite.yml
@@ -12,8 +12,9 @@ modules:
     config:
         Yii2:
             configFile: '../config/api/functional.php'
-            cleanup: false
+            cleanup: true
         Redis:
             host: "%REDIS_HOST%"
             port: 6379
             database: 0
+            cleanupBefore: 'test'
diff --git a/tests/codeception/api/unit.suite.yml b/tests/codeception/api/unit.suite.yml
index e79108b..ddf9713 100644
--- a/tests/codeception/api/unit.suite.yml
+++ b/tests/codeception/api/unit.suite.yml
@@ -8,4 +8,4 @@ modules:
     config:
         Yii2:
             configFile: '../config/api/unit.php'
-            cleanup: false
+            cleanup: true
diff --git a/tests/codeception/common/_support/amqp/Helper.php b/tests/codeception/common/_support/amqp/Helper.php
index 7c6cd1b..8e2c08c 100644
--- a/tests/codeception/common/_support/amqp/Helper.php
+++ b/tests/codeception/common/_support/amqp/Helper.php
@@ -28,12 +28,9 @@ class Helper extends Module {
             return;
         }
 
-        // TODO: заменить на assertCount() после релиза Codeception 2.2.7
-        // https://github.com/Codeception/Codeception/pull/3802
-        /** @noinspection PhpUnitTestsInspection */
-        $this->assertEquals(
+        $this->assertCount(
             $num,
-            count($this->grabSentAmqpMessages($exchange)),
+            $this->grabSentAmqpMessages($exchange),
             'number of created messages is equal to ' . $num
         );
     }
diff --git a/tests/codeception/common/_support/amqp/TestComponent.php b/tests/codeception/common/_support/amqp/TestComponent.php
index 9b8e159..f305e7d 100644
--- a/tests/codeception/common/_support/amqp/TestComponent.php
+++ b/tests/codeception/common/_support/amqp/TestComponent.php
@@ -43,16 +43,16 @@ class TestComponent extends Component {
     public function getSentMessages(string $exchangeName = null) : array {
         if ($exchangeName !== null) {
             return $this->sentMessages[$exchangeName] ?? [];
-        } else {
-            $messages = [];
-            foreach($this->sentMessages as $exchangeGroup) {
-                foreach ($exchangeGroup as $message) {
-                    $messages[] = $message;
-                }
-            }
-
-            return $messages;
         }
+
+        $messages = [];
+        foreach($this->sentMessages as $exchangeGroup) {
+            foreach ($exchangeGroup as $message) {
+                $messages[] = $message;
+            }
+        }
+
+        return $messages;
     }
 
 }
diff --git a/tests/codeception/common/unit.suite.yml b/tests/codeception/common/unit.suite.yml
index 80ce5da..74f9d6a 100644
--- a/tests/codeception/common/unit.suite.yml
+++ b/tests/codeception/common/unit.suite.yml
@@ -7,4 +7,4 @@ modules:
     config:
         Yii2:
             configFile: '../config/common/unit.php'
-            cleanup: false
+            cleanup: true
diff --git a/tests/codeception/console/unit.suite.yml b/tests/codeception/console/unit.suite.yml
index 9b3ddd9..110e551 100644
--- a/tests/codeception/console/unit.suite.yml
+++ b/tests/codeception/console/unit.suite.yml
@@ -7,4 +7,4 @@ modules:
     config:
         Yii2:
             configFile: '../config/console/unit.php'
-            cleanup: false
+            cleanup: true