diff --git a/karma-test-shim.js b/karma-test-shim.js
index 808724fde..e2e13a8ca 100644
--- a/karma-test-shim.js
+++ b/karma-test-shim.js
@@ -27,8 +27,8 @@ System.import('base/karma-systemjs-config.js').then(function() {
     var testing = providers[0];
     var testingBrowser = providers[1];
 
-    testing.setBaseTestProviders(testingBrowser.TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
-      testingBrowser.TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS);
+    testing.TestBed.initTestEnvironment(testingBrowser.BrowserDynamicTestingModule,
+      testingBrowser.platformBrowserDynamicTesting());
   });
 }).then(function() {
         return Promise.all(
diff --git a/karma.conf.js b/karma.conf.js
index a3d72adaf..0dc996c03 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -13,11 +13,10 @@ module.exports = function(config) {
         }
     },
     files: [
-      {pattern: 'node_modules/es6-shim/es6-shim.js', included: true, watched: true},
+      {pattern: 'node_modules/core-js/client/core.js', included: true, watched: true},
       {pattern: 'node_modules/zone.js/dist/zone.js', included: true, watched: true},
-      //Needed for async testsing {https://github.com/angular/angular/issues/8232}
+      // Needed for async testsing {https://github.com/angular/angular/issues/8232}
       {pattern: 'node_modules/zone.js/dist/async-test.js', included: true, watched: true},
-      {pattern: 'node_modules/reflect-metadata/Reflect.js', included: true, watched: true},
       {pattern: 'node_modules/systemjs/dist/system-polyfills.js', included: true, watched: false },
       {pattern: 'node_modules/systemjs/dist/system.src.js', included: true, watched: true},
       
@@ -38,8 +37,8 @@ module.exports = function(config) {
 
       // paths loaded via Angular's component compiler
       // (these paths need to be rewritten, see proxies section)
-      {pattern: 'dist/**/*.html', included: false, watched: true},
-      {pattern: 'dist/**/*.css', included: false, watched: true},
+      // {pattern: 'dist/**/*.html', included: false, watched: true},
+      // {pattern: 'dist/**/*.css', included: false, watched: true},
 
       // paths to support debugging with source maps in dev tools
       {pattern: 'dist/**/*.ts', included: false, watched: false},
diff --git a/package.json b/package.json
index dde1c7e12..fb0e4be36 100644
--- a/package.json
+++ b/package.json
@@ -23,15 +23,16 @@
   },
   "homepage": "https://github.com/SebastianM/angular2-google-maps#readme",
   "dependencies": {
-    "@angular/common": "2.0.0-rc.4",
-    "@angular/compiler": "2.0.0-rc.4",
-    "@angular/core": "2.0.0-rc.4",
-    "@angular/platform-browser": "2.0.0-rc.4",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.4",
-    "es6-shim": "^0.35.0",
-    "reflect-metadata": "^0.1.3",
+    "@angular/common": "2.0.0-rc.5",
+    "@angular/compiler": "2.0.0-rc.5",
+    "@angular/core": "2.0.0-rc.5",
+    "@angular/http": "2.0.0-rc.5",
+    "@angular/platform-browser": "2.0.0-rc.5",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.5",
+    "core-js": "^2.4.0",
+    "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",
-    "zone.js": "^0.6.12"
+    "zone.js": "0.6.12"
   },
   "devDependencies": {
     "babel-eslint": "6.0.4",
@@ -72,15 +73,16 @@
   "jspm": {
     "jspmNodeConversion": false,
     "dependencies": {
-      "@angular/common": "2.0.0-rc.4",
-      "@angular/compiler": "2.0.0-rc.4",
-      "@angular/core": "2.0.0-rc.4",
-      "@angular/platform-browser": "2.0.0-rc.4",
-      "@angular/platform-browser-dynamic": "2.0.0-rc.4",
-      "es6-shim": "^0.35.0",
-      "reflect-metadata": "^0.1.3",
+      "@angular/common": "2.0.0-rc.5",
+      "@angular/compiler": "2.0.0-rc.5",
+      "@angular/core": "2.0.0-rc.5",
+      "@angular/http": "2.0.0-rc.5",
+      "@angular/platform-browser": "2.0.0-rc.5",
+      "@angular/platform-browser-dynamic": "2.0.0-rc.5",
+      "core-js": "^2.4.0",
+      "reflect-metadata": "0.1.3",
       "rxjs": "5.0.0-beta.6",
-      "zone.js": "^0.6.12"
+      "zone.js": "0.6.12"
     }
   }
 }
diff --git a/test/services/managers/marker-manager.spec.ts b/test/services/managers/marker-manager.spec.ts
index 26cd13788..0e0890c74 100644
--- a/test/services/managers/marker-manager.spec.ts
+++ b/test/services/managers/marker-manager.spec.ts
@@ -1,5 +1,5 @@
 import {NgZone} from '@angular/core';
-import {addProviders, async, describe, inject, it} from '@angular/core/testing';
+import {addProviders, async, inject} from '@angular/core/testing';
 
 import {SebmGoogleMapMarker} from '../../../src/core/directives/google-map-marker';
 import {GoogleMapsAPIWrapper} from '../../../src/core/services/google-maps-api-wrapper';
diff --git a/test/services/maps-api-loader/lazy-maps-api-loader.spec.ts b/test/services/maps-api-loader/lazy-maps-api-loader.spec.ts
index a2a9d2602..a72d31a84 100644
--- a/test/services/maps-api-loader/lazy-maps-api-loader.spec.ts
+++ b/test/services/maps-api-loader/lazy-maps-api-loader.spec.ts
@@ -1,4 +1,4 @@
-import {addProviders, describe, inject, it} from '@angular/core/testing';
+import {addProviders, inject} from '@angular/core/testing';
 
 import {LazyMapsAPILoader} from '../../../src/core/services/maps-api-loader/lazy-maps-api-loader';
 import {MapsAPILoader} from '../../../src/core/services/maps-api-loader/maps-api-loader';
diff --git a/typings.json b/typings.json
index 6712e2754..ea7b0bf96 100644
--- a/typings.json
+++ b/typings.json
@@ -1,7 +1,9 @@
 {
   "name": "angular2-google-maps",
   "globalDevDependencies": {
-    "es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#4de74cb527395c13ba20b438c3a7a419ad931f1c",
-    "jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#dd638012d63e069f2c99d06ef4dcc9616a943ee4"
+    "jasmine": "registry:dt/jasmine#2.2.0+20160505161446"
+  },
+  "globalDependencies": {
+    "core-js": "registry:dt/core-js#0.0.0+20160317120654"
   }
 }