diff --git a/lib/utilities/compile.js b/lib/utilities/compile.js
index 0d3eb6a4f..137ecc09f 100644
--- a/lib/utilities/compile.js
+++ b/lib/utilities/compile.js
@@ -40,7 +40,9 @@ function createWatchCompilerHost(ts, options, project, callbacks) {
   host.afterProgramCreate = function() {
     afterCreate.apply(this, arguments);
     if (callbacks.buildComplete) {
-      callbacks.buildComplete();
+      // Use nextTick to preserve ordering between the `buildComplete` callback
+      // and the diagnostic hooks below
+      process.nextTick(() => callbacks.buildComplete());
     }
   };