diff --git a/tests/lib/log/owncloud.php b/tests/lib/log/OwncloudTest.php
similarity index 100%
rename from tests/lib/log/owncloud.php
rename to tests/lib/log/OwncloudTest.php
diff --git a/tests/lib/mail/mailer.php b/tests/lib/mail/MailerTest.php
similarity index 98%
rename from tests/lib/mail/mailer.php
rename to tests/lib/mail/MailerTest.php
index 8023cda820..c63ceb5982 100644
--- a/tests/lib/mail/mailer.php
+++ b/tests/lib/mail/MailerTest.php
@@ -6,11 +6,13 @@
  * See the COPYING-README file.
  */
 
-namespace Test;
+namespace Test\Mail;
+
 use OC\Mail\Mailer;
 use OCP\IConfig;
 use OC_Defaults;
 use OCP\ILogger;
+use Test\TestCase;
 
 class MailerTest extends TestCase {
 	/** @var IConfig */
diff --git a/tests/lib/mail/message.php b/tests/lib/mail/MessageTest.php
similarity index 99%
rename from tests/lib/mail/message.php
rename to tests/lib/mail/MessageTest.php
index 339677c0a7..691168ce24 100644
--- a/tests/lib/mail/message.php
+++ b/tests/lib/mail/MessageTest.php
@@ -6,10 +6,11 @@
  * See the COPYING-README file.
  */
 
-namespace Test;
+namespace Test\Mail;
 
 use OC\Mail\Message;
 use Swift_Message;
+use Test\TestCase;
 
 class MessageTest extends TestCase {
 	/** @var Swift_Message */