diff --git a/lib/Drupal/views/Tests/Language/ArgumentLanguage.php b/lib/Drupal/views/Tests/Language/ArgumentLanguage.php
index dc21a903a9e..47b170149db 100644
--- a/lib/Drupal/views/Tests/Language/ArgumentLanguage.php
+++ b/lib/Drupal/views/Tests/Language/ArgumentLanguage.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
  * @file
- * Definition of Drupal\views\Tests\Language\ArgumentLanguage.php
+ * Definition of Drupal\views\Tests\Language\ArgumentLanguage.
  */
 
 namespace Drupal\views\Tests\Language;
@@ -14,6 +15,7 @@ use Drupal\Core\Language\Language;
  * @see Views\language\Plugin\views\argument\Language.php
  */
 class ArgumentLanguage extends LanguageTestBase {
+
   public static function getInfo() {
     return array(
       'name' => 'Argument: Language',
@@ -41,4 +43,5 @@ class ArgumentLanguage extends LanguageTestBase {
       $view->destroy();
     }
   }
+
 }
diff --git a/lib/Drupal/views/Tests/Language/FieldLanguage.php b/lib/Drupal/views/Tests/Language/FieldLanguage.php
index 08badae54a1..04592110f8f 100644
--- a/lib/Drupal/views/Tests/Language/FieldLanguage.php
+++ b/lib/Drupal/views/Tests/Language/FieldLanguage.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
  * @file
- * Definition of Drupal\views\Tests\Language\FieldLanguage.php
+ * Definition of Drupal\views\Tests\Language\FieldLanguage.
  */
 
 namespace Drupal\views\Tests\Language;
@@ -14,11 +15,12 @@ use Drupal\Core\Language\Language;
  * @see Views\language\Plugin\views\field\Language
  */
 class FieldLanguage extends LanguageTestBase {
+
   public static function getInfo() {
     return array(
       'name' => 'Field: Language',
       'description' => 'Tests the field language handler.',
-      'group' => 'Views Handlers'
+      'group' => 'Views Handlers',
     );
   }
 
@@ -36,4 +38,5 @@ class FieldLanguage extends LanguageTestBase {
     $this->assertEqual($view->field['langcode']->advanced_render($view->result[0]), 'English');
     $this->assertEqual($view->field['langcode']->advanced_render($view->result[1]), 'Lolspeak');
   }
+
 }
diff --git a/lib/Drupal/views/Tests/Language/FilterLanguage.php b/lib/Drupal/views/Tests/Language/FilterLanguage.php
index 466bf1c6a4e..58f54bc8fab 100644
--- a/lib/Drupal/views/Tests/Language/FilterLanguage.php
+++ b/lib/Drupal/views/Tests/Language/FilterLanguage.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
  * @file
- * Definition of Drupal\views\Tests\Language\FilterLanguage.php
+ * Definition of Drupal\views\Tests\Language\FilterLanguage.
  */
 
 namespace Drupal\views\Tests\Language;
@@ -14,6 +15,7 @@ use Drupal\Core\Language\Language;
  * @see Views\language\Plugin\views\filter\Language
  */
 class FilterLanguage extends LanguageTestBase {
+
   public static function getInfo() {
     return array(
       'name' => 'Filter: Language',
@@ -42,4 +44,5 @@ class FilterLanguage extends LanguageTestBase {
       $view->destroy();
     }
   }
+
 }
diff --git a/lib/Drupal/views/Tests/Language/LanguageTestBase.php b/lib/Drupal/views/Tests/Language/LanguageTestBase.php
index f811b52f5c2..f68014aed07 100644
--- a/lib/Drupal/views/Tests/Language/LanguageTestBase.php
+++ b/lib/Drupal/views/Tests/Language/LanguageTestBase.php
@@ -1,19 +1,26 @@
 <?php
+
 /**
  * @file
- * Definition of Drupal\views\Tests\Language\LanguageTestBase.php
+ * Definition of Drupal\views\Tests\Language\LanguageTestBase.
  */
 
 namespace Drupal\views\Tests\Language;
 
-use Drupal\views\Tests\ViewsSqlTest;
+use Drupal\views\Tests\ViewsSchemaTestBase;
 use Drupal\Core\Language\Language;
 
 /**
  * Base class for all Language handler tests.
  */
-abstract class LanguageTestBase extends ViewsSqlTest {
-  public static $modules = array('views', 'language');
+abstract class LanguageTestBase extends ViewsSchemaTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('language');
 
   protected function setUp() {
     parent::setUp();
@@ -64,4 +71,5 @@ abstract class LanguageTestBase extends ViewsSqlTest {
 
     return $data;
   }
+
 }
diff --git a/lib/Views/locale/Plugin/views/argument/Language.php b/lib/Views/language/Plugin/views/argument/Language.php
similarity index 100%
rename from lib/Views/locale/Plugin/views/argument/Language.php
rename to lib/Views/language/Plugin/views/argument/Language.php
diff --git a/lib/Views/locale/Plugin/views/field/Language.php b/lib/Views/language/Plugin/views/field/Language.php
similarity index 100%
rename from lib/Views/locale/Plugin/views/field/Language.php
rename to lib/Views/language/Plugin/views/field/Language.php
diff --git a/lib/Views/locale/Plugin/views/filter/Language.php b/lib/Views/language/Plugin/views/filter/Language.php
similarity index 100%
rename from lib/Views/locale/Plugin/views/filter/Language.php
rename to lib/Views/language/Plugin/views/filter/Language.php
diff --git a/lib/Views/locale/Plugin/views/field/NodeLanguage.php b/lib/Views/node/Plugin/views/field/Language.php
similarity index 100%
rename from lib/Views/locale/Plugin/views/field/NodeLanguage.php
rename to lib/Views/node/Plugin/views/field/Language.php