diff --git a/tests/styles/views_plugin_style_jump_menu.test b/lib/Drupal/views/Tests/Style/PluginStyleJumpMenuTest.php
similarity index 97%
rename from tests/styles/views_plugin_style_jump_menu.test
rename to lib/Drupal/views/Tests/Style/PluginStyleJumpMenuTest.php
index 9a53bfcf2e8..7b0a5b1b0ba 100644
--- a/tests/styles/views_plugin_style_jump_menu.test
+++ b/lib/Drupal/views/Tests/Style/PluginStyleJumpMenuTest.php
@@ -2,13 +2,18 @@
 
 /**
  * @file
- * Definition of viewsPluginStyleJumpMenuTest.
+ * Definition of Drupal\views\Tests\Style\PluginStyleJumpMenuTest.
  */
 
+namespace Drupal\views\Tests\Style;
+
+use ViewsSqlTest;
+use view;
+
 /**
  * Tests jump menu style functionality.
  */
-class viewsPluginStyleJumpMenuTest extends ViewsSqlTest {
+class PluginStyleJumpMenuTest extends ViewsSqlTest {
   public static function getInfo() {
     return array(
       'name' => 'Jump menu',
diff --git a/tests/styles/views_plugin_style.test b/lib/Drupal/views/Tests/Style/PluginStyleTest.php
similarity index 98%
rename from tests/styles/views_plugin_style.test
rename to lib/Drupal/views/Tests/Style/PluginStyleTest.php
index 87f5b7d1021..52109bf5846 100644
--- a/tests/styles/views_plugin_style.test
+++ b/lib/Drupal/views/Tests/Style/PluginStyleTest.php
@@ -2,13 +2,19 @@
 
 /**
  * @file
- * Definition of ViewsPluginStyleTestCase.
+ * Definition of Drupal\views\Tests\Style\PluginStyleTest.
  */
 
+namespace Drupal\views\Tests\Style;
+
+use stdClass;
+use DOMDocument;
+use ViewsSqlTest;
+
 /**
  * Tests some general style plugin related functionality.
  */
-class ViewsPluginStyleTestCase extends ViewsSqlTest {
+class PluginStyleTest extends ViewsSqlTest {
   public static function getInfo() {
     return array(
       'name' => 'Styles',
diff --git a/tests/styles/views_plugin_style_unformatted.test b/lib/Drupal/views/Tests/Style/PluginStyleUnformattedTest.php
similarity index 91%
rename from tests/styles/views_plugin_style_unformatted.test
rename to lib/Drupal/views/Tests/Style/PluginStyleUnformattedTest.php
index 20b7b4d8079..39dc2278077 100644
--- a/tests/styles/views_plugin_style_unformatted.test
+++ b/lib/Drupal/views/Tests/Style/PluginStyleUnformattedTest.php
@@ -2,13 +2,18 @@
 
 /**
  * @file
- * Definition of ViewsPluginStyleUnformattedTestCase.
+ * Definition of Drupal\views\Tests\Style\PluginStyleUnformattedTest.
  */
 
+namespace Drupal\views\Tests\Style;
+
+use DOMDocument;
+use ViewsSqlTest;
+
 /**
  * Tests the default/unformatted row style.
  */
-class ViewsPluginStyleUnformattedTestCase extends ViewsSqlTest {
+class PluginStyleUnformattedTest extends ViewsSqlTest {
 
   /**
    * Stores all created nodes.
diff --git a/views.info b/views.info
index 6b609a68045..22e94576b70 100644
--- a/views.info
+++ b/views.info
@@ -247,9 +247,6 @@ files[] = plugins/views_plugin_style_table.inc
 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/styles/views_plugin_style_jump_menu.test
-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_argument_default.test