diff --git a/src/__tests__/core/files.test.ts b/src/__tests__/core/files.test.ts
index bd94ea14f0f..5adeee36499 100644
--- a/src/__tests__/core/files.test.ts
+++ b/src/__tests__/core/files.test.ts
@@ -548,7 +548,8 @@ describe('getOriginalLine', () => {
     })
 
     it('should render annotation label', async () => {
-      let doc = await helper.createDocument(uuid())
+      let filepath = await createTmpFile('', disposables)
+      let doc = await helper.createDocument(filepath)
       let edit: WorkspaceEdit = {
         documentChanges: [
           {
diff --git a/src/diagnostic/manager.ts b/src/diagnostic/manager.ts
index 3c63baf7d11..950e1633805 100644
--- a/src/diagnostic/manager.ts
+++ b/src/diagnostic/manager.ts
@@ -70,6 +70,8 @@ class DiagnosticManager implements Disposable {
       execute: () => this.jumpRelated()
     }, false, 'jump to related locations of current diagnostic.')
     this.defineSigns(workspace.initialConfiguration.get<DiagnosticSignConfig>('diagnostic'))
+    let globalValue = workspace.initialConfiguration.inspect('diagnostic.enable').globalValue
+    this.enabled = globalValue !== false
     this.buffers = workspace.registerBufferSync(doc => {
       let buf = new DiagnosticBuffer(this.nvim, doc)
       buf.onDidRefresh(diagnostics => {