diff --git a/modules/@angular/router/test/router.spec.ts b/modules/@angular/router/test/router.spec.ts
index 3a027b48603df..fd0c4ea62885b 100644
--- a/modules/@angular/router/test/router.spec.ts
+++ b/modules/@angular/router/test/router.spec.ts
@@ -9,12 +9,12 @@ import {Observable} from 'rxjs/Observable';
 import {of } from 'rxjs/observable/of';
 
 import {ActivatedRoute, ActivatedRouteSnapshot, CanActivate, CanDeactivate, Event, NavigationCancel, NavigationEnd, NavigationError, NavigationStart, Params, ROUTER_DIRECTIVES, Resolve, Router, RouterStateSnapshot, RoutesRecognized, provideRoutes} from '../index';
-import {RouterTestModule, SpyAppModuleFactoryLoader} from '../testing';
+import {RouterTestingModule, SpyAppModuleFactoryLoader} from '../testing';
 
 describe('Integration', () => {
   beforeEach(() => {
     configureModule({
-      modules: [RouterTestModule],
+      modules: [RouterTestingModule],
       providers: [provideRoutes(
           [{path: '', component: BlankCmp}, {path: 'simple', component: SimpleCmp}])]
     });
diff --git a/modules/@angular/router/testing.ts b/modules/@angular/router/testing.ts
index d8667e21e9142..c4ed344c938df 100644
--- a/modules/@angular/router/testing.ts
+++ b/modules/@angular/router/testing.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './testing/router_test_module';
\ No newline at end of file
+export * from './testing/router_testing_module';
\ No newline at end of file
diff --git a/modules/@angular/router/testing/router_test_module.ts b/modules/@angular/router/testing/router_testing_module.ts
similarity index 98%
rename from modules/@angular/router/testing/router_test_module.ts
rename to modules/@angular/router/testing/router_testing_module.ts
index a812178375b57..7581064a429ee 100644
--- a/modules/@angular/router/testing/router_test_module.ts
+++ b/modules/@angular/router/testing/router_testing_module.ts
@@ -77,5 +77,5 @@ export class SpyAppModuleFactoryLoader implements AppModuleFactoryLoader {
     },
   ]
 })
-export class RouterTestModule {
+export class RouterTestingModule {
 }
diff --git a/modules/@angular/router/tsconfig-es2015.json b/modules/@angular/router/tsconfig-es2015.json
index 9ee3b1d581e82..2b3869ec1ab5e 100644
--- a/modules/@angular/router/tsconfig-es2015.json
+++ b/modules/@angular/router/tsconfig-es2015.json
@@ -21,6 +21,7 @@
     "target": "es6"
   },
   "files": [
-    "index.ts"
+    "index.ts",
+    "testing.ts"
   ]
 }
\ No newline at end of file
diff --git a/modules/@angular/router/tsconfig-es5.json b/modules/@angular/router/tsconfig-es5.json
index 63d035662b74f..260dd8e5cfdc6 100644
--- a/modules/@angular/router/tsconfig-es5.json
+++ b/modules/@angular/router/tsconfig-es5.json
@@ -21,7 +21,8 @@
     "target": "es5"
   },
   "files": [
-    "index.ts"
+    "index.ts",
+    "testing.ts"
   ]
 }
 
diff --git a/modules/@angular/router/tsconfig.json b/modules/@angular/router/tsconfig.json
index da9d6d583e67b..e9c83d00e014c 100644
--- a/modules/@angular/router/tsconfig.json
+++ b/modules/@angular/router/tsconfig.json
@@ -22,6 +22,7 @@
   },
   "files": [
     "index.ts",
+    "testing.ts",
     "src/router.ts",
     "src/apply_redirects.ts",
     "src/recognize.ts",