diff --git a/tests/lib/memcache/factory.php b/tests/lib/memcache/FactoryTest.php
similarity index 98%
rename from tests/lib/memcache/factory.php
rename to tests/lib/memcache/FactoryTest.php
index 33a27a4211..8607ea7de9 100644
--- a/tests/lib/memcache/factory.php
+++ b/tests/lib/memcache/FactoryTest.php
@@ -56,7 +56,7 @@ class Test_Factory_Unavailable_Cache2 {
 	}
 }
 
-class Test_Factory extends \Test\TestCase {
+class FactoryTest extends \Test\TestCase {
 	const AVAILABLE1 = '\\Test\\Memcache\\Test_Factory_Available_Cache1';
 	const AVAILABLE2 = '\\Test\\Memcache\\Test_Factory_Available_Cache2';
 	const UNAVAILABLE1 = '\\Test\\Memcache\\Test_Factory_Unavailable_Cache1';
diff --git a/tests/lib/ocs/privatedata.php b/tests/lib/ocs/PrivatedataTest.php
similarity index 97%
rename from tests/lib/ocs/privatedata.php
rename to tests/lib/ocs/PrivatedataTest.php
index ce153bf07d..0b3b23b880 100644
--- a/tests/lib/ocs/privatedata.php
+++ b/tests/lib/ocs/PrivatedataTest.php
@@ -20,12 +20,16 @@
  *
  */
 
+namespace Test\OCS;
+
+use OC_OCS_Privatedata;
+
 /**
- * Class Test_OC_OCS_Privatedata
+ * Class PrivatedataTest
  *
  * @group DB
  */
-class Test_OC_OCS_Privatedata extends \Test\TestCase {
+class PrivatedataTest extends \Test\TestCase {
 	private $appKey;
 
 	protected function setUp() {