diff --git a/tests/Framework/Charset.php b/tests/Framework/Charset.php
index 3e6287c8c..863bfc61d 100644
--- a/tests/Framework/Charset.php
+++ b/tests/Framework/Charset.php
@@ -4,6 +4,8 @@
  * Test class to test rcube_charset class
  *
  * @package Tests
+ * @group iconv
+ * @group mbstring
  */
 class Framework_Charset extends PHPUnit_Framework_TestCase
 {
diff --git a/tests/Framework/DB.php b/tests/Framework/DB.php
index 04897bb90..23febfc10 100644
--- a/tests/Framework/DB.php
+++ b/tests/Framework/DB.php
@@ -4,6 +4,7 @@
  * Test class to test rcube_db class
  *
  * @package Tests
+ * @group database
  */
 class Framework_DB extends PHPUnit_Framework_TestCase
 {
diff --git a/tests/Framework/DBMssql.php b/tests/Framework/DBMssql.php
index b88c95b28..47ab6037b 100644
--- a/tests/Framework/DBMssql.php
+++ b/tests/Framework/DBMssql.php
@@ -4,6 +4,8 @@
  * Test class to test rcube_db_mssql class
  *
  * @package Tests
+ * @group database
+ * @group mssql
  */
 class Framework_DBMssql extends PHPUnit_Framework_TestCase
 {
diff --git a/tests/Framework/DBMysql.php b/tests/Framework/DBMysql.php
index a3b8fda39..472657c27 100644
--- a/tests/Framework/DBMysql.php
+++ b/tests/Framework/DBMysql.php
@@ -4,6 +4,8 @@
  * Test class to test rcube_db_mysql class
  *
  * @package Tests
+ * @group database
+ * @group mysql
  */
 class Framework_DBMysql extends PHPUnit_Framework_TestCase
 {
diff --git a/tests/Framework/DBPgsql.php b/tests/Framework/DBPgsql.php
index 67d1c4696..a7cb005d1 100644
--- a/tests/Framework/DBPgsql.php
+++ b/tests/Framework/DBPgsql.php
@@ -4,6 +4,8 @@
  * Test class to test rcube_db_pgsql class
  *
  * @package Tests
+ * @group database
+ * @group postgres
  */
 class Framework_DBPgsql extends PHPUnit_Framework_TestCase
 {
diff --git a/tests/Framework/DBSqlite.php b/tests/Framework/DBSqlite.php
index 121bb7770..00de37e9a 100644
--- a/tests/Framework/DBSqlite.php
+++ b/tests/Framework/DBSqlite.php
@@ -4,6 +4,8 @@
  * Test class to test rcube_db_sqlite class
  *
  * @package Tests
+ * @group database
+ * @group sqlite
  */
 class Framework_DBSqlite extends PHPUnit_Framework_TestCase
 {
diff --git a/tests/Framework/DBSqlsrv.php b/tests/Framework/DBSqlsrv.php
index 6272ef5d7..9114cc5cc 100644
--- a/tests/Framework/DBSqlsrv.php
+++ b/tests/Framework/DBSqlsrv.php
@@ -4,6 +4,8 @@
  * Test class to test rcube_db_sqlsrv class
  *
  * @package Tests
+ * @group database
+ * @group sqlrsv
  */
 class Framework_DBSqlsrv extends PHPUnit_Framework_TestCase
 {