diff --git a/lib/Drupal/views/Tests/HandlersTest.php b/lib/Drupal/views/Tests/Handler/HandlerTest.php
similarity index 97%
rename from lib/Drupal/views/Tests/HandlersTest.php
rename to lib/Drupal/views/Tests/Handler/HandlerTest.php
index 98d5dd90f842affa50d95a71925d70cb322177be..fa49a461a9723549979afb2b10e64daab6097729 100644
--- a/lib/Drupal/views/Tests/HandlersTest.php
+++ b/lib/Drupal/views/Tests/Handler/HandlerTest.php
@@ -2,17 +2,18 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\HandlersTest.
+ * Definition of Drupal\views\Tests\Handler\HandlerTest.
  */
 
-namespace Drupal\views\Tests;
+namespace Drupal\views\Tests\Handler;
 
 use stdClass;
+use Drupal\views\Tests\ViewTestBase;
 
 /**
  * Tests abstract handlers of views.
  */
-class HandlersTest extends ViewTestBase {
+class HandlerTest extends ViewTestBase {
 
   /**
    * Modules to enable.