diff --git a/modules/angular2/src/testing/test_component_builder.ts b/modules/angular2/src/testing/test_component_builder.ts
index 0e90dc8249..3a40e2db5d 100644
--- a/modules/angular2/src/testing/test_component_builder.ts
+++ b/modules/angular2/src/testing/test_component_builder.ts
@@ -1,26 +1,29 @@
-import {Injector, provide, Injectable} from 'angular2/src/core/di';
+import {
+  ComponentRef,
+  DebugElement,
+  DirectiveResolver,
+  DynamicComponentLoader,
+  Injector,
+  Injectable,
+  ViewMetadata,
+  ViewRef,
+  ViewResolver,
+  provide
+} from 'angular2/core';
 
 import {Type, isPresent, isBlank} from 'angular2/src/facade/lang';
 import {Promise} from 'angular2/src/facade/async';
 import {ListWrapper, MapWrapper} from 'angular2/src/facade/collection';
 
-import {ViewMetadata} from '../core/metadata';
-
-import {DirectiveResolver} from 'angular2/src/core/linker/directive_resolver';
-import {ViewResolver} from 'angular2/src/core/linker/view_resolver';
 import {AppView} from 'angular2/src/core/linker/view';
-import {internalView, ViewRef} from 'angular2/src/core/linker/view_ref';
-import {
-  DynamicComponentLoader,
-  ComponentRef
-} from 'angular2/src/core/linker/dynamic_component_loader';
+import {internalView} from 'angular2/src/core/linker/view_ref';
 
 import {el} from './utils';
 
 import {DOCUMENT} from 'angular2/src/platform/dom/dom_tokens';
 import {DOM} from 'angular2/src/platform/dom/dom_adapter';
 
-import {DebugElement, DebugElement_} from 'angular2/src/core/debug/debug_element';
+import {DebugElement_} from 'angular2/src/core/debug/debug_element';
 
 
 /**
diff --git a/modules/angular2/src/testing/test_injector.ts b/modules/angular2/src/testing/test_injector.ts
index a622a0e254..377c2c9bd6 100644
--- a/modules/angular2/src/testing/test_injector.ts
+++ b/modules/angular2/src/testing/test_injector.ts
@@ -1,4 +1,16 @@
-import {provide, Provider} from 'angular2/src/core/di';
+import {
+  APP_ID,
+  APPLICATION_COMMON_PROVIDERS,
+  AppViewManager,
+  DirectiveResolver,
+  DynamicComponentLoader,
+  Injector,
+  NgZone,
+  Renderer,
+  Provider,
+  ViewResolver,
+  provide
+} from 'angular2/core';
 import {AnimationBuilder} from 'angular2/src/animate/animation_builder';
 import {MockAnimationBuilder} from 'angular2/src/mock/animation_builder_mock';
 
@@ -12,12 +24,8 @@ import {
   ChangeDetectorGenConfig
 } from 'angular2/src/core/change_detection/change_detection';
 import {ExceptionHandler} from 'angular2/src/facade/exceptions';
-import {ViewResolver} from 'angular2/src/core/linker/view_resolver';
-import {DirectiveResolver} from 'angular2/src/core/linker/directive_resolver';
 import {PipeResolver} from 'angular2/src/core/linker/pipe_resolver';
-import {DynamicComponentLoader} from 'angular2/src/core/linker/dynamic_component_loader';
 import {XHR} from 'angular2/src/compiler/xhr';
-import {NgZone} from 'angular2/src/core/zone/ng_zone';
 
 import {DOM} from 'angular2/src/platform/dom/dom_adapter';
 
@@ -29,7 +37,6 @@ import {MockNgZone} from 'angular2/src/mock/ng_zone_mock';
 
 import {TestComponentBuilder} from './test_component_builder';
 
-import {Injector} from 'angular2/src/core/di';
 import {
   EventManager,
   EVENT_MANAGER_PLUGINS,
@@ -40,9 +47,7 @@ import {ListWrapper} from 'angular2/src/facade/collection';
 import {FunctionWrapper, Type} from 'angular2/src/facade/lang';
 
 import {AppViewPool, APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/linker/view_pool';
-import {AppViewManager} from 'angular2/src/core/linker/view_manager';
 import {AppViewManagerUtils} from 'angular2/src/core/linker/view_manager_utils';
-import {Renderer} from 'angular2/src/core/render/api';
 
 import {DOCUMENT} from 'angular2/src/platform/dom/dom_tokens';
 import {DomRenderer} from 'angular2/src/platform/dom/dom_renderer';
@@ -50,14 +55,12 @@ import {DomSharedStylesHost} from 'angular2/src/platform/dom/shared_styles_host'
 import {SharedStylesHost} from 'angular2/src/platform/dom/shared_styles_host';
 import {DomEventsPlugin} from 'angular2/src/platform/dom/events/dom_events';
 
-import {APP_ID} from 'angular2/src/core/application_tokens';
 import {Serializer} from "angular2/src/web_workers/shared/serializer";
 import {Log} from './utils';
 import {COMPILER_PROVIDERS} from 'angular2/src/compiler/compiler';
 import {DomRenderer_} from "angular2/src/platform/dom/dom_renderer";
 import {DynamicComponentLoader_} from "angular2/src/core/linker/dynamic_component_loader";
 import {AppViewManager_} from "angular2/src/core/linker/view_manager";
-import {APPLICATION_COMMON_PROVIDERS} from 'angular2/src/core/application_common_providers';
 
 /**
  * Returns the root injector providers.
diff --git a/modules/angular2/src/testing/testing.ts b/modules/angular2/src/testing/testing.ts
index 0307bda748..6112c16244 100644
--- a/modules/angular2/src/testing/testing.ts
+++ b/modules/angular2/src/testing/testing.ts
@@ -4,7 +4,7 @@
  */
 import {global} from 'angular2/src/facade/lang';
 import {ListWrapper} from 'angular2/src/facade/collection';
-import {bind} from 'angular2/src/core/di';
+import {bind} from 'angular2/core';
 
 import {
   createTestInjectorWithRuntimeCompiler,
diff --git a/modules/angular2/src/testing/testing_internal.ts b/modules/angular2/src/testing/testing_internal.ts
index f8c8985668..54c01333c1 100644
--- a/modules/angular2/src/testing/testing_internal.ts
+++ b/modules/angular2/src/testing/testing_internal.ts
@@ -3,7 +3,7 @@ import {StringMapWrapper} from 'angular2/src/facade/collection';
 import {global, isFunction, Math} from 'angular2/src/facade/lang';
 import {NgZoneZone} from 'angular2/src/core/zone/ng_zone';
 
-import {provide} from 'angular2/src/core/di';
+import {provide} from 'angular2/core';
 
 import {
   createTestInjectorWithRuntimeCompiler,
diff --git a/modules/angular2/src/testing/utils.ts b/modules/angular2/src/testing/utils.ts
index aa5ad69368..c9fa743d03 100644
--- a/modules/angular2/src/testing/utils.ts
+++ b/modules/angular2/src/testing/utils.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/src/core/di';
+import {Injectable} from 'angular2/core';
 import {ListWrapper, MapWrapper} from 'angular2/src/facade/collection';
 import {DOM} from 'angular2/src/platform/dom/dom_adapter';
 import {isPresent, isString, RegExpWrapper, StringWrapper, RegExp} from 'angular2/src/facade/lang';