diff --git a/.vscode/launch.json b/.vscode/launch.json
index 0ff34475e..b38ca4a65 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -76,7 +76,7 @@
                 // The profile can be found under /test/csharp-test-profile.
                 "--profile",
                 "csharp-test-profile",
-                "${workspaceRoot}/test/razor/razorIntegrationTests/testAssets/RazorApp/.vscode/RazorApp.code-workspace",
+                "${workspaceRoot}/test/razor/razorIntegrationTests/testAssets/RazorApp/.vscode/devkit_RazorApp.code-workspace",
                 "--extensionDevelopmentPath=${workspaceRoot}",
                 "--extensionTestsPath=${workspaceRoot}/out/test/razor/razorIntegrationTests",
                 "--log",
diff --git a/test/razor/razorIntegrationTests/diagnostics.integration.test.ts b/test/razor/razorIntegrationTests/diagnostics.integration.test.ts
new file mode 100644
index 000000000..a521f7181
--- /dev/null
+++ b/test/razor/razorIntegrationTests/diagnostics.integration.test.ts
@@ -0,0 +1,97 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as path from 'path';
+import * as vscode from 'vscode';
+import { beforeAll, afterAll, test, expect } from '@jest/globals';
+import testAssetWorkspace from './testAssets/testAssetWorkspace';
+import * as integrationHelpers from '../../lsptoolshost/integrationTests/integrationHelpers';
+
+integrationHelpers.describeIfDevKit(`Razor Diagnostics ${testAssetWorkspace.description}`, function () {
+    beforeAll(async function () {
+        if (!integrationHelpers.isRazorWorkspace(vscode.workspace)) {
+            return;
+        }
+
+        await integrationHelpers.activateCSharpExtension();
+    });
+
+    afterAll(async () => {
+        await testAssetWorkspace.cleanupWorkspace();
+    });
+
+    test('CSharp and Razor Diagnostics', async () => {
+        if (!integrationHelpers.isRazorWorkspace(vscode.workspace)) {
+            return;
+        }
+
+        let count = 0;
+        let error;
+
+        while (count < 5) {
+            try {
+                await integrationHelpers.closeAllEditorsAsync();
+                await integrationHelpers.openFileInWorkspaceAsync(path.join('Pages', 'Diagnostics.razor'));
+
+                await integrationHelpers.waitForExpectedResult<vscode.Diagnostic[]>(
+                    () => vscode.languages.getDiagnostics(vscode.window.activeTextEditor!.document.uri),
+                    5000,
+                    500,
+                    (diagnostics) => {
+                        expect(diagnostics.length).toBe(3);
+
+                        expect(diagnostics[0].code).toBe('RZ10012');
+                        expect(diagnostics[0].message).toBe(
+                            "Found markup element with unexpected name 'TagHelperDoesNotExist'. If this is intended to be a component, add a @using directive for its namespace."
+                        );
+                        expect(diagnostics[0].severity).toBe(vscode.DiagnosticSeverity.Warning);
+                        expect(diagnostics[0].range).toStrictEqual(new vscode.Range(2, 0, 2, 25));
+                        expect(diagnostics[0].source).toBe('Razor');
+
+                        expect(diagnostics[1].message).toBe("The name 'Message' does not exist in the current context");
+                        expect(diagnostics[1].severity).toBe(vscode.DiagnosticSeverity.Error);
+                        expect(diagnostics[1].range).toStrictEqual(new vscode.Range(6, 9, 6, 16));
+                        expect(diagnostics[1].source).toBe(undefined);
+                        const diag1Code = diagnostics[1].code as {
+                            value: string | number;
+                            target: vscode.Uri;
+                        };
+                        expect(diag1Code).toBeDefined();
+                        expect(diag1Code.value).toBe('CS0103');
+                        expect(diag1Code.target.toString()).toBe(
+                            'https://msdn.microsoft.com/query/roslyn.query?appId%3Droslyn%26k%3Dk%28CS0103%29'
+                        );
+
+                        expect(diagnostics[2].message).toBe(
+                            "The type or namespace name 'TypeDoesNotExist' could not be found (are you missing a using directive or an assembly reference?)"
+                        );
+                        expect(diagnostics[2].severity).toBe(vscode.DiagnosticSeverity.Error);
+                        expect(diagnostics[2].range).toStrictEqual(new vscode.Range(15, 20, 15, 36));
+                        expect(diagnostics[2].source).toBe(undefined);
+                        const diag2Code = diagnostics[2].code as {
+                            value: string | number;
+                            target: vscode.Uri;
+                        };
+                        expect(diag2Code).toBeDefined();
+                        expect(diag2Code.value).toBe('CS0246');
+                        expect(diag2Code.target.toString()).toBe(
+                            'https://msdn.microsoft.com/query/roslyn.query?appId%3Droslyn%26k%3Dk%28CS0246%29'
+                        );
+                    }
+                );
+
+                // If this hits that means the expected results succeeded
+                // and we can stop the loop
+                return;
+            } catch (e) {
+                error = e;
+            }
+
+            count++;
+        }
+
+        throw error;
+    });
+});
diff --git a/test/razor/razorIntegrationTests/testAssets/RazorApp/.vscode/RazorApp.code-workspace b/test/razor/razorIntegrationTests/testAssets/RazorApp/.vscode/RazorApp.code-workspace
index 69deef17d..15003959e 100644
--- a/test/razor/razorIntegrationTests/testAssets/RazorApp/.vscode/RazorApp.code-workspace
+++ b/test/razor/razorIntegrationTests/testAssets/RazorApp/.vscode/RazorApp.code-workspace
@@ -6,9 +6,6 @@
     ],
     "settings": {
         "dotnet.defaultSolution": "RazorApp.sln",
-        "dotnet.server.useOmnisharp": false,
-        "omnisharp.enableLspDriver": false,
-        "razor.server.trace": "Trace",
         "dotnet.preferCSharpExtension": true
     }
 }
diff --git a/test/razor/razorIntegrationTests/testAssets/RazorApp/.vscode/devkit_RazorApp.code-workspace b/test/razor/razorIntegrationTests/testAssets/RazorApp/.vscode/devkit_RazorApp.code-workspace
index 69887ce79..b551c598b 100644
--- a/test/razor/razorIntegrationTests/testAssets/RazorApp/.vscode/devkit_RazorApp.code-workspace
+++ b/test/razor/razorIntegrationTests/testAssets/RazorApp/.vscode/devkit_RazorApp.code-workspace
@@ -6,9 +6,6 @@
     ],
     "settings": {
         "dotnet.defaultSolution": "RazorApp.sln",
-        "dotnet.server.useOmnisharp": false,
-        "omnisharp.enableLspDriver": false,
-        "razor.server.trace": "Trace",
         "dotnet.preferCSharpExtension": false
     }
 }
diff --git a/test/razor/razorIntegrationTests/testAssets/RazorApp/Pages/Diagnostics.razor b/test/razor/razorIntegrationTests/testAssets/RazorApp/Pages/Diagnostics.razor
new file mode 100644
index 000000000..70ed13432
--- /dev/null
+++ b/test/razor/razorIntegrationTests/testAssets/RazorApp/Pages/Diagnostics.razor
@@ -0,0 +1,18 @@
+@page "/diagnostics"
+
+<TagHelperDoesNotExist />
+
+@if (true)
+{
+    <h1>@Message</h1>
+}
+
+<div />
+
+@code
+{
+    public void M()
+    {
+        var x = new TypeDoesNotExist();
+    }
+}