diff --git a/core/modules/tracker/tracker.test b/core/modules/tracker/lib/Drupal/Tracker/Test/TrackerTest.php
similarity index 99%
rename from core/modules/tracker/tracker.test
rename to core/modules/tracker/lib/Drupal/Tracker/Test/TrackerTest.php
index 7c7663f..b14a598 100644
--- a/core/modules/tracker/tracker.test
+++ b/core/modules/tracker/lib/Drupal/Tracker/Test/TrackerTest.php
@@ -5,6 +5,10 @@
  * Tests for tracker.module.
  */
 
+namespace Drupal\Tracker\Test;
+
+use DrupalWebTestCase;
+
 /**
  * Defines a base class for testing tracker.module.
  */
diff --git a/core/modules/tracker/tracker.info b/core/modules/tracker/tracker.info
index a765504..b39eb3f 100644
--- a/core/modules/tracker/tracker.info
+++ b/core/modules/tracker/tracker.info
@@ -4,4 +4,3 @@ dependencies[] = comment
 package = Core
 version = VERSION
 core = 8.x
-files[] = tracker.test
diff --git a/core/modules/tracker/tracker.module b/core/modules/tracker/tracker.module
index 22c8a57..bb45f37 100644
--- a/core/modules/tracker/tracker.module
+++ b/core/modules/tracker/tracker.module
@@ -69,6 +69,17 @@ function tracker_menu() {
 }
 
 /**
+ * Implements hook_init().
+ */
+function tracker_init() {
+  // Register Tracker module's namespace.
+  // @TODO: This is not needed with http://drupal.org/node/1467126
+  $loader = drupal_classloader();
+  $path = drupal_get_path('module', 'tracker');
+  $loader->registerNamespace("Drupal\\Tracker\\Test", $path . '/lib/');
+}
+
+/**
  * Implements hook_cron().
  *
  * Updates tracking information for any items still to be tracked. The variable
@@ -396,3 +407,12 @@ function _tracker_remove($nid, $uid = NULL, $changed = NULL) {
       ->execute();
   }
 }
+
+/**
+ * Implements hook_simpletest_alter().
+ */
+function tracker_simpletest_alter(&$groups) {
+  // Register all the tests to SimpleTest.
+  // @TODO: Have SimpleTest register all the namespaced classes.
+  $groups['Tracker']['Drupal\Tracker\Test\TrackerTest'] = Drupal\Tracker\Test\TrackerTest::getInfo();
+}