diff --git a/.travis.yml b/.travis.yml
index 3a38d05..d8200f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ before_script:
   - tests/unit/data/travis/cubrid-setup.sh
 
 script:
-  - phpunit --coverage-clover tests/unit/runtime/coveralls/clover.xml --verbose
+  - phpunit --coverage-clover tests/unit/runtime/coveralls/clover.xml --verbose --exclude-group mssql,oci,wincache,xcache,zenddata
 
 after_script:
   - php vendor/bin/coveralls
\ No newline at end of file
diff --git a/tests/unit/framework/YiiBaseTest.php b/tests/unit/framework/YiiBaseTest.php
index e256b2b..72b5f24 100644
--- a/tests/unit/framework/YiiBaseTest.php
+++ b/tests/unit/framework/YiiBaseTest.php
@@ -6,6 +6,7 @@ use yiiunit\TestCase;
 
 /**
  * YiiBaseTest
+ * @group base
  */
 class YiiBaseTest extends TestCase
 {
diff --git a/tests/unit/framework/base/BehaviorTest.php b/tests/unit/framework/base/BehaviorTest.php
index e596ea8..b6eda09 100644
--- a/tests/unit/framework/base/BehaviorTest.php
+++ b/tests/unit/framework/base/BehaviorTest.php
@@ -46,6 +46,9 @@ class BarBehavior extends Behavior
 	}
 }
 
+/**
+ * @group base
+ */
 class BehaviorTest extends TestCase
 {
 	protected function setUp()
diff --git a/tests/unit/framework/base/ComponentTest.php b/tests/unit/framework/base/ComponentTest.php
index 79fb7db..98786e2 100644
--- a/tests/unit/framework/base/ComponentTest.php
+++ b/tests/unit/framework/base/ComponentTest.php
@@ -17,6 +17,9 @@ function globalEventHandler2($event)
 	$event->handled = true;
 }
 
+/**
+ * @group base
+ */
 class ComponentTest extends TestCase
 {
 	/**
diff --git a/tests/unit/framework/base/FormatterTest.php b/tests/unit/framework/base/FormatterTest.php
index 01dd682..ae71a5c 100644
--- a/tests/unit/framework/base/FormatterTest.php
+++ b/tests/unit/framework/base/FormatterTest.php
@@ -10,9 +10,7 @@ use yii\base\Formatter;
 use yiiunit\TestCase;
 
 /**
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
+ * @group base
  */
 class FormatterTest extends TestCase
 {
diff --git a/tests/unit/framework/base/ModelTest.php b/tests/unit/framework/base/ModelTest.php
index e4d8976..b338c17 100644
--- a/tests/unit/framework/base/ModelTest.php
+++ b/tests/unit/framework/base/ModelTest.php
@@ -9,7 +9,7 @@ use yiiunit\data\base\Singer;
 use yiiunit\data\base\InvalidRulesModel;
 
 /**
- * ModelTest
+ * @group base
  */
 class ModelTest extends TestCase
 {
diff --git a/tests/unit/framework/base/ObjectTest.php b/tests/unit/framework/base/ObjectTest.php
index d6b95e5..0bd9b1d 100644
--- a/tests/unit/framework/base/ObjectTest.php
+++ b/tests/unit/framework/base/ObjectTest.php
@@ -5,7 +5,7 @@ use yii\base\Object;
 use yiiunit\TestCase;
 
 /**
- * ObjectTest
+ * @group base
  */
 class ObjectTest extends TestCase
 {
diff --git a/tests/unit/framework/behaviors/AutoTimestampTest.php b/tests/unit/framework/behaviors/AutoTimestampTest.php
index 0e17a39..c26d912 100644
--- a/tests/unit/framework/behaviors/AutoTimestampTest.php
+++ b/tests/unit/framework/behaviors/AutoTimestampTest.php
@@ -11,6 +11,8 @@ use yii\behaviors\AutoTimestamp;
 /**
  * Unit test for [[\yii\behaviors\AutoTimestamp]].
  * @see AutoTimestamp
+ *
+ * @group behaviors
  */
 class AutoTimestampTest extends TestCase
 {
diff --git a/tests/unit/framework/caching/ApcCacheTest.php b/tests/unit/framework/caching/ApcCacheTest.php
index 1d07498..adda151 100644
--- a/tests/unit/framework/caching/ApcCacheTest.php
+++ b/tests/unit/framework/caching/ApcCacheTest.php
@@ -5,6 +5,8 @@ use yii\caching\ApcCache;
 
 /**
  * Class for testing APC cache backend
+ * @group apc
+ * @group caching
  */
 class ApcCacheTest extends CacheTestCase
 {
diff --git a/tests/unit/framework/caching/DbCacheTest.php b/tests/unit/framework/caching/DbCacheTest.php
index 969b034..1e94d58 100644
--- a/tests/unit/framework/caching/DbCacheTest.php
+++ b/tests/unit/framework/caching/DbCacheTest.php
@@ -6,6 +6,8 @@ use yii\caching\DbCache;
 
 /**
  * Class for testing file cache backend
+ * @group db
+ * @group caching
  */
 class DbCacheTest extends CacheTestCase
 {
diff --git a/tests/unit/framework/caching/FileCacheTest.php b/tests/unit/framework/caching/FileCacheTest.php
index 0bdbc86..263ecb4 100644
--- a/tests/unit/framework/caching/FileCacheTest.php
+++ b/tests/unit/framework/caching/FileCacheTest.php
@@ -5,6 +5,7 @@ use yii\caching\FileCache;
 
 /**
  * Class for testing file cache backend
+ * @group caching
  */
 class FileCacheTest extends CacheTestCase
 {
diff --git a/tests/unit/framework/caching/MemCacheTest.php b/tests/unit/framework/caching/MemCacheTest.php
index d54d807..32374b5 100644
--- a/tests/unit/framework/caching/MemCacheTest.php
+++ b/tests/unit/framework/caching/MemCacheTest.php
@@ -5,6 +5,8 @@ use yii\caching\MemCache;
 
 /**
  * Class for testing memcache cache backend
+ * @group memcache
+ * @group caching
  */
 class MemCacheTest extends CacheTestCase
 {
diff --git a/tests/unit/framework/caching/MemCachedTest.php b/tests/unit/framework/caching/MemCachedTest.php
index faf0d56..f39ed17 100644
--- a/tests/unit/framework/caching/MemCachedTest.php
+++ b/tests/unit/framework/caching/MemCachedTest.php
@@ -5,6 +5,8 @@ use yii\caching\MemCache;
 
 /**
  * Class for testing memcached cache backend
+ * @group memcached
+ * @group caching
  */
 class MemCachedTest extends CacheTestCase
 {
diff --git a/tests/unit/framework/caching/RedisCacheTest.php b/tests/unit/framework/caching/RedisCacheTest.php
index 0924d0f..d02773d 100644
--- a/tests/unit/framework/caching/RedisCacheTest.php
+++ b/tests/unit/framework/caching/RedisCacheTest.php
@@ -6,6 +6,8 @@ use yiiunit\TestCase;
 
 /**
  * Class for testing redis cache backend
+ * @group redis
+ * @group caching
  */
 class RedisCacheTest extends CacheTestCase
 {
diff --git a/tests/unit/framework/caching/WinCacheTest.php b/tests/unit/framework/caching/WinCacheTest.php
index b6f2425..1bce102 100644
--- a/tests/unit/framework/caching/WinCacheTest.php
+++ b/tests/unit/framework/caching/WinCacheTest.php
@@ -5,6 +5,8 @@ use yii\caching\WinCache;
 
 /**
  * Class for testing wincache backend
+ * @group wincache
+ * @group caching
  */
 class WinCacheTest extends CacheTestCase
 {
diff --git a/tests/unit/framework/caching/XCacheTest.php b/tests/unit/framework/caching/XCacheTest.php
index 7ee0a0e..989765d 100644
--- a/tests/unit/framework/caching/XCacheTest.php
+++ b/tests/unit/framework/caching/XCacheTest.php
@@ -5,6 +5,8 @@ use yii\caching\XCache;
 
 /**
  * Class for testing xcache backend
+ * @group xcache
+ * @group caching
  */
 class XCacheTest extends CacheTestCase
 {
diff --git a/tests/unit/framework/caching/ZendDataCacheTest.php b/tests/unit/framework/caching/ZendDataCacheTest.php
index 2d68bfd..96354cd 100644
--- a/tests/unit/framework/caching/ZendDataCacheTest.php
+++ b/tests/unit/framework/caching/ZendDataCacheTest.php
@@ -6,6 +6,8 @@ use yii\caching\ZendDataCache;
 
 /**
  * Class for testing Zend cache backend
+ * @group zenddata
+ * @group caching
  */
 class ZendDataCacheTest extends CacheTestCase
 {
diff --git a/tests/unit/framework/console/controllers/AssetControllerTest.php b/tests/unit/framework/console/controllers/AssetControllerTest.php
index aaf5ca9..67dbdaa 100644
--- a/tests/unit/framework/console/controllers/AssetControllerTest.php
+++ b/tests/unit/framework/console/controllers/AssetControllerTest.php
@@ -6,6 +6,8 @@ use yii\console\controllers\AssetController;
 /**
  * Unit test for [[\yii\console\controllers\AssetController]].
  * @see AssetController
+ *
+ * @group console
  */
 class AssetControllerTest extends TestCase
 {
diff --git a/tests/unit/framework/console/controllers/MessageControllerTest.php b/tests/unit/framework/console/controllers/MessageControllerTest.php
index cdd38b8..b0c697c 100644
--- a/tests/unit/framework/console/controllers/MessageControllerTest.php
+++ b/tests/unit/framework/console/controllers/MessageControllerTest.php
@@ -6,6 +6,8 @@ use yii\console\controllers\MessageController;
 /**
  * Unit test for [[\yii\console\controllers\MessageController]].
  * @see MessageController
+ *
+ * @group console
  */
 class MessageControllerTest extends TestCase
 {
diff --git a/tests/unit/framework/data/ActiveDataProviderTest.php b/tests/unit/framework/data/ActiveDataProviderTest.php
index 2699a52..3f65ebb 100644
--- a/tests/unit/framework/data/ActiveDataProviderTest.php
+++ b/tests/unit/framework/data/ActiveDataProviderTest.php
@@ -16,6 +16,8 @@ use yiiunit\data\ar\Order;
 /**
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
+ *
+ * @group data
  */
 class ActiveDataProviderTest extends DatabaseTestCase
 {
diff --git a/tests/unit/framework/data/SortTest.php b/tests/unit/framework/data/SortTest.php
index 9891ad1..c4cc6aa 100644
--- a/tests/unit/framework/data/SortTest.php
+++ b/tests/unit/framework/data/SortTest.php
@@ -14,6 +14,8 @@ use yii\data\Sort;
 /**
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
+ *
+ * @group data
  */
 class SortTest extends TestCase
 {
diff --git a/tests/unit/framework/db/ActiveRecordTest.php b/tests/unit/framework/db/ActiveRecordTest.php
index 7df4159..2f9b345 100644
--- a/tests/unit/framework/db/ActiveRecordTest.php
+++ b/tests/unit/framework/db/ActiveRecordTest.php
@@ -9,6 +9,10 @@ use yiiunit\data\ar\OrderItem;
 use yiiunit\data\ar\Order;
 use yiiunit\data\ar\Item;
 
+/**
+ * @group db
+ * @group mysql
+ */
 class ActiveRecordTest extends DatabaseTestCase
 {
 	protected function setUp()
diff --git a/tests/unit/framework/db/CommandTest.php b/tests/unit/framework/db/CommandTest.php
index 229545d..7b16c76 100644
--- a/tests/unit/framework/db/CommandTest.php
+++ b/tests/unit/framework/db/CommandTest.php
@@ -7,6 +7,10 @@ use yii\db\Command;
 use yii\db\Query;
 use yii\db\DataReader;
 
+/**
+ * @group db
+ * @group mysql
+ */
 class CommandTest extends DatabaseTestCase
 {
 	public function testConstruct()
diff --git a/tests/unit/framework/db/ConnectionTest.php b/tests/unit/framework/db/ConnectionTest.php
index f2895f1..04c5d53 100644
--- a/tests/unit/framework/db/ConnectionTest.php
+++ b/tests/unit/framework/db/ConnectionTest.php
@@ -4,6 +4,10 @@ namespace yiiunit\framework\db;
 
 use yii\db\Connection;
 
+/**
+ * @group db
+ * @group mysql
+ */
 class ConnectionTest extends DatabaseTestCase
 {
 	public function testConstruct()
diff --git a/tests/unit/framework/db/QueryBuilderTest.php b/tests/unit/framework/db/QueryBuilderTest.php
index a2815e8..d43c901 100644
--- a/tests/unit/framework/db/QueryBuilderTest.php
+++ b/tests/unit/framework/db/QueryBuilderTest.php
@@ -10,6 +10,10 @@ use yii\db\mssql\QueryBuilder as MssqlQueryBuilder;
 use yii\db\pgsql\QueryBuilder as PgsqlQueryBuilder;
 use yii\db\cubrid\QueryBuilder as CubridQueryBuilder;
 
+/**
+ * @group db
+ * @group mysql
+ */
 class QueryBuilderTest extends DatabaseTestCase
 {
 	/**
diff --git a/tests/unit/framework/db/QueryTest.php b/tests/unit/framework/db/QueryTest.php
index dfb6c9f..a275afd 100644
--- a/tests/unit/framework/db/QueryTest.php
+++ b/tests/unit/framework/db/QueryTest.php
@@ -7,6 +7,10 @@ use yii\db\Command;
 use yii\db\Query;
 use yii\db\DataReader;
 
+/**
+ * @group db
+ * @group mysql
+ */
 class QueryTest extends DatabaseTestCase
 {
 	public function testSelect()
diff --git a/tests/unit/framework/db/SchemaTest.php b/tests/unit/framework/db/SchemaTest.php
index 5f504e1..dce6e20 100644
--- a/tests/unit/framework/db/SchemaTest.php
+++ b/tests/unit/framework/db/SchemaTest.php
@@ -5,6 +5,10 @@ namespace yiiunit\framework\db;
 use yii\caching\FileCache;
 use yii\db\Schema;
 
+/**
+ * @group db
+ * @group mysql
+ */
 class SchemaTest extends DatabaseTestCase
 {
 
diff --git a/tests/unit/framework/db/cubrid/CubridActiveRecordTest.php b/tests/unit/framework/db/cubrid/CubridActiveRecordTest.php
index 6633e11..dd48f44 100644
--- a/tests/unit/framework/db/cubrid/CubridActiveRecordTest.php
+++ b/tests/unit/framework/db/cubrid/CubridActiveRecordTest.php
@@ -3,6 +3,10 @@ namespace yiiunit\framework\db\cubrid;
 
 use yiiunit\framework\db\ActiveRecordTest;
 
+/**
+ * @group db
+ * @group cubrid
+ */
 class CubridActiveRecordTest extends ActiveRecordTest
 {
 	public $driverName = 'cubrid';
diff --git a/tests/unit/framework/db/cubrid/CubridCommandTest.php b/tests/unit/framework/db/cubrid/CubridCommandTest.php
index 4151f2b..895f548 100644
--- a/tests/unit/framework/db/cubrid/CubridCommandTest.php
+++ b/tests/unit/framework/db/cubrid/CubridCommandTest.php
@@ -3,6 +3,10 @@ namespace yiiunit\framework\db\cubrid;
 
 use yiiunit\framework\db\CommandTest;
 
+/**
+ * @group db
+ * @group cubrid
+ */
 class CubridCommandTest extends CommandTest
 {
 	public $driverName = 'cubrid';
diff --git a/tests/unit/framework/db/cubrid/CubridConnectionTest.php b/tests/unit/framework/db/cubrid/CubridConnectionTest.php
index 2ce1c7b..4cd6e20 100644
--- a/tests/unit/framework/db/cubrid/CubridConnectionTest.php
+++ b/tests/unit/framework/db/cubrid/CubridConnectionTest.php
@@ -3,6 +3,10 @@ namespace yiiunit\framework\db\cubrid;
 
 use yiiunit\framework\db\ConnectionTest;
 
+/**
+ * @group db
+ * @group cubrid
+ */
 class CubridConnectionTest extends ConnectionTest
 {
 	public $driverName = 'cubrid';
diff --git a/tests/unit/framework/db/cubrid/CubridQueryBuilderTest.php b/tests/unit/framework/db/cubrid/CubridQueryBuilderTest.php
index 94a002e..107b73b 100644
--- a/tests/unit/framework/db/cubrid/CubridQueryBuilderTest.php
+++ b/tests/unit/framework/db/cubrid/CubridQueryBuilderTest.php
@@ -6,6 +6,10 @@ use yii\base\NotSupportedException;
 use yii\db\sqlite\Schema;
 use yiiunit\framework\db\QueryBuilderTest;
 
+/**
+ * @group db
+ * @group cubrid
+ */
 class CubridQueryBuilderTest extends QueryBuilderTest
 {
 	public $driverName = 'cubrid';
diff --git a/tests/unit/framework/db/cubrid/CubridQueryTest.php b/tests/unit/framework/db/cubrid/CubridQueryTest.php
index 2c68a35..b7c9009 100644
--- a/tests/unit/framework/db/cubrid/CubridQueryTest.php
+++ b/tests/unit/framework/db/cubrid/CubridQueryTest.php
@@ -3,6 +3,10 @@ namespace yiiunit\framework\db\cubrid;
 
 use yiiunit\framework\db\QueryTest;
 
+/**
+ * @group db
+ * @group cubrid
+ */
 class CubridQueryTest extends QueryTest
 {
 	public $driverName = 'cubrid';
diff --git a/tests/unit/framework/db/cubrid/CubridSchemaTest.php b/tests/unit/framework/db/cubrid/CubridSchemaTest.php
index d235b40..6a1f6a2 100644
--- a/tests/unit/framework/db/cubrid/CubridSchemaTest.php
+++ b/tests/unit/framework/db/cubrid/CubridSchemaTest.php
@@ -3,6 +3,10 @@ namespace yiiunit\framework\db\cubrid;
 
 use yiiunit\framework\db\SchemaTest;
 
+/**
+ * @group db
+ * @group cubrid
+ */
 class CubridSchemaTest extends SchemaTest
 {
 	public $driverName = 'cubrid';
diff --git a/tests/unit/framework/db/mssql/MssqlActiveRecordTest.php b/tests/unit/framework/db/mssql/MssqlActiveRecordTest.php
index 92e4da2..c21efc6 100644
--- a/tests/unit/framework/db/mssql/MssqlActiveRecordTest.php
+++ b/tests/unit/framework/db/mssql/MssqlActiveRecordTest.php
@@ -4,6 +4,10 @@ namespace yiiunit\framework\db\mssql;
 
 use yiiunit\framework\db\ActiveRecordTest;
 
+/**
+ * @group db
+ * @group mssql
+ */
 class MssqlActiveRecordTest extends ActiveRecordTest
 {
 	protected $driverName = 'sqlsrv';
diff --git a/tests/unit/framework/db/mssql/MssqlCommandTest.php b/tests/unit/framework/db/mssql/MssqlCommandTest.php
index 1908f65..86f7f45 100644
--- a/tests/unit/framework/db/mssql/MssqlCommandTest.php
+++ b/tests/unit/framework/db/mssql/MssqlCommandTest.php
@@ -4,6 +4,10 @@ namespace yiiunit\framework\db\mssql;
 
 use yiiunit\framework\db\CommandTest;
 
+/**
+ * @group db
+ * @group mssql
+ */
 class MssqlCommandTest extends CommandTest
 {
 	protected $driverName = 'sqlsrv';
diff --git a/tests/unit/framework/db/mssql/MssqlConnectionTest.php b/tests/unit/framework/db/mssql/MssqlConnectionTest.php
index 854c81f..6531f83 100644
--- a/tests/unit/framework/db/mssql/MssqlConnectionTest.php
+++ b/tests/unit/framework/db/mssql/MssqlConnectionTest.php
@@ -4,6 +4,10 @@ namespace yiiunit\framework\db\mssql;
 
 use yiiunit\framework\db\ConnectionTest;
 
+/**
+ * @group db
+ * @group mssql
+ */
 class MssqlConnectionTest extends ConnectionTest
 {
 	protected $driverName = 'sqlsrv';
diff --git a/tests/unit/framework/db/mssql/MssqlQueryTest.php b/tests/unit/framework/db/mssql/MssqlQueryTest.php
index e07ac1d..a2cb019 100644
--- a/tests/unit/framework/db/mssql/MssqlQueryTest.php
+++ b/tests/unit/framework/db/mssql/MssqlQueryTest.php
@@ -4,6 +4,10 @@ namespace yiiunit\framework\db\mssql;
 
 use yiiunit\framework\db\QueryTest;
 
+/**
+ * @group db
+ * @group mssql
+ */
 class MssqlQueryTest extends QueryTest
 {
 	protected $driverName = 'sqlsrv';
diff --git a/tests/unit/framework/db/pgsql/PostgreSQLActiveRecordTest.php b/tests/unit/framework/db/pgsql/PostgreSQLActiveRecordTest.php
index aef09fd..1fffad7 100644
--- a/tests/unit/framework/db/pgsql/PostgreSQLActiveRecordTest.php
+++ b/tests/unit/framework/db/pgsql/PostgreSQLActiveRecordTest.php
@@ -4,6 +4,10 @@ namespace yiiunit\framework\db\pgsql;
 
 use yiiunit\framework\db\ActiveRecordTest;
 
+/**
+ * @group db
+ * @group pgsql
+ */
 class PostgreSQLActiveRecordTest extends ActiveRecordTest
 {
 	protected $driverName = 'pgsql';
diff --git a/tests/unit/framework/db/pgsql/PostgreSQLConnectionTest.php b/tests/unit/framework/db/pgsql/PostgreSQLConnectionTest.php
index cd76a97..26ac0e0 100644
--- a/tests/unit/framework/db/pgsql/PostgreSQLConnectionTest.php
+++ b/tests/unit/framework/db/pgsql/PostgreSQLConnectionTest.php
@@ -3,6 +3,10 @@ namespace yiiunit\framework\db\pgsql;
 
 use yiiunit\framework\db\ConnectionTest;
 
+/**
+ * @group db
+ * @group pgsql
+ */
 class PostgreSQLConnectionTest extends ConnectionTest
 {
 	protected $driverName = 'pgsql';
diff --git a/tests/unit/framework/db/pgsql/PostgreSQLQueryBuilderTest.php b/tests/unit/framework/db/pgsql/PostgreSQLQueryBuilderTest.php
index c7bfeed..3ef329e 100644
--- a/tests/unit/framework/db/pgsql/PostgreSQLQueryBuilderTest.php
+++ b/tests/unit/framework/db/pgsql/PostgreSQLQueryBuilderTest.php
@@ -5,6 +5,10 @@ namespace yiiunit\framework\db\pgsql;
 use yii\db\pgsql\Schema;
 use yiiunit\framework\db\QueryBuilderTest;
 
+/**
+ * @group db
+ * @group pgsql
+ */
 class PostgreSQLQueryBuilderTest extends QueryBuilderTest
 {
 	public $driverName = 'pgsql';
diff --git a/tests/unit/framework/db/sqlite/SqliteActiveRecordTest.php b/tests/unit/framework/db/sqlite/SqliteActiveRecordTest.php
index 1088280..a689e5d 100644
--- a/tests/unit/framework/db/sqlite/SqliteActiveRecordTest.php
+++ b/tests/unit/framework/db/sqlite/SqliteActiveRecordTest.php
@@ -3,6 +3,10 @@ namespace yiiunit\framework\db\sqlite;
 
 use yiiunit\framework\db\ActiveRecordTest;
 
+/**
+ * @group db
+ * @group sqlite
+ */
 class SqliteActiveRecordTest extends ActiveRecordTest
 {
 	protected $driverName = 'sqlite';
diff --git a/tests/unit/framework/db/sqlite/SqliteCommandTest.php b/tests/unit/framework/db/sqlite/SqliteCommandTest.php
index af9a323..1f9ddc2 100644
--- a/tests/unit/framework/db/sqlite/SqliteCommandTest.php
+++ b/tests/unit/framework/db/sqlite/SqliteCommandTest.php
@@ -3,6 +3,10 @@ namespace yiiunit\framework\db\sqlite;
 
 use yiiunit\framework\db\CommandTest;
 
+/**
+ * @group db
+ * @group sqlite
+ */
 class SqliteCommandTest extends CommandTest
 {
 	protected $driverName = 'sqlite';
diff --git a/tests/unit/framework/db/sqlite/SqliteConnectionTest.php b/tests/unit/framework/db/sqlite/SqliteConnectionTest.php
index f1d5b94..e1a2961 100644
--- a/tests/unit/framework/db/sqlite/SqliteConnectionTest.php
+++ b/tests/unit/framework/db/sqlite/SqliteConnectionTest.php
@@ -3,6 +3,10 @@ namespace yiiunit\framework\db\sqlite;
 
 use yiiunit\framework\db\ConnectionTest;
 
+/**
+ * @group db
+ * @group sqlite
+ */
 class SqliteConnectionTest extends ConnectionTest
 {
 	protected $driverName = 'sqlite';
diff --git a/tests/unit/framework/db/sqlite/SqliteQueryBuilderTest.php b/tests/unit/framework/db/sqlite/SqliteQueryBuilderTest.php
index 1f99503..b20acad 100644
--- a/tests/unit/framework/db/sqlite/SqliteQueryBuilderTest.php
+++ b/tests/unit/framework/db/sqlite/SqliteQueryBuilderTest.php
@@ -5,6 +5,10 @@ namespace yiiunit\framework\db\sqlite;
 use yii\db\sqlite\Schema;
 use yiiunit\framework\db\QueryBuilderTest;
 
+/**
+ * @group db
+ * @group sqlite
+ */
 class SqliteQueryBuilderTest extends QueryBuilderTest
 {
 	protected $driverName = 'sqlite';
diff --git a/tests/unit/framework/db/sqlite/SqliteQueryTest.php b/tests/unit/framework/db/sqlite/SqliteQueryTest.php
index 3f112dc..f1db36b 100644
--- a/tests/unit/framework/db/sqlite/SqliteQueryTest.php
+++ b/tests/unit/framework/db/sqlite/SqliteQueryTest.php
@@ -3,6 +3,10 @@ namespace yiiunit\framework\db\sqlite;
 
 use yiiunit\framework\db\QueryTest;
 
+/**
+ * @group db
+ * @group sqlite
+ */
 class SqliteQueryTest extends QueryTest
 {
 	protected $driverName = 'sqlite';
diff --git a/tests/unit/framework/db/sqlite/SqliteSchemaTest.php b/tests/unit/framework/db/sqlite/SqliteSchemaTest.php
index f3f6b60..260bb4c 100644
--- a/tests/unit/framework/db/sqlite/SqliteSchemaTest.php
+++ b/tests/unit/framework/db/sqlite/SqliteSchemaTest.php
@@ -3,6 +3,10 @@ namespace yiiunit\framework\db\sqlite;
 
 use yiiunit\framework\db\SchemaTest;
 
+/**
+ * @group db
+ * @group sqlite
+ */
 class SqliteSchemaTest extends SchemaTest
 {
 	protected $driverName = 'sqlite';
diff --git a/tests/unit/framework/helpers/ArrayHelperTest.php b/tests/unit/framework/helpers/ArrayHelperTest.php
index 92a3971..ca8c95a 100644
--- a/tests/unit/framework/helpers/ArrayHelperTest.php
+++ b/tests/unit/framework/helpers/ArrayHelperTest.php
@@ -35,6 +35,9 @@ class Post3 extends Object
 	}
 }
 
+/**
+ * @group helpers
+ */
 class ArrayHelperTest extends TestCase
 {
 	public function testToArray()
diff --git a/tests/unit/framework/helpers/ConsoleTest.php b/tests/unit/framework/helpers/ConsoleTest.php
index f1d3b3a..4b983f8 100644
--- a/tests/unit/framework/helpers/ConsoleTest.php
+++ b/tests/unit/framework/helpers/ConsoleTest.php
@@ -6,6 +6,10 @@ use Yii;
 use yii\helpers\Console;
 use yiiunit\TestCase;
 
+/**
+ * @group helpers
+ * @group console
+ */
 class ConsoleTest extends TestCase
 {
 	public function testStripAnsiFormat()
diff --git a/tests/unit/framework/helpers/FileHelperTest.php b/tests/unit/framework/helpers/FileHelperTest.php
index 2212072..05bd7af 100644
--- a/tests/unit/framework/helpers/FileHelperTest.php
+++ b/tests/unit/framework/helpers/FileHelperTest.php
@@ -6,6 +6,7 @@ use yii\test\TestCase;
 /**
  * Unit test for [[yii\helpers\FileHelper]]
  * @see FileHelper
+ * @group helpers
  */
 class FileHelperTest extends TestCase
 {
diff --git a/tests/unit/framework/helpers/HtmlTest.php b/tests/unit/framework/helpers/HtmlTest.php
index 6d725de..857f9c2 100644
--- a/tests/unit/framework/helpers/HtmlTest.php
+++ b/tests/unit/framework/helpers/HtmlTest.php
@@ -6,6 +6,9 @@ use Yii;
 use yii\helpers\Html;
 use yiiunit\TestCase;
 
+/**
+ * @group helpers
+ */
 class HtmlTest extends TestCase
 {
 	protected function setUp()
diff --git a/tests/unit/framework/helpers/InflectorTest.php b/tests/unit/framework/helpers/InflectorTest.php
index 732c10d..de7fe01 100644
--- a/tests/unit/framework/helpers/InflectorTest.php
+++ b/tests/unit/framework/helpers/InflectorTest.php
@@ -6,6 +6,9 @@ use Yii;
 use yii\helpers\Inflector;
 use yiiunit\TestCase;
 
+/**
+ * @group helpers
+ */
 class InflectorTest extends TestCase
 {
 	public function testPluralize()
diff --git a/tests/unit/framework/helpers/JsonTest.php b/tests/unit/framework/helpers/JsonTest.php
index 3734744..df2ca5f 100644
--- a/tests/unit/framework/helpers/JsonTest.php
+++ b/tests/unit/framework/helpers/JsonTest.php
@@ -7,6 +7,9 @@ use yii\helpers\Json;
 use yii\test\TestCase;
 use yii\web\JsExpression;
 
+/**
+ * @group helpers
+ */
 class JsonTest extends TestCase
 {
 	public function testEncode()
diff --git a/tests/unit/framework/helpers/StringHelperTest.php b/tests/unit/framework/helpers/StringHelperTest.php
index fe6a96c..8af731d 100644
--- a/tests/unit/framework/helpers/StringHelperTest.php
+++ b/tests/unit/framework/helpers/StringHelperTest.php
@@ -6,6 +6,7 @@ use yii\test\TestCase;
 
 /**
  * StringHelperTest
+ * @group helpers
  */
 class StringHelperTest extends TestCase
 {
diff --git a/tests/unit/framework/helpers/VarDumperTest.php b/tests/unit/framework/helpers/VarDumperTest.php
index 2b40b63..d41a69d 100644
--- a/tests/unit/framework/helpers/VarDumperTest.php
+++ b/tests/unit/framework/helpers/VarDumperTest.php
@@ -4,6 +4,9 @@ namespace yiiunit\framework\helpers;
 use \yii\helpers\VarDumper;
 use yii\test\TestCase;
 
+/**
+ * @group helpers
+ */
 class VarDumperTest extends TestCase
 {
 	public function testDumpObject()
diff --git a/tests/unit/framework/i18n/FormatterTest.php b/tests/unit/framework/i18n/FormatterTest.php
index c13fff3..6966853 100644
--- a/tests/unit/framework/i18n/FormatterTest.php
+++ b/tests/unit/framework/i18n/FormatterTest.php
@@ -13,6 +13,7 @@ use yiiunit\TestCase;
 /**
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
+ * @group i18n
  */
 class FormatterTest extends TestCase
 {
diff --git a/tests/unit/framework/i18n/GettextMessageSourceTest.php b/tests/unit/framework/i18n/GettextMessageSourceTest.php
index 7b499f4..d039629 100644
--- a/tests/unit/framework/i18n/GettextMessageSourceTest.php
+++ b/tests/unit/framework/i18n/GettextMessageSourceTest.php
@@ -5,6 +5,9 @@ namespace yiiunit\framework\i18n;
 use yii\i18n\GettextMessageSource;
 use yiiunit\TestCase;
 
+/**
+ * @group i18n
+ */
 class GettextMessageSourceTest extends TestCase
 {
 	public function testLoadMessages()
diff --git a/tests/unit/framework/i18n/GettextMoFileTest.php b/tests/unit/framework/i18n/GettextMoFileTest.php
index 0aa22da..9b61145 100644
--- a/tests/unit/framework/i18n/GettextMoFileTest.php
+++ b/tests/unit/framework/i18n/GettextMoFileTest.php
@@ -5,6 +5,9 @@ namespace yiiunit\framework\i18n;
 use yii\i18n\GettextMoFile;
 use yiiunit\TestCase;
 
+/**
+ * @group i18n
+ */
 class GettextMoFileTest extends TestCase
 {
 	public function testLoad()
diff --git a/tests/unit/framework/i18n/GettextPoFileTest.php b/tests/unit/framework/i18n/GettextPoFileTest.php
index 8dddb40..4165b81 100644
--- a/tests/unit/framework/i18n/GettextPoFileTest.php
+++ b/tests/unit/framework/i18n/GettextPoFileTest.php
@@ -5,6 +5,9 @@ namespace yiiunit\framework\i18n;
 use yii\i18n\GettextPoFile;
 use yiiunit\TestCase;
 
+/**
+ * @group i18n
+ */
 class GettextPoFileTest extends TestCase
 {
 	public function testLoad()
diff --git a/tests/unit/framework/rbac/PhpManagerTest.php b/tests/unit/framework/rbac/PhpManagerTest.php
index b3b7c4f..8c5d366 100644
--- a/tests/unit/framework/rbac/PhpManagerTest.php
+++ b/tests/unit/framework/rbac/PhpManagerTest.php
@@ -5,6 +5,9 @@ namespace yiiunit\framework\rbac;
 use Yii;
 use yii\rbac\PhpManager;
 
+/**
+ * @group rbac
+ */
 class PhpManagerTest extends ManagerTestCase
 {
 	protected function setUp()
diff --git a/tests/unit/framework/requirements/YiiRequirementCheckerTest.php b/tests/unit/framework/requirements/YiiRequirementCheckerTest.php
index 7554729..652d003 100644
--- a/tests/unit/framework/requirements/YiiRequirementCheckerTest.php
+++ b/tests/unit/framework/requirements/YiiRequirementCheckerTest.php
@@ -7,6 +7,7 @@ use yiiunit\TestCase;
 /**
  * Test case for [[YiiRequirementChecker]].
  * @see YiiRequirementChecker
+ * @group requirements
  */
 class YiiRequirementCheckerTest extends TestCase
 {
diff --git a/tests/unit/framework/validators/EmailValidatorTest.php b/tests/unit/framework/validators/EmailValidatorTest.php
index 5807aed..b33a809 100644
--- a/tests/unit/framework/validators/EmailValidatorTest.php
+++ b/tests/unit/framework/validators/EmailValidatorTest.php
@@ -6,6 +6,7 @@ use yiiunit\TestCase;
 
 /**
  * EmailValidatorTest
+ * @group validators
  */
 class EmailValidatorTest extends TestCase
 {
diff --git a/tests/unit/framework/web/ResponseTest.php b/tests/unit/framework/web/ResponseTest.php
index 41ed939..2a9b4bf 100644
--- a/tests/unit/framework/web/ResponseTest.php
+++ b/tests/unit/framework/web/ResponseTest.php
@@ -13,6 +13,9 @@ class MockResponse extends \yii\web\Response
 	}
 }
 
+/**
+ * @group web
+ */
 class ResponseTest extends \yiiunit\TestCase
 {
 	/**
diff --git a/tests/unit/framework/web/UrlManagerTest.php b/tests/unit/framework/web/UrlManagerTest.php
index efa6695..a77a66d 100644
--- a/tests/unit/framework/web/UrlManagerTest.php
+++ b/tests/unit/framework/web/UrlManagerTest.php
@@ -5,6 +5,9 @@ use yii\web\Request;
 use yii\web\UrlManager;
 use yiiunit\TestCase;
 
+/**
+ * @group web
+ */
 class UrlManagerTest extends TestCase
 {
 	protected function setUp()
diff --git a/tests/unit/framework/web/UrlRuleTest.php b/tests/unit/framework/web/UrlRuleTest.php
index d67dc58..0a0def4 100644
--- a/tests/unit/framework/web/UrlRuleTest.php
+++ b/tests/unit/framework/web/UrlRuleTest.php
@@ -7,6 +7,9 @@ use yii\web\UrlRule;
 use yii\web\Request;
 use yiiunit\TestCase;
 
+/**
+ * @group web
+ */
 class UrlRuleTest extends TestCase
 {
 	public function testCreateUrl()
diff --git a/tests/unit/framework/web/XmlResponseFormatterTest.php b/tests/unit/framework/web/XmlResponseFormatterTest.php
index 590caef..e97962a 100644
--- a/tests/unit/framework/web/XmlResponseFormatterTest.php
+++ b/tests/unit/framework/web/XmlResponseFormatterTest.php
@@ -26,6 +26,8 @@ class Post extends Object
 /**
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
+ *
+ * @group web
  */
 class XmlResponseFormatterTest extends \yiiunit\TestCase
 {
diff --git a/tests/unit/framework/widgets/SpacelessTest.php b/tests/unit/framework/widgets/SpacelessTest.php
index 6b2cf45..00f5a96 100644
--- a/tests/unit/framework/widgets/SpacelessTest.php
+++ b/tests/unit/framework/widgets/SpacelessTest.php
@@ -4,6 +4,9 @@ namespace yiiunit\framework\widgets;
 
 use yii\widgets\Spaceless;
 
+/**
+ * @group widgets
+ */
 class SpacelessTest extends \yiiunit\TestCase
 {
 	public function testWidget()