diff --git a/src/AzureRMTools.ts b/src/AzureRMTools.ts
index fd4ed71a3..a83255739 100644
--- a/src/AzureRMTools.ts
+++ b/src/AzureRMTools.ts
@@ -25,7 +25,6 @@ import { ExtractItem } from './documents/templates/ExtractItem';
 import { getNormalizedDocumentKey } from './documents/templates/getNormalizedDocumentKey';
 import { gotoResources } from './documents/templates/gotoResources';
 import { getItemTypeQuickPicks, InsertItem } from "./documents/templates/insertItem";
-import { LinkedFileLoadState } from './documents/templates/linkedTemplates/LinkedFileLoadState';
 import { assignTemplateGraphToDeploymentTemplate, INotifyTemplateGraphArgs, openLinkedTemplateFileCommand, tryOpenNonLocalLinkedFile } from './documents/templates/linkedTemplates/linkedTemplates';
 import { allSchemas, getPreferredSchema } from './documents/templates/schemas';
 import { getQuickPickItems, sortTemplate } from "./documents/templates/sortTemplate";
@@ -1790,9 +1789,9 @@ export class AzureRMTools implements IProvideOpenedDocuments {
             const rootTemplate = this.getOpenedDeploymentTemplate(rootTemplateUri);
 
             // tslint:disable-next-line: no-console
-            console.log(`onTemplateGraphAvailable: ${path.basename(e.rootTemplateUri)}, isComplete=${e.isComplete}:`);
+            // console.log(`onTemplateGraphAvailable: ${path.basename(e.rootTemplateUri)}, isComplete=${e.isComplete}:`);
             // tslint:disable-next-line: no-console
-            console.log(e.linkedTemplates.map(lt => `    ${path.basename(lt.fullUri)}: ${LinkedFileLoadState[lt.loadState]} ${lt.loadErrorMessage ?? ''}`).join('\n'));
+            // console.log(e.linkedTemplates.map(lt => `    ${path.basename(lt.fullUri)}: ${LinkedFileLoadState[lt.loadState]} ${lt.loadErrorMessage ?? ''}`).join('\n'));
 
             // Cache the template graph results
             const rootTemplateKey = getNormalizedDocumentKey(vscode.Uri.parse(e.rootTemplateUri, true));
diff --git a/test/functional/linkedTemplates.test.ts b/test/functional/linkedTemplates.test.ts
index 4de183909..2db149167 100644
--- a/test/functional/linkedTemplates.test.ts
+++ b/test/functional/linkedTemplates.test.ts
@@ -354,7 +354,8 @@ suite("Linked templates functional tests", () => {
                         expected: [
                             "Error: Template validation failed: Template parameter JToken type is not valid. Expected 'Integer'. Actual 'String'. Please see https://aka.ms/arm-deploy/#parameter-file for usage details. (arm-template (validation)) [14,27] [The error occurred in a linked template near here] [12,21]",
                             "Warning: The variable 'unusedVar' is never used. (arm-template (expressions)) [5,9]",
-                        ]
+                        ],
+                        waitForDiagnosticSubstring: "Template validation failed"
                     }
                 ]
             }