diff --git a/tests/views_analyze.test b/lib/Drupal/views/Tests/AnalyzeTest.php
similarity index 89%
rename from tests/views_analyze.test
rename to lib/Drupal/views/Tests/AnalyzeTest.php
index e9311e57f381f5b242743d3347b588ef087d63f5..64e450ed573654e9ad101915406d5e1cb5fc6517 100644
--- a/tests/views_analyze.test
+++ b/lib/Drupal/views/Tests/AnalyzeTest.php
@@ -2,13 +2,17 @@
 
 /**
  * @file
- * Definition of ViewsAnalyzeTest.
+ * Definition of Drupal\views\Tests\AnalyzeTest.
  */
 
+namespace Drupal\views\Tests;
+
+use ViewsSqlTest;
+
 /**
  * Tests the views analyze system.
  */
-class ViewsAnalyzeTest extends ViewsSqlTest {
+class AnalyzeTest extends ViewsSqlTest {
   public static function getInfo() {
     return array(
       'name' => 'Views Analyze',
diff --git a/tests/views_exposed_form.test b/lib/Drupal/views/Tests/ExposedFormTest.php
similarity index 96%
rename from tests/views_exposed_form.test
rename to lib/Drupal/views/Tests/ExposedFormTest.php
index 3b2933baad8e115bf3273c586d24b2eda095a49b..d6c8cd0b054bc0bd234b3fc4bea0efdad0516bb6 100644
--- a/tests/views_exposed_form.test
+++ b/lib/Drupal/views/Tests/ExposedFormTest.php
@@ -2,13 +2,17 @@
 
 /**
  * @file
- * Definition of ViewsExposedFormTest.
+ * Definition of Drupal\views\Tests\ExposedFormTest.
  */
 
+namespace Drupal\views\Tests;
+
+use ViewsSqlTest;
+
 /**
  * Tests exposed forms.
  */
-class ViewsExposedFormTest extends ViewsSqlTest {
+class ExposedFormTest extends ViewsSqlTest {
   public static function getInfo() {
     return array(
       'name' => 'Exposed forms',
diff --git a/tests/views_glossary.test b/lib/Drupal/views/Tests/GlossaryTest.php
similarity index 90%
rename from tests/views_glossary.test
rename to lib/Drupal/views/Tests/GlossaryTest.php
index 0fe0fbae6f5021be7d21ce47262bae4a7e1aa0bd..3745fc7e5de6e5900d3daf9edd1a589dbc35db7b 100644
--- a/tests/views_glossary.test
+++ b/lib/Drupal/views/Tests/GlossaryTest.php
@@ -2,13 +2,17 @@
 
 /**
  * @file
- * Definition of ViewsGlossaryTestCase.
+ * Definition of Drupal\views\Tests\GlossaryTest.
  */
 
+namespace Drupal\views\Tests;
+
+use ViewsSqlTest;
+
 /**
  * Tests glossary view ( summary of arguments ).
  */
-class ViewsGlossaryTestCase extends ViewsSqlTest {
+class GlossaryTest extends ViewsSqlTest {
   public static function getInfo() {
     return array(
       'name' => 'Glossary Test',
diff --git a/views.info b/views.info
index 55acf8a8c65186073fae7491d72ca456f8b0edd7..e3d0642229dd31265c5317dbdb422b861d3748f1 100644
--- a/views.info
+++ b/views.info
@@ -248,11 +248,8 @@ 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_access.test
-files[] = tests/views_analyze.test
 files[] = tests/views_argument_default.test
-files[] = tests/views_exposed_form.test
 files[] = tests/field/views_fieldapi.test
-files[] = tests/views_glossary.test
 files[] = tests/views_groupby.test
 files[] = tests/views_handlers.test
 files[] = tests/views_module.test