diff --git a/modules/@angular/core/package.json b/modules/@angular/core/package.json
index d3fe5eb827e..21f9e8afb04 100644
--- a/modules/@angular/core/package.json
+++ b/modules/@angular/core/package.json
@@ -8,7 +8,7 @@
   "author": "angular",
   "license": "MIT",
   "peerDependencies": {
-    "rxjs": "5.0.0-beta.6",
+    "rxjs": "5.0.0-beta.11",
     "zone.js": "^0.6.6"
   },
   "repository": {
diff --git a/modules/@angular/core/testing/index.ts b/modules/@angular/core/testing/index.ts
new file mode 100644
index 00000000000..93ac9caddcb
--- /dev/null
+++ b/modules/@angular/core/testing/index.ts
@@ -0,0 +1,16 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+export * from './async';
+export * from './component_fixture';
+export * from './fake_async';
+export * from './test_bed';
+export * from './testing';
+export * from './metadata_override';
+
+export * from '../private_export_testing';
diff --git a/modules/@angular/examples/core/pipes/ts/async_pipe/async_pipe_example.ts b/modules/@angular/examples/core/pipes/ts/async_pipe/async_pipe_example.ts
index 63ce80a805e..29cb2e2bedc 100644
--- a/modules/@angular/examples/core/pipes/ts/async_pipe/async_pipe_example.ts
+++ b/modules/@angular/examples/core/pipes/ts/async_pipe/async_pipe_example.ts
@@ -9,7 +9,8 @@
 import {Component, NgModule} from '@angular/core';
 import {BrowserModule} from '@angular/platform-browser';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
-import {Observable, Subscriber} from 'rxjs/Rx';
+import {Observable} from 'rxjs/Observable';
+import {Subscriber} from 'rxjs/Subscriber';
 
 // #docregion AsyncPipePromise
 @Component({
diff --git a/modules/@angular/examples/facade/ts/async/observable.ts b/modules/@angular/examples/facade/ts/async/observable.ts
index 188a8faa7ed..37c577e7eee 100644
--- a/modules/@angular/examples/facade/ts/async/observable.ts
+++ b/modules/@angular/examples/facade/ts/async/observable.ts
@@ -7,7 +7,9 @@
  */
 
 // #docregion Observable
-import {Observable, Subscriber} from 'rxjs/Rx';
+import {Observable} from 'rxjs/Observable';
+import {Subscriber} from 'rxjs/Subscriber';
+
 var obs = new Observable<number>((obs: Subscriber<number>) => {
   var i = 0;
   setInterval(() => { obs.next(++i); }, 1000);
diff --git a/modules/@angular/examples/facade/ts/async/observable_patched.ts b/modules/@angular/examples/facade/ts/async/observable_patched.ts
index 4072af91ae2..47507c44ac4 100644
--- a/modules/@angular/examples/facade/ts/async/observable_patched.ts
+++ b/modules/@angular/examples/facade/ts/async/observable_patched.ts
@@ -9,7 +9,8 @@
 // #docregion Observable
 import 'rxjs/add/operator/map';
 
-import {Observable, Subscriber} from 'rxjs/Rx';
+import {Observable} from 'rxjs/Observable';
+import {Subscriber} from 'rxjs/Subscriber';
 
 var obs = new Observable<number>((obs: Subscriber<any>) => {
   var i = 0;
diff --git a/modules/@angular/examples/facade/ts/async/observable_pure.ts b/modules/@angular/examples/facade/ts/async/observable_pure.ts
index dd975f497ca..68e0729837f 100644
--- a/modules/@angular/examples/facade/ts/async/observable_pure.ts
+++ b/modules/@angular/examples/facade/ts/async/observable_pure.ts
@@ -7,7 +7,8 @@
  */
 
 // #docregion Observable
-import {Observable, Subscriber} from 'rxjs/Rx';
+import {Observable} from 'rxjs/Observable';
+import {Subscriber} from 'rxjs/Subscriber';
 import {map} from 'rxjs/operator/map';
 
 var obs = new Observable<number>((sub: Subscriber<number>) => {
diff --git a/modules/@angular/http/package.json b/modules/@angular/http/package.json
index 920c7a26968..af130eb5481 100644
--- a/modules/@angular/http/package.json
+++ b/modules/@angular/http/package.json
@@ -8,7 +8,7 @@
   "author": "angular",
   "license": "MIT",
   "peerDependencies": {
-    "rxjs": "5.0.0-beta.6",
+    "rxjs": "5.0.0-beta.11",
     "@angular/core": "0.0.0-PLACEHOLDER",
     "@angular/platform-browser": "0.0.0-PLACEHOLDER"
   },
diff --git a/modules/@angular/router/package.json b/modules/@angular/router/package.json
index 477d61df722..f0b6aa4972a 100644
--- a/modules/@angular/router/package.json
+++ b/modules/@angular/router/package.json
@@ -25,7 +25,7 @@
     "@angular/common": "0.0.0-PLACEHOLDER",
     "@angular/platform-browser": "0.0.0-PLACEHOLDER",
     "@angular/platform-browser-dynamic": "0.0.0-PLACEHOLDER",
-    "rxjs": "5.0.0-beta.6"
+    "rxjs": "5.0.0-beta.11"
   },
   "typings": "index.d.ts"
 }
diff --git a/modules/playground/src/bootstrap.ts b/modules/playground/src/bootstrap.ts
index 0cc97f79a45..ed0eb567868 100644
--- a/modules/playground/src/bootstrap.ts
+++ b/modules/playground/src/bootstrap.ts
@@ -13,8 +13,8 @@
   writeScriptTag('/all/playground/vendor/zone.js');
   writeScriptTag('/all/playground/vendor/long-stack-trace-zone.js');
   writeScriptTag('/all/playground/vendor/system.src.js');
-  writeScriptTag('/all/playground/vendor/Reflect.js');
-  writeScriptTag('/all/playground/vendor/rxjs/bundles/Rx.js', 'playgroundBootstrap()');
+  writeScriptTag('/all/playground/vendor/Reflect.js', 'playgroundBootstrap()');
+
   (<any>global).playgroundBootstrap = playgroundBootstrap;
 
   function playgroundBootstrap() {
@@ -36,11 +36,12 @@
           '@angular/upgrade': '/packages-dist/upgrade/bundles/upgrade.umd.js',
           '@angular/router': '/packages-dist/router/bundles/router.umd.js',
           '@angular/core/src/facade': '/all/@angular/core/src/facade',
-          'rxjs': location.pathname.replace(/\w+\.html$/i, '') + 'rxjs'
+          'rxjs': '/all/playground/vendor/rxjs'
         },
         packages: {
           'app': {defaultExtension: 'js'},
-          '@angular/core/src/facade': {defaultExtension: 'js'}
+          '@angular/core/src/facade': {defaultExtension: 'js'},
+          'rxjs': {defaultExtension: 'js'}
         }
       });
     } else {
@@ -48,7 +49,11 @@
           'Not using the Angular bundles. Don\'t use this configuration for e2e/performance tests!');
 
       System.config({
-        map: {'index': 'index.js', '@angular': '/all/@angular'},
+        map: {
+          'index': 'index.js',
+          '@angular': '/all/@angular',
+          'rxjs': '/all/playground/vendor/rxjs'
+        },
         packages: {
           'app': {defaultExtension: 'js'},
           '@angular/core': {main: 'index.js', defaultExtension: 'js'},
@@ -58,10 +63,8 @@
           '@angular/forms': {main: 'index.js', defaultExtension: 'js'},
           '@angular/platform-browser': {main: 'index.js', defaultExtension: 'js'},
           '@angular/platform-browser-dynamic': {main: 'index.js', defaultExtension: 'js'},
-          '@angular/upgrade': {main: 'index.js', defaultExtension: 'js'}
-          // 'rxjs': {
-          //   defaultExtension: 'js'
-          // }
+          '@angular/upgrade': {main: 'index.js', defaultExtension: 'js'},
+          'rxjs': {defaultExtension: 'js'}
         }
       });
     }
diff --git a/modules/rollup-test/package.json b/modules/rollup-test/package.json
index 81aae003394..fc96f32630f 100644
--- a/modules/rollup-test/package.json
+++ b/modules/rollup-test/package.json
@@ -23,7 +23,7 @@
     "rollup-plugin-node-resolve": "^1.5.0",
     "rollup-plugin-typescript": "^0.7.3",
     "rollup-plugin-uglify": "^0.3.1",
-    "rxjs-es": "^5.0.0-beta.6",
+    "rxjs-es": "^5.0.0-beta.11",
     "typescript": "^1.9.0-dev.20160423",
     "uglify-js": "^2.6.2"
   },
diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json
index 87496909cbc..508fd9b1c1e 100644
--- a/npm-shrinkwrap.clean.json
+++ b/npm-shrinkwrap.clean.json
@@ -1599,9 +1599,6 @@
     "buffers": {
       "version": "0.1.1"
     },
-    "bufferutil": {
-      "version": "1.2.1"
-    },
     "builtin-modules": {
       "version": "1.1.1"
     },
@@ -4807,7 +4804,7 @@
       "version": "1.1.5"
     },
     "rxjs": {
-      "version": "5.0.0-beta.6"
+      "version": "5.0.0-beta.11"
     },
     "sass-graph": {
       "version": "2.0.1",
@@ -5127,6 +5124,9 @@
     "supports-color": {
       "version": "0.2.0"
     },
+    "symbol-observable": {
+      "version": "1.0.2"
+    },
     "symlink-or-copy": {
       "version": "1.0.1"
     },
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index cb4980209b4..8502e0300ac 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -2499,11 +2499,6 @@
       "from": "buffers@>=0.1.1 <0.2.0",
       "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
     },
-    "bufferutil": {
-      "version": "1.2.1",
-      "from": "bufferutil@>=1.2.0 <1.3.0",
-      "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-1.2.1.tgz"
-    },
     "builtin-modules": {
       "version": "1.1.1",
       "from": "builtin-modules@>=1.0.0 <2.0.0",
@@ -7669,9 +7664,9 @@
       "resolved": "https://registry.npmjs.org/run-sequence/-/run-sequence-1.1.5.tgz"
     },
     "rxjs": {
-      "version": "5.0.0-beta.6",
-      "from": "rxjs@5.0.0-beta.6",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.0.0-beta.6.tgz"
+      "version": "5.0.0-beta.11",
+      "from": "rxjs@5.0.0-beta.11",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.0.0-beta.11.tgz"
     },
     "sass-graph": {
       "version": "2.0.1",
@@ -8179,6 +8174,11 @@
       "from": "supports-color@>=0.2.0 <0.3.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
     },
+    "symbol-observable": {
+      "version": "1.0.2",
+      "from": "symbol-observable@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.2.tgz"
+    },
     "symlink-or-copy": {
       "version": "1.0.1",
       "from": "symlink-or-copy@>=1.0.1 <2.0.0",
diff --git a/package.json b/package.json
index 6da30354df3..6da4ccd2ccc 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   "dependencies": {
     "es6-shim": "^0.35.0",
     "reflect-metadata": "^0.1.3",
-    "rxjs": "5.0.0-beta.6",
+    "rxjs": "5.0.0-beta.11",
     "zone.js": "^0.6.17"
   },
   "devDependencies": {
diff --git a/tools/typings-test/test.sh b/tools/typings-test/test.sh
index 4c3abcfd66a..294a434d14e 100755
--- a/tools/typings-test/test.sh
+++ b/tools/typings-test/test.sh
@@ -18,7 +18,7 @@ cp -R -v tools/typings-test/* $TMP
   # create package.json so that npm install doesn't pollute any parent node_modules's directory
   npm init --yes
   npm install ${LINKABLE_PKGS[*]}
-  npm install @types/es6-promise @types/es6-collections @types/jasmine rxjs@5.0.0-beta.6
+  npm install @types/es6-promise @types/es6-collections @types/jasmine rxjs@5.0.0-beta.11
   npm install typescript@1.8.10
   $(npm bin)/tsc --version
   $(npm bin)/tsc -p tsconfig.json