diff --git a/tests/comment/views_handler_argument_comment_user_uid.test b/lib/Drupal/views/Tests/Comment/ArgumentCommentUserUidTest.php
similarity index 95%
rename from tests/comment/views_handler_argument_comment_user_uid.test
rename to lib/Drupal/views/Tests/Comment/ArgumentCommentUserUidTest.php
index 33610270c91ac7d58ead3535492b5b1371523508..ecc345c2ca0ea2c09c60c92f61d2cf2a2a92b071 100644
--- a/tests/comment/views_handler_argument_comment_user_uid.test
+++ b/lib/Drupal/views/Tests/Comment/ArgumentCommentUserUidTest.php
@@ -2,15 +2,18 @@
 
 /**
  * @file
- * Definition of viewsHandlerArgumentCommentUserUidTest.
+ * Definition of Drupal\views\Tests\Comment\ArgumentCommentUserUidTest.
  */
 
+namespace Drupal\views\Tests\Comment;
+
+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 82%
rename from tests/comment/views_handler_filter_comment_user_uid.test
rename to lib/Drupal/views/Tests/Comment/FilterCommentUserUidTest.php
index 1f3f75cdb8bad1bcbbc242058723dbd05a534032..4b67048ef51d9aa47f091f722d2870110d36769f 100644
--- a/tests/comment/views_handler_filter_comment_user_uid.test
+++ b/lib/Drupal/views/Tests/Comment/FilterCommentUserUidTest.php
@@ -2,15 +2,19 @@
 
 /**
  * @file
- * Definition of viewsHandlerFilterCommentUserUidTest.
+ * Definition of Drupal\views\Tests\Comment\FilterCommentUserUidTest.
  */
 
+namespace Drupal\views\Tests\Comment;
+
+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',
diff --git a/tests/plugins/views_plugin_display.test b/lib/Drupal/views/Tests/Plugins/DisplayTestCase.php
similarity index 98%
rename from tests/plugins/views_plugin_display.test
rename to lib/Drupal/views/Tests/Plugins/DisplayTestCase.php
index f8ff9c03a2eebad150501f7e3c22fd88c17e967a..40b01ed04bb155c8141786591d7e824a5cc71e0e 100644
--- a/tests/plugins/views_plugin_display.test
+++ b/lib/Drupal/views/Tests/Plugins/DisplayTestCase.php
@@ -2,15 +2,18 @@
 
 /**
  * @file
- * Definition of ViewsPluginDisplayTestCase.
+ * Definition of Drupal\views\Tests\Plugins\DisplayTestCase.
  */
 
+namespace Drupal\views\Tests\Plugins;
+
+use ViewsSqlTest;
 use Drupal\views\View;
 
 /**
  *
  */
-class ViewsPluginDisplayTestCase extends ViewsSqlTest {
+class DisplayTestCase extends ViewsSqlTest {
 
   public static function getInfo() {
     return array(
diff --git a/views.info b/views.info
index 9e28c3dccb1094e85f852a68acd0ca2463423cc8..d2ef1caa171ad57bc94c7cd7b64ebbcd4fe30831 100644
--- a/views.info
+++ b/views.info
@@ -245,13 +245,10 @@ files[] = plugins/views_plugin_style_table.inc
 ; Tests
 files[] = tests/test_plugins/views_test_plugin_access_test_dynamic.inc
 files[] = tests/test_plugins/views_test_plugin_access_test_static.inc
-files[] = tests/plugins/views_plugin_display.test
 files[] = tests/views_groupby.test
 files[] = tests/views_plugin_localization_test.inc
 files[] = tests/views_query.test
 files[] = tests/views_test.views_default.inc
-files[] = tests/comment/views_handler_argument_comment_user_uid.test
-files[] = tests/comment/views_handler_filter_comment_user_uid.test
 files[] = tests/user/views_handler_field_user_name.test
 files[] = tests/user/views_user_argument_default.test
 files[] = tests/user/views_user_argument_validate.test