diff --git a/.php_cs b/.php_cs
index 8550239097..0350dff093 100644
--- a/.php_cs
+++ b/.php_cs
@@ -1,7 +1,7 @@
 <?php
 
 if (!class_exists('yii\cs\YiisoftConfig', true)) {
-    // @todo change error message
+    // TODO: change error message
     fwrite(STDERR, "Your php-cs-version is outdated: please upgrade it.\n");
     die(16);
 }
diff --git a/tests/framework/db/ActiveQueryTest.php b/tests/framework/db/ActiveQueryTest.php
index 2fd9fdea8a..50b8a6eda3 100644
--- a/tests/framework/db/ActiveQueryTest.php
+++ b/tests/framework/db/ActiveQueryTest.php
@@ -53,7 +53,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
     }
 
     /**
-     * @todo: tests for internal logic of prepare()
+     * @todo tests for internal logic of prepare()
      */
     public function testPrepare()
     {
@@ -72,7 +72,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
     }
 
     /**
-     * @todo: tests for internal logic of populate()
+     * @todo tests for internal logic of populate()
      */
     public function testPopulate_FilledRows()
     {
@@ -83,7 +83,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
     }
 
     /**
-     * @todo: tests for internal logic of one()
+     * @todo tests for internal logic of one()
      */
     public function testOne()
     {
@@ -93,7 +93,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
     }
 
     /**
-     * @todo: test internal logic of createCommand()
+     * @todo test internal logic of createCommand()
      */
     public function testCreateCommand()
     {
@@ -103,7 +103,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
     }
 
     /**
-     * @todo: tests for internal logic of queryScalar()
+     * @todo tests for internal logic of queryScalar()
      */
     public function testQueryScalar()
     {
@@ -113,7 +113,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
     }
 
     /**
-     * @todo: tests for internal logic of joinWith()
+     * @todo tests for internal logic of joinWith()
      */
     public function testJoinWith()
     {
@@ -125,7 +125,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
     }
 
     /**
-     * @todo: tests for internal logic of innerJoinWith()
+     * @todo tests for internal logic of innerJoinWith()
      */
     public function testInnerJoinWith()
     {
@@ -157,7 +157,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
     }
 
     /**
-     * @todo: tests for the regex inside getQueryTableName
+     * @todo tests for the regex inside getQueryTableName
      */
     public function testGetQueryTableName_from_not_set()
     {
@@ -231,7 +231,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
     }
 
     /**
-     * @todo: tests for internal logic of viaTable()
+     * @todo tests for internal logic of viaTable()
      */
     public function testViaTable()
     {
diff --git a/tests/framework/widgets/ActiveFieldTest.php b/tests/framework/widgets/ActiveFieldTest.php
index 201ca38578..d4d94d1291 100644
--- a/tests/framework/widgets/ActiveFieldTest.php
+++ b/tests/framework/widgets/ActiveFieldTest.php
@@ -78,7 +78,7 @@ EOD;
     }
 
     /**
-     * @todo    discuss|review  Expected HTML shouldn't be wrapped only by the $content?
+     * @todo discuss|review Expected HTML shouldn't be wrapped only by the $content?
      */
     public function testRenderWithCallableContent()
     {