diff --git a/lib/Drupal/views/Tests/AccessTest.php b/lib/Drupal/views/Tests/AccessTest.php
index 5db549d..1b4d165 100644
--- a/lib/Drupal/views/Tests/AccessTest.php
+++ b/lib/Drupal/views/Tests/AccessTest.php
@@ -8,7 +8,6 @@
 namespace Drupal\views\Tests;
 
 use Drupal\simpletest\WebTestBase;
-use ViewsSqlTest;
 use Drupal\views\View;
 use views_test_plugin_access_test_dynamic;
 
diff --git a/lib/Drupal/views/Tests/AnalyzeTest.php b/lib/Drupal/views/Tests/AnalyzeTest.php
index b2221ec..b86edbc 100644
--- a/lib/Drupal/views/Tests/AnalyzeTest.php
+++ b/lib/Drupal/views/Tests/AnalyzeTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use ViewsSqlTest;
-
 /**
  * Tests the views analyze system.
  */
diff --git a/lib/Drupal/views/Tests/ArgumentDefaultTest.php b/lib/Drupal/views/Tests/ArgumentDefaultTest.php
index afcdcd5..7d49d23 100644
--- a/lib/Drupal/views/Tests/ArgumentDefaultTest.php
+++ b/lib/Drupal/views/Tests/ArgumentDefaultTest.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use ViewsSqlTest;
 use Drupal\views\View;
 
 /**
diff --git a/lib/Drupal/views/Tests/ArgumentValidatorTest.php b/lib/Drupal/views/Tests/ArgumentValidatorTest.php
index bdf9e29..8ed5788 100644
--- a/lib/Drupal/views/Tests/ArgumentValidatorTest.php
+++ b/lib/Drupal/views/Tests/ArgumentValidatorTest.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use ViewsSqlTest;
 use Drupal\views\View;
 
 /**
diff --git a/lib/Drupal/views/Tests/BasicTest.php b/lib/Drupal/views/Tests/BasicTest.php
index dd2f5e9..2b4eb5e 100644
--- a/lib/Drupal/views/Tests/BasicTest.php
+++ b/lib/Drupal/views/Tests/BasicTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use ViewsSqlTest;
-
 /**
  * Basic test class for Views query builder tests.
  */
diff --git a/lib/Drupal/views/Tests/CacheTest.php b/lib/Drupal/views/Tests/CacheTest.php
index a1c8d42..845b9c9 100644
--- a/lib/Drupal/views/Tests/CacheTest.php
+++ b/lib/Drupal/views/Tests/CacheTest.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use ViewsSqlTest;
 use Drupal\views\View;
 
 /**
diff --git a/lib/Drupal/views/Tests/Comment/ArgumentCommentUserUidTest.php b/lib/Drupal/views/Tests/Comment/ArgumentCommentUserUidTest.php
index ecc345c..f6abd57 100644
--- a/lib/Drupal/views/Tests/Comment/ArgumentCommentUserUidTest.php
+++ b/lib/Drupal/views/Tests/Comment/ArgumentCommentUserUidTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Tests\Comment;
 
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 use Drupal\views\View;
 
 /**
diff --git a/lib/Drupal/views/Tests/Comment/FilterCommentUserUidTest.php b/lib/Drupal/views/Tests/Comment/FilterCommentUserUidTest.php
index 4b67048..ce6030d 100644
--- a/lib/Drupal/views/Tests/Comment/FilterCommentUserUidTest.php
+++ b/lib/Drupal/views/Tests/Comment/FilterCommentUserUidTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Tests\Comment;
 
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 
 /**
  * Tests the filter_comment_user_uid handler.
diff --git a/lib/Drupal/views/Tests/ExposedFormTest.php b/lib/Drupal/views/Tests/ExposedFormTest.php
index d6c8cd0..3546da2 100644
--- a/lib/Drupal/views/Tests/ExposedFormTest.php
+++ b/lib/Drupal/views/Tests/ExposedFormTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use ViewsSqlTest;
-
 /**
  * Tests exposed forms.
  */
diff --git a/lib/Drupal/views/Tests/Field/ApiDataTest.php b/lib/Drupal/views/Tests/Field/ApiDataTest.php
index 38a3d58..4ad930f 100644
--- a/lib/Drupal/views/Tests/Field/ApiDataTest.php
+++ b/lib/Drupal/views/Tests/Field/ApiDataTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\views\Tests\Field;
 
 use Drupal\simpletest\WebTestBase;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 
 /**
  * Test the produced views_data.
diff --git a/lib/Drupal/views/Tests/Field/ApiTestBase.php b/lib/Drupal/views/Tests/Field/ApiTestBase.php
index c7862ba..adbcfba 100644
--- a/lib/Drupal/views/Tests/Field/ApiTestBase.php
+++ b/lib/Drupal/views/Tests/Field/ApiTestBase.php
@@ -19,7 +19,7 @@
 namespace Drupal\views\Tests\Field;
 
 use Drupal\simpletest\WebTestBase;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 
 /**
  * Provides some helper methods for testing fieldapi integration into views.
diff --git a/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php b/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php
index d8ad3cf..ccf284c 100644
--- a/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php
+++ b/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\views\Tests\Field;
 
 use Drupal\simpletest\WebTestBase;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 use Drupal\views\View;
 
 /**
diff --git a/lib/Drupal/views/Tests/GlossaryTest.php b/lib/Drupal/views/Tests/GlossaryTest.php
index 3745fc7..b915d83 100644
--- a/lib/Drupal/views/Tests/GlossaryTest.php
+++ b/lib/Drupal/views/Tests/GlossaryTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use ViewsSqlTest;
-
 /**
  * Tests glossary view ( summary of arguments ).
  */
diff --git a/lib/Drupal/views/Tests/Handler/AreaTextTest.php b/lib/Drupal/views/Tests/Handler/AreaTextTest.php
index 83f0b43..5f04f7e 100644
--- a/lib/Drupal/views/Tests/Handler/AreaTextTest.php
+++ b/lib/Drupal/views/Tests/Handler/AreaTextTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Tests\Handler;
 
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 
 /**
  * Tests the text area handler.
diff --git a/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php b/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php
index 6f16dec..27d4cdb 100644
--- a/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php
+++ b/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Tests\Handler;
 
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 
 /**
  * Tests the core views_handler_argument_null handler.
diff --git a/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php b/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php
index 9833129..8695cc3 100644
--- a/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php
+++ b/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Tests\Handler;
 
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 use Drupal\views\View;
 
 /**
diff --git a/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php b/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
index a0e65c7..7e4e375 100644
--- a/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Tests\Handler;
 
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 
 /**
  * Tests the core views_handler_field_boolean handler.
diff --git a/lib/Drupal/views/Tests/Handler/FieldCounterTest.php b/lib/Drupal/views/Tests/Handler/FieldCounterTest.php
index ad28279..5897478 100644
--- a/lib/Drupal/views/Tests/Handler/FieldCounterTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldCounterTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Tests\Handler;
 
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 
 /**
  * Tests the views_handler_field_counter handler.
diff --git a/lib/Drupal/views/Tests/Handler/FieldCustomTest.php b/lib/Drupal/views/Tests/Handler/FieldCustomTest.php
index d299fd7..803ae61 100644
--- a/lib/Drupal/views/Tests/Handler/FieldCustomTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldCustomTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Tests\Handler;
 
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 
 /**
  * Tests the core views_handler_field_custom handler.
diff --git a/lib/Drupal/views/Tests/Handler/FieldDateTest.php b/lib/Drupal/views/Tests/Handler/FieldDateTest.php
index d7ab303..eff9ae6 100644
--- a/lib/Drupal/views/Tests/Handler/FieldDateTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldDateTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Tests\Handler;
 
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 
 /**
  * Tests the core views_handler_field_date handler.
diff --git a/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php b/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php
index 1e6a3fa..5d74e90 100644
--- a/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Tests\Handler;
 
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 
 /**
  * Tests the core views_handler_field_file_size handler.
diff --git a/lib/Drupal/views/Tests/Handler/FieldMathTest.php b/lib/Drupal/views/Tests/Handler/FieldMathTest.php
index ec58303..cd7bbe1 100644
--- a/lib/Drupal/views/Tests/Handler/FieldMathTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldMathTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Tests\Handler;
 
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 
 /**
  * Tests the core views_handler_field_math handler.
diff --git a/lib/Drupal/views/Tests/Handler/FieldTest.php b/lib/Drupal/views/Tests/Handler/FieldTest.php
index 4b85e8c..c7190e6 100644
--- a/lib/Drupal/views/Tests/Handler/FieldTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Tests\Handler;
 
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 
 /**
  * Tests the generic field handler
diff --git a/lib/Drupal/views/Tests/Handler/FieldUrlTest.php b/lib/Drupal/views/Tests/Handler/FieldUrlTest.php
index 3088074..edd1ccd 100644
--- a/lib/Drupal/views/Tests/Handler/FieldUrlTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldUrlTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Tests\Handler;
 
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 /**
  * Tests the core views_handler_field_url handler.
  */
diff --git a/lib/Drupal/views/Tests/Handler/FieldXssTest.php b/lib/Drupal/views/Tests/Handler/FieldXssTest.php
index 0fc0072..97f636d 100644
--- a/lib/Drupal/views/Tests/Handler/FieldXssTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldXssTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Tests\Handler;
 
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 
 /**
  * Tests the core views_handler_field_css handler.
diff --git a/lib/Drupal/views/Tests/Handler/FilterCombineTest.php b/lib/Drupal/views/Tests/Handler/FilterCombineTest.php
index 9371b05..ebb1bbf 100644
--- a/lib/Drupal/views/Tests/Handler/FilterCombineTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterCombineTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Tests\Handler;
 
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 
 /**
  * Tests the combine filter handler.
diff --git a/lib/Drupal/views/Tests/Handler/FilterDateTest.php b/lib/Drupal/views/Tests/Handler/FilterDateTest.php
index 2efa686..19d96a5 100644
--- a/lib/Drupal/views/Tests/Handler/FilterDateTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterDateTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Tests\Handler;
 
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 use Drupal\views\View;
 
 /**
diff --git a/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php b/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php
index 351b507..7e1874b 100644
--- a/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Tests\Handler;
 
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 
 /**
  * Tests the core views_handler_filter_equality handler.
diff --git a/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php b/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php
index 1bdfb82..f3b0da5 100644
--- a/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Tests\Handler;
 
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 
 /**
  * Tests the core views_handler_filter_in_operator handler.
diff --git a/lib/Drupal/views/Tests/Handler/FilterNumericTest.php b/lib/Drupal/views/Tests/Handler/FilterNumericTest.php
index 849cc4c..f24f433 100644
--- a/lib/Drupal/views/Tests/Handler/FilterNumericTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterNumericTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Tests\Handler;
 
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 
 /**
  * Tests the numeric filter handler.
diff --git a/lib/Drupal/views/Tests/Handler/FilterStringTest.php b/lib/Drupal/views/Tests/Handler/FilterStringTest.php
index 7c3679b..426e657 100644
--- a/lib/Drupal/views/Tests/Handler/FilterStringTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterStringTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Tests\Handler;
 
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 
 /**
  * Tests the core views_handler_filter_string handler.
diff --git a/lib/Drupal/views/Tests/Handler/SortDateTest.php b/lib/Drupal/views/Tests/Handler/SortDateTest.php
index cf61bfd..f2f67a2 100644
--- a/lib/Drupal/views/Tests/Handler/SortDateTest.php
+++ b/lib/Drupal/views/Tests/Handler/SortDateTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Tests\Handler;
 
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 
 /**
  * Tests for core views_handler_sort_date handler.
diff --git a/lib/Drupal/views/Tests/Handler/SortRandomTest.php b/lib/Drupal/views/Tests/Handler/SortRandomTest.php
index d2ef174..da9f4aa 100644
--- a/lib/Drupal/views/Tests/Handler/SortRandomTest.php
+++ b/lib/Drupal/views/Tests/Handler/SortRandomTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Tests\Handler;
 
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 
 /**
  * Tests for core views_handler_sort_random handler.
diff --git a/lib/Drupal/views/Tests/Handler/SortTest.php b/lib/Drupal/views/Tests/Handler/SortTest.php
index 5d128cc..cf6a4ca 100644
--- a/lib/Drupal/views/Tests/Handler/SortTest.php
+++ b/lib/Drupal/views/Tests/Handler/SortTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Tests\Handler;
 
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 
 /**
  * Tests for core views_handler_sort handler.
diff --git a/lib/Drupal/views/Tests/HandlersTest.php b/lib/Drupal/views/Tests/HandlersTest.php
index b44ce0c..cae4efd 100644
--- a/lib/Drupal/views/Tests/HandlersTest.php
+++ b/lib/Drupal/views/Tests/HandlersTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use ViewsSqlTest;
-
 /**
  * Tests abstract handlers of views.
  */
diff --git a/lib/Drupal/views/Tests/ModuleTest.php b/lib/Drupal/views/Tests/ModuleTest.php
index e97430b..6cd8e37 100644
--- a/lib/Drupal/views/Tests/ModuleTest.php
+++ b/lib/Drupal/views/Tests/ModuleTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use ViewsSqlTest;
-
 /**
  * Tests basic functions from the Views module.
  */
diff --git a/lib/Drupal/views/Tests/PagerTest.php b/lib/Drupal/views/Tests/PagerTest.php
index 9d21bd0..1967438 100644
--- a/lib/Drupal/views/Tests/PagerTest.php
+++ b/lib/Drupal/views/Tests/PagerTest.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use ViewsSqlTest;
 use Drupal\views\View;
 
 /**
diff --git a/lib/Drupal/views/Tests/Plugins/DisplayTestCase.php b/lib/Drupal/views/Tests/Plugins/DisplayTestCase.php
index 40b01ed..542d3ff 100644
--- a/lib/Drupal/views/Tests/Plugins/DisplayTestCase.php
+++ b/lib/Drupal/views/Tests/Plugins/DisplayTestCase.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Tests\Plugins;
 
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 use Drupal\views\View;
 
 /**
diff --git a/lib/Drupal/views/Tests/QueryGroupByTest.php b/lib/Drupal/views/Tests/QueryGroupByTest.php
index e871454..4acc8ef 100644
--- a/lib/Drupal/views/Tests/QueryGroupByTest.php
+++ b/lib/Drupal/views/Tests/QueryGroupByTest.php
@@ -8,7 +8,6 @@
 namespace Drupal\views\Tests;
 
 use Drupal\views\View;
-use ViewsSqlTest;
 
 /**
  * Tests aggregate functionality of views, for example count.
diff --git a/lib/Drupal/views/Tests/Style/PluginStyleJumpMenuTest.php b/lib/Drupal/views/Tests/Style/PluginStyleJumpMenuTest.php
index ac2c0c3..2518a37 100644
--- a/lib/Drupal/views/Tests/Style/PluginStyleJumpMenuTest.php
+++ b/lib/Drupal/views/Tests/Style/PluginStyleJumpMenuTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Tests\Style;
 
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 use Drupal\views\View;
 
 /**
diff --git a/lib/Drupal/views/Tests/Style/PluginStyleTest.php b/lib/Drupal/views/Tests/Style/PluginStyleTest.php
index 52109bf..4452259 100644
--- a/lib/Drupal/views/Tests/Style/PluginStyleTest.php
+++ b/lib/Drupal/views/Tests/Style/PluginStyleTest.php
@@ -9,7 +9,7 @@ namespace Drupal\views\Tests\Style;
 
 use stdClass;
 use DOMDocument;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 
 /**
  * Tests some general style plugin related functionality.
diff --git a/lib/Drupal/views/Tests/Style/PluginStyleUnformattedTest.php b/lib/Drupal/views/Tests/Style/PluginStyleUnformattedTest.php
index 39dc227..608951e 100644
--- a/lib/Drupal/views/Tests/Style/PluginStyleUnformattedTest.php
+++ b/lib/Drupal/views/Tests/Style/PluginStyleUnformattedTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\views\Tests\Style;
 
 use DOMDocument;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 
 /**
  * Tests the default/unformatted row style.
diff --git a/lib/Drupal/views/Tests/TranslatableTest.php b/lib/Drupal/views/Tests/TranslatableTest.php
index ab05448..93efcb5 100644
--- a/lib/Drupal/views/Tests/TranslatableTest.php
+++ b/lib/Drupal/views/Tests/TranslatableTest.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use ViewsSqlTest;
 use Drupal\views\View;
 
 /**
diff --git a/lib/Drupal/views/Tests/UpgradeTestCase.php b/lib/Drupal/views/Tests/UpgradeTestCase.php
index 04cf707..e109d22 100644
--- a/lib/Drupal/views/Tests/UpgradeTestCase.php
+++ b/lib/Drupal/views/Tests/UpgradeTestCase.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use ViewsSqlTest;
 use Drupal\views\View;
 
 /**
diff --git a/lib/Drupal/views/Tests/User/HandlerFieldUserNameTest.php b/lib/Drupal/views/Tests/User/HandlerFieldUserNameTest.php
index 20272b7..6c7282c 100644
--- a/lib/Drupal/views/Tests/User/HandlerFieldUserNameTest.php
+++ b/lib/Drupal/views/Tests/User/HandlerFieldUserNameTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\views\Tests\User;
 
 use Drupal\views\View;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 
 /**
  * Tests the field username handler.
diff --git a/lib/Drupal/views/Tests/User/UserArgumentDefault.php b/lib/Drupal/views/Tests/User/UserArgumentDefault.php
index 68ae050..838fbfe 100644
--- a/lib/Drupal/views/Tests/User/UserArgumentDefault.php
+++ b/lib/Drupal/views/Tests/User/UserArgumentDefault.php
@@ -8,7 +8,7 @@
 namespace Drupal\views\Tests\User;
 
 use Drupal\views\View;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 
 /**
  * Tests views user argument default plugin.
diff --git a/lib/Drupal/views/Tests/User/UserArgumentValidate.php b/lib/Drupal/views/Tests/User/UserArgumentValidate.php
index eb38d47..06c71e2 100644
--- a/lib/Drupal/views/Tests/User/UserArgumentValidate.php
+++ b/lib/Drupal/views/Tests/User/UserArgumentValidate.php
@@ -8,7 +8,7 @@
 namespace Drupal\views\Tests\User;
 
 use Drupal\views\View;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 
 /**
  * Tests views user argument argument handler.
diff --git a/lib/Drupal/views/Tests/User/UserTestCase.php b/lib/Drupal/views/Tests/User/UserTestCase.php
index 359fb99..2d2f9b6 100644
--- a/lib/Drupal/views/Tests/User/UserTestCase.php
+++ b/lib/Drupal/views/Tests/User/UserTestCase.php
@@ -8,7 +8,7 @@
 namespace Drupal\views\Tests\User;
 
 use Drupal\views\View;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
 
 /**
  * Tests basic user module integration into views.
diff --git a/lib/Drupal/views/Tests/ViewTest.php b/lib/Drupal/views/Tests/ViewTest.php
index fddd502..dffdc89 100644
--- a/lib/Drupal/views/Tests/ViewTest.php
+++ b/lib/Drupal/views/Tests/ViewTest.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use ViewsSqlTest;
 use Drupal\views\View;
 
 /**
diff --git a/tests/views_query.test b/lib/Drupal/views/Tests/ViewsSqlTest.php
similarity index 63%
rename from tests/views_query.test
rename to lib/Drupal/views/Tests/ViewsSqlTest.php
index 4ad0361..6937290 100644
--- a/tests/views_query.test
+++ b/lib/Drupal/views/Tests/ViewsSqlTest.php
@@ -1,132 +1,13 @@
 <?php
-
 /**
  * @file
- * Tests for Views query features.
+ * Definition of Drupal\views\Tests\ViewsSqlTest
  */
+namespace Drupal\views\Tests;
 
-use Drupal\simpletest\WebTestBase;
 use Drupal\views\View;
 
-/**
- * Abstract class for views testing.
- */
-abstract class ViewsTestCase extends WebTestBase {
-  /**
-   * Helper function: verify a result set returned by view.
-   *
-   * The comparison is done on the string representation of the columns of the
-   * column map, taking the order of the rows into account, but not the order
-   * of the columns.
-   *
-   * @param $view
-   *  An executed View.
-   * @param $expected_result
-   *  An expected result set.
-   * @param $column_map
-   *  An associative array mapping the columns of the result set from the view
-   *  (as keys) and the expected result set (as values).
-   */
-  protected function assertIdenticalResultset($view, $expected_result, $column_map = array(), $message = 'Identical result set') {
-    return $this->assertIdenticalResultsetHelper($view, $expected_result, $column_map, $message, 'assertIdentical');
-  }
-
-  /**
-   * Helper function: verify a result set returned by view..
-   *
-   * Inverse of ViewsTestCase::assertIdenticalResultset().
-   *
-   * @param $view
-   *  An executed View.
-   * @param $expected_result
-   *  An expected result set.
-   * @param $column_map
-   *  An associative array mapping the columns of the result set from the view
-   *  (as keys) and the expected result set (as values).
-   */
-  protected function assertNotIdenticalResultset($view, $expected_result, $column_map = array(), $message = 'Identical result set') {
-    return $this->assertIdenticalResultsetHelper($view, $expected_result, $column_map, $message, 'assertNotIdentical');
-  }
-
-  protected function assertIdenticalResultsetHelper($view, $expected_result, $column_map, $message, $assert_method) {
-    // Convert $view->result to an array of arrays.
-    $result = array();
-    foreach ($view->result as $key => $value) {
-      $row = array();
-      foreach ($column_map as $view_column => $expected_column) {
-        // The comparison will be done on the string representation of the value.
-        $row[$expected_column] = (string) $value->$view_column;
-      }
-      $result[$key] = $row;
-    }
-
-    // Remove the columns we don't need from the expected result.
-    foreach ($expected_result as $key => $value) {
-      $row = array();
-      foreach ($column_map as $expected_column) {
-        // The comparison will be done on the string representation of the value.
-        $row[$expected_column] = (string) (is_object($value) ? $value->$expected_column : $value[$expected_column]);
-      }
-      $expected_result[$key] = $row;
-    }
-
-    // Reset the numbering of the arrays.
-    $result = array_values($result);
-    $expected_result = array_values($expected_result);
-
-    $this->verbose('<pre>Returned data set: ' . print_r($result, TRUE) . "\n\nExpected: ". print_r($expected_result, TRUE));
-
-    // Do the actual comparison.
-    return $this->$assert_method($result, $expected_result, $message);
-  }
-
-  /**
-   * Helper function: order an array of array based on a column.
-   */
-  protected function orderResultSet($result_set, $column, $reverse = FALSE) {
-    $this->sort_column = $column;
-    $this->sort_order = $reverse ? -1 : 1;
-    usort($result_set, array($this, 'helperCompareFunction'));
-    return $result_set;
-  }
-
-  protected $sort_column = NULL;
-  protected $sort_order = 1;
-
-  /**
-   * Helper comparison function for orderResultSet().
-   */
-  protected function helperCompareFunction($a, $b) {
-    $value1 = $a[$this->sort_column];
-    $value2 = $b[$this->sort_column];
-    if ($value1 == $value2) {
-        return 0;
-    }
-    return $this->sort_order * (($value1 < $value2) ? -1 : 1);
-  }
-
-  /**
-   * Helper function to check whether a button with a certain id exists and has a certain label.
-   */
-  protected function helperButtonHasLabel($id, $expected_label, $message = 'Label has the expected value: %label.') {
-    return $this->assertFieldById($id, $expected_label, t($message, array('%label' => $expected_label)));
-  }
-
-  /**
-   * Helper function to execute a view with debugging.
-   *
-   * @param view $view
-   * @param array $args
-   */
-  protected function executeView($view, $args = array()) {
-    $view->set_display();
-    $view->pre_execute($args);
-    $view->execute();
-    $this->verbose('<pre>Executed view: ' . ((string) $view->build_info['query']) . '</pre>');
-  }
-}
-
-abstract class ViewsSqlTest extends ViewsTestCase {
+abstract class ViewsSqlTest extends ViewsTestBase {
 
   protected function setUp() {
     parent::setUp('views', 'views_ui');
diff --git a/lib/Drupal/views/Tests/ViewsTestBase.php b/lib/Drupal/views/Tests/ViewsTestBase.php
new file mode 100644
index 0000000..d6f021a
--- /dev/null
+++ b/lib/Drupal/views/Tests/ViewsTestBase.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * @file
+ * Definition of Drupal\views\Tests\ViewsTestBase
+ */
+
+namespace Drupal\views\Tests;
+use Drupal\simpletest\WebTestBase;
+use Drupal\views\View;
+
+/**
+   * Abstract class for views testing.
+   */
+abstract class ViewsTestBase extends WebTestBase {
+  /**
+   * Helper function: verify a result set returned by view.
+   *
+   * The comparison is done on the string representation of the columns of the
+   * column map, taking the order of the rows into account, but not the order
+   * of the columns.
+   *
+   * @param $view
+   *  An executed View.
+   * @param $expected_result
+   *  An expected result set.
+   * @param $column_map
+   *  An associative array mapping the columns of the result set from the view
+   *  (as keys) and the expected result set (as values).
+   */
+  protected function assertIdenticalResultset($view, $expected_result, $column_map = array(), $message = 'Identical result set') {
+    return $this->assertIdenticalResultsetHelper($view, $expected_result, $column_map, $message, 'assertIdentical');
+  }
+
+  /**
+   * Helper function: verify a result set returned by view..
+   *
+   * Inverse of ViewsTestCase::assertIdenticalResultset().
+   *
+   * @param $view
+   *  An executed View.
+   * @param $expected_result
+   *  An expected result set.
+   * @param $column_map
+   *  An associative array mapping the columns of the result set from the view
+   *  (as keys) and the expected result set (as values).
+   */
+  protected function assertNotIdenticalResultset($view, $expected_result, $column_map = array(), $message = 'Identical result set') {
+    return $this->assertIdenticalResultsetHelper($view, $expected_result, $column_map, $message, 'assertNotIdentical');
+  }
+
+  protected function assertIdenticalResultsetHelper($view, $expected_result, $column_map, $message, $assert_method) {
+    // Convert $view->result to an array of arrays.
+    $result = array();
+    foreach ($view->result as $key => $value) {
+      $row = array();
+      foreach ($column_map as $view_column => $expected_column) {
+        // The comparison will be done on the string representation of the value.
+        $row[$expected_column] = (string) $value->$view_column;
+      }
+      $result[$key] = $row;
+    }
+
+    // Remove the columns we don't need from the expected result.
+    foreach ($expected_result as $key => $value) {
+      $row = array();
+      foreach ($column_map as $expected_column) {
+        // The comparison will be done on the string representation of the value.
+        $row[$expected_column] = (string) (is_object($value) ? $value->$expected_column : $value[$expected_column]);
+      }
+      $expected_result[$key] = $row;
+    }
+
+    // Reset the numbering of the arrays.
+    $result = array_values($result);
+    $expected_result = array_values($expected_result);
+
+    $this->verbose('<pre>Returned data set: ' . print_r($result, TRUE) . "\n\nExpected: ". print_r($expected_result, TRUE));
+
+    // Do the actual comparison.
+    return $this->$assert_method($result, $expected_result, $message);
+  }
+
+  /**
+   * Helper function: order an array of array based on a column.
+   */
+  protected function orderResultSet($result_set, $column, $reverse = FALSE) {
+    $this->sort_column = $column;
+    $this->sort_order = $reverse ? -1 : 1;
+    usort($result_set, array($this, 'helperCompareFunction'));
+    return $result_set;
+  }
+
+  protected $sort_column = NULL;
+  protected $sort_order = 1;
+
+  /**
+   * Helper comparison function for orderResultSet().
+   */
+  protected function helperCompareFunction($a, $b) {
+    $value1 = $a[$this->sort_column];
+    $value2 = $b[$this->sort_column];
+    if ($value1 == $value2) {
+      return 0;
+    }
+    return $this->sort_order * (($value1 < $value2) ? -1 : 1);
+  }
+
+  /**
+   * Helper function to check whether a button with a certain id exists and has a certain label.
+   */
+  protected function helperButtonHasLabel($id, $expected_label, $message = 'Label has the expected value: %label.') {
+    return $this->assertFieldById($id, $expected_label, t($message, array('%label' => $expected_label)));
+  }
+
+  /**
+   * Helper function to execute a view with debugging.
+   *
+   * @param view $view
+   * @param array $args
+   */
+  protected function executeView($view, $args = array()) {
+    $view->set_display();
+    $view->pre_execute($args);
+    $view->execute();
+    $this->verbose('<pre>Executed view: ' . ((string) $view->build_info['query']) . '</pre>');
+  }
+}
diff --git a/lib/Drupal/views/Tests/WizardTestBase.php b/lib/Drupal/views/Tests/WizardTestBase.php
index 1cdc18a..8ef9cc5 100644
--- a/lib/Drupal/views/Tests/WizardTestBase.php
+++ b/lib/Drupal/views/Tests/WizardTestBase.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use ViewsSqlTest;
-
 /**
  * Views UI wizard tests.
  */
diff --git a/views.info b/views.info
index 3ccd3b6..6d1b1ad 100644
--- a/views.info
+++ b/views.info
@@ -246,5 +246,4 @@ 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/views_plugin_localization_test.inc
-files[] = tests/views_query.test
 files[] = tests/views_test.views_default.inc