diff --git a/gulpfile.js b/gulpfile.js
index 576b461fcf..0e53ff1fbe 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -571,7 +571,7 @@ gulp.task('post-test-checks', function(done) {
 });
 
 
-gulp.task('!pre.test.typings', [], function(done) {
+gulp.task('!pre.test.typings', [], function() {
   return gulp
     .src([
       'modules/angular2/typings/**/*'], {
@@ -583,17 +583,12 @@ gulp.task('!pre.test.typings', [], function(done) {
 
 // -----------------
 // TODO: Use a version of TypeScript that matches what is used by DefinitelyTyped.
-gulp.task('test.typings', ['!pre.test.typings'], function(done) {
-  var stream = gulp.src(['typings_spec/*.ts', 'dist/docs/typings/angular2/angular2.d.ts'])
+gulp.task('test.typings', ['!pre.test.typings'], function() {
+  return gulp.src(['typing_spec/*.ts', 'dist/docs/typings/angular2/angular2.d.ts'])
       .pipe(tsc({target: 'ES5', module: 'commonjs',
                  // Don't use the version of typescript that gulp-typescript depends on, we need 1.5
                  // see https://github.com/ivogabe/gulp-typescript#typescript-version
-                 typescript: require('typescript')}))
-      .on('error', function(error) {
-        // nodejs doesn't propagate errors from the src stream into the final stream so we are
-        // forwarding the error into the final stream
-        stream.emit('error', error);
-      });
+                 typescript: require('typescript')}));
 });
 
 // -----------------
diff --git a/typing_spec/basic_spec.ts b/typing_spec/basic_spec.ts
index ea78612f62..4c8dad7ed4 100644
--- a/typing_spec/basic_spec.ts
+++ b/typing_spec/basic_spec.ts
@@ -1,4 +1,4 @@
-///<reference path="../dist/docs/angular2.d.ts"/>
+///<reference path="../dist/docs/typings/angular2/angular2.d.ts"/>
 
 import {Component, bootstrap, View} from 'angular2/angular2'