diff --git a/build/tasks/watch.js b/build/tasks/watch.js
index e2a32fdd..cfc5e50a 100644
--- a/build/tasks/watch.js
+++ b/build/tasks/watch.js
@@ -1,9 +1,18 @@
-var gulp  = require('gulp');
-var gutil = require('gulp-util');
+var gulp        = require('gulp');
+var gutil       = require('gulp-util');
+var runSequence = require('run-sequence');
 
-gulp.task('watch', ['clean', 'build-commonjs'], function() {
+gulp.task('attach-watchers', function () {
   return gulp.watch(['src/**/*', 'test/**/*'], ['build']).on('change', function(file) {
-
     gutil.log('File ' + file + ' was changed, running tasks...');
   });
 });
+
+gulp.task('watch', function(callback) {
+  return runSequence(
+    'clean',
+    'build-commonjs',
+    'attach-watchers',
+    callback
+  );
+});