diff --git a/tests/lib/group/backend.php b/tests/lib/group/backend.php
index 3b06a3eb3a..53a13e6c62 100644
--- a/tests/lib/group/backend.php
+++ b/tests/lib/group/backend.php
@@ -24,12 +24,14 @@
  *
  */
 
+namespace Test\Group;
+
 /**
  * Class Test_Group_Backend
  *
  * @group DB
  */
-abstract class Test_Group_Backend extends \Test\TestCase {
+abstract class Backend extends \Test\TestCase {
 	/**
 	 * @var \OC\Group\Backend $backend
 	 */
diff --git a/tests/lib/group/database.php b/tests/lib/group/database.php
index aae9f8bf1d..bf9d9c35b0 100644
--- a/tests/lib/group/database.php
+++ b/tests/lib/group/database.php
@@ -23,12 +23,14 @@
  *
  */
 
+namespace Test\Group;
+
 /**
- * Class Test_Group_Database
+ * Class Database
  *
  * @group DB
  */
-class Test_Group_Database extends Test_Group_Backend {
+class Database extends Backend {
 	private $groups = array();
 
 	/**
diff --git a/tests/lib/group/dummy.php b/tests/lib/group/dummy.php
index eaa299c39a..5504cd63a0 100644
--- a/tests/lib/group/dummy.php
+++ b/tests/lib/group/dummy.php
@@ -20,12 +20,14 @@
 *
 */
 
+namespace Test\Group;
+
 /**
- * Class Test_Group_Dummy
+ * Class Dummy
  *
  * @group DB
  */
-class Test_Group_Dummy extends Test_Group_Backend {
+class Dummy extends Backend {
 	protected function setUp() {
 		parent::setUp();
 		$this->backend=new \Test\Util\Group\Dummy();
diff --git a/tests/lib/group/metadata.php b/tests/lib/group/metadatatest.php
similarity index 98%
rename from tests/lib/group/metadata.php
rename to tests/lib/group/metadatatest.php
index 233463c71e..593bbcb48d 100644
--- a/tests/lib/group/metadata.php
+++ b/tests/lib/group/metadatatest.php
@@ -22,7 +22,7 @@
 
 namespace Test\Group;
 
-class Test_MetaData extends \Test\TestCase {
+class MetaDataTest extends \Test\TestCase {
 	/** @var \OC\Group\Manager */
 	private $groupManager;
 	/** @var \OCP\IUserSession */