diff --git a/entityreference_autocomplete.info b/entityreference_autocomplete.info
index d3bddab..2c5633e 100644
--- a/entityreference_autocomplete.info
+++ b/entityreference_autocomplete.info
@@ -1,9 +1,4 @@
 name = Entity Reference Autocomplete
-description = A Form API element type to reference arbitrary entities through an autocomplete textfield
+description = A Form API element type to reference arbitrary entities through an autocomplete textfield.
 core = 7.x
 php = 5.3
-
-autoload[tests/src][] = Drupal\Tests\entity_reference_autocomplete
-
-; Dependencies for running autotests.
-test_dependencies[] = autoload (>=7.x-1.3)
diff --git a/tests/src/BaseTest.inc b/src/Tests/BaseTest.php
similarity index 76%
rename from tests/src/BaseTest.inc
rename to src/Tests/BaseTest.php
index 24536c9..a257562 100644
--- a/tests/src/BaseTest.inc
+++ b/src/Tests/BaseTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\entity_reference_autocomplete;
+namespace Drupal\entityreference_autocomplete\Tests;
 
 /**
  * Base fixture for "entityreference_autocomplete" tests.
@@ -8,26 +8,6 @@ namespace Drupal\Tests\entity_reference_autocomplete;
 abstract class BaseTest extends \DrupalWebTestCase {
 
   /**
-   * Description of the test.
-   */
-  const DESCRIPTION = '';
-
-  /**
-   * {@inheritdoc}
-   */
-  final public static function getInfo() {
-    $info = array();
-    $info['name'] = static::class;
-    $info['group'] = 'Entity';
-
-    if (!empty(static::DESCRIPTION)) {
-      $info['description'] = static::DESCRIPTION;
-    }
-
-    return $info;
-  }
-
-  /**
    * {@inheritdoc}
    */
   protected function setUp() {
diff --git a/tests/src/ValueCallbackTest.inc b/src/Tests/ValueCallbackTest.php
similarity index 91%
rename from tests/src/ValueCallbackTest.inc
rename to src/Tests/ValueCallbackTest.php
index 2d9f6a6..8b70de3 100644
--- a/tests/src/ValueCallbackTest.inc
+++ b/src/Tests/ValueCallbackTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\entity_reference_autocomplete;
+namespace Drupal\entityreference_autocomplete\Tests;
 
 /**
  * {@inheritdoc}
@@ -10,7 +10,13 @@ class ValueCallbackTest extends BaseTest {
   /**
    * {@inheritdoc}
    */
-  const DESCRIPTION = 'Ensure that "#value_callback" from element definition works properly.';
+  public static function getInfo() {
+    return array(
+      'name' => 'Tests of the "#value_callback"',
+      'group' => 'Entity Reference Autocomplete',
+      'description' => 'Ensure that "#value_callback" from element definition works properly.',
+    );
+  }
 
   /**
    * Test acceptable values for element definition.