diff --git a/tests/views_basic.test b/lib/Drupal/views/Tests/BasicTest.php
similarity index 97%
rename from tests/views_basic.test
rename to lib/Drupal/views/Tests/BasicTest.php
index 5fc60d8e3a66b53820b1d24978390a3bce8f9f58..dd2f5e9840648d3a89e3b81f763d604d6ad7d9fb 100644
--- a/tests/views_basic.test
+++ b/lib/Drupal/views/Tests/BasicTest.php
@@ -2,13 +2,17 @@
 
 /**
  * @file
- * Definition of ViewsBasicTest.
+ * Definition of Drupal\views\Tests\BasicTest.
  */
 
+namespace Drupal\views\Tests;
+
+use ViewsSqlTest;
+
 /**
  * Basic test class for Views query builder tests.
  */
-class ViewsBasicTest extends ViewsSqlTest {
+class BasicTest extends ViewsSqlTest {
   public static function getInfo() {
     return array(
       'name' => 'Basic query test',
diff --git a/views.info b/views.info
index 3e0d2e19110413c8252e7531071647c7cfede102..6b609a680457fd1597de34911a230c7baa6ac636 100644
--- a/views.info
+++ b/views.info
@@ -252,7 +252,6 @@ files[] = tests/styles/views_plugin_style.test
 files[] = tests/styles/views_plugin_style_unformatted.test
 files[] = tests/views_access.test
 files[] = tests/views_analyze.test
-files[] = tests/views_basic.test
 files[] = tests/views_argument_default.test
 files[] = tests/views_argument_validator.test
 files[] = tests/views_exposed_form.test