diff --git a/tests/comment/views_handler_argument_comment_user_uid.test b/lib/Drupal/views/Tests/Comment/ArgumentCommentUserUidTest.php
similarity index 94%
rename from tests/comment/views_handler_argument_comment_user_uid.test
rename to lib/Drupal/views/Tests/Comment/ArgumentCommentUserUidTest.php
index 3361027..7bd3706 100644
--- a/tests/comment/views_handler_argument_comment_user_uid.test
+++ b/lib/Drupal/views/Tests/Comment/ArgumentCommentUserUidTest.php
@@ -2,15 +2,19 @@
 
 /**
  * @file
- * Definition of viewsHandlerArgumentCommentUserUidTest.
+ * Definition of Drupal\views\Tests\Comment\ArgumentCommentUserUidTest.
  */
 
+namespace Drupal\views\Tests\Comment;
+
+use Drupal\simpletest\WebTestBase;
+use ViewsSqlTest;
 use Drupal\views\View;
 
 /**
  * Tests the argument_comment_user_uid handler.
  */
-class viewsHandlerArgumentCommentUserUidTest extends ViewsSqlTest {
+class ArgumentCommentUserUidTest extends ViewsSqlTest {
   protected $profile = 'standard';
 
   public static function getInfo() {
diff --git a/tests/comment/views_handler_filter_comment_user_uid.test b/lib/Drupal/views/Tests/Comment/FilterCommentUserUidTest.php
similarity index 80%
rename from tests/comment/views_handler_filter_comment_user_uid.test
rename to lib/Drupal/views/Tests/Comment/FilterCommentUserUidTest.php
index 1f3f75c..4409504 100644
--- a/tests/comment/views_handler_filter_comment_user_uid.test
+++ b/lib/Drupal/views/Tests/Comment/FilterCommentUserUidTest.php
@@ -2,15 +2,20 @@
 
 /**
  * @file
- * Definition of viewsHandlerFilterCommentUserUidTest.
+ * Definition of Drupal\views\Tests\Comment\FilterCommentUserUidTest.
  */
 
+namespace Drupal\views\Tests\Comment;
+
+use Drupal\simpletest\WebTestBase;
+use ViewsSqlTest;
+
 /**
  * Tests the filter_comment_user_uid handler.
  *
  * The actual stuff is done in the parent class.
  */
-class viewsHandlerFilterCommentUserUidTest extends viewsHandlerArgumentCommentUserUidTest {
+class FilterCommentUserUidTest extends ArgumentCommentUserUidTest {
   public static function getInfo() {
     return array(
       'name' => 'Tests handler filter_comment_user_uid',