diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Legacy/CSharpCodeParser.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Legacy/CSharpCodeParser.cs
index 9e9d841efc0..7db73b8b5c5 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Legacy/CSharpCodeParser.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Legacy/CSharpCodeParser.cs
@@ -30,6 +30,14 @@ internal class CSharpCodeParser : TokenizerBackedParser<CSharpTokenizer>
             builder.Description = Resources.AddTagHelperDirective_Description;
         });
 
+    internal static readonly DirectiveDescriptor UsingDirectiveDescriptor = DirectiveDescriptor.CreateDirective(
+        SyntaxConstants.CSharp.UsingKeyword,
+        DirectiveKind.SingleLine,
+        builder =>
+        {
+            builder.Description = Resources.UsingDirective_Description;
+        });
+
     internal static readonly DirectiveDescriptor RemoveTagHelperDirectiveDescriptor = DirectiveDescriptor.CreateDirective(
         SyntaxConstants.CSharp.RemoveTagHelperKeyword,
         DirectiveKind.SingleLine,
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Legacy/SyntaxConstants.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Legacy/SyntaxConstants.cs
index 9fa13dff0d5..6794dfe0390 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Legacy/SyntaxConstants.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Legacy/SyntaxConstants.cs
@@ -17,6 +17,7 @@ internal static class SyntaxConstants
     public static class CSharp
     {
         public const int UsingKeywordLength = 5;
+        public const string UsingKeyword = "using";
         public const string TagHelperPrefixKeyword = "tagHelperPrefix";
         public const string AddTagHelperKeyword = "addTagHelper";
         public const string RemoveTagHelperKeyword = "removeTagHelper";
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Resources.resx b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Resources.resx
index 7b3e4b05e05..71766937f52 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Resources.resx
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Resources.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -595,4 +595,7 @@
   <data name="DirectiveExpectsIdentifierOrExpression" xml:space="preserve">
     <value>The '{0}' directive expects an identifier or explicit razor expression ("@()").</value>
   </data>
-</root>
\ No newline at end of file
+  <data name="UsingDirective_Description" xml:space="preserve">
+    <value>Adds the C# using directive to the generated view</value>
+  </data>
+</root>
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/RazorCompletionItemResolver.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/RazorCompletionItemResolver.cs
index ac9b29dd027..5518b134653 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/RazorCompletionItemResolver.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/RazorCompletionItemResolver.cs
@@ -39,7 +39,30 @@ public RazorCompletionItemResolver(
             return null;
         }
 
-        var associatedRazorCompletion = razorCompletionResolveContext.CompletionItems.FirstOrDefault(completion => string.Equals(completion.DisplayText, completionItem.Label, StringComparison.Ordinal));
+        var associatedRazorCompletion = razorCompletionResolveContext.CompletionItems.FirstOrDefault(completion =>
+        {
+            if (!string.Equals(completion.DisplayText, completionItem.Label, StringComparison.Ordinal))
+            {
+                return false;
+            }
+
+            // We may have items of different types with the same label (e.g. snippet and keyword)
+            if (clientCapabilities is not null)
+            {
+                // CompletionItem.Kind and RazorCompletionItem.Kind are not compatible/comparable, so we need to convert
+                // Razor completion item to VS completion item (as logic to convert just the kind is not easy to separate from
+                // the rest of the conversion logic) prior to comparing them
+                RazorCompletionListProvider.TryConvert(completion, clientCapabilities, out var convertedRazorCompletionItem);
+                if (convertedRazorCompletionItem != null)
+                {
+                    return completionItem.Kind == convertedRazorCompletionItem.Kind;
+                }
+            }
+
+            // If display text matches but we couldn't convert razor completion item to VS completion item for some reason,
+            // do what previous version of the code did and return true.
+            return true;
+        });
         if (associatedRazorCompletion is null)
         {
             return null;
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/RazorCompletionResolveEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/RazorCompletionResolveEndpoint.cs
index f1414698614..15c0a2db568 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/RazorCompletionResolveEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/RazorCompletionResolveEndpoint.cs
@@ -50,7 +50,9 @@ public async Task<VSInternalCompletionItem> HandleRequestAsync(VSInternalComplet
 
             // See if this is the right completion list for this corresponding completion item. We cross-check this based on label only given that
             // is what users interact with.
-            if (cacheEntry.CompletionList.Items.Any(completion => string.Equals(completionItem.Label, completion.Label, StringComparison.Ordinal)))
+            if (cacheEntry.CompletionList.Items.Any(completion => string.Equals(completionItem.Label, completion.Label, StringComparison.Ordinal) &&
+              // Check the Kind as well, e.g. we may have a Razor snippet and a C# keyword with the same label, etc.
+                                                                  completionItem.Kind == completion.Kind))
             {
                 originalRequestContext = cacheEntry.Context;
                 containingCompletionList = cacheEntry.CompletionList;
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/DirectiveCompletionItemProvider.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/DirectiveCompletionItemProvider.cs
index ae248aa83e0..80871fcdd16 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/DirectiveCompletionItemProvider.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/DirectiveCompletionItemProvider.cs
@@ -27,8 +27,12 @@ internal class DirectiveCompletionItemProvider : IRazorCompletionItemProvider
         CSharpCodeParser.AddTagHelperDirectiveDescriptor,
         CSharpCodeParser.RemoveTagHelperDirectiveDescriptor,
         CSharpCodeParser.TagHelperPrefixDirectiveDescriptor,
+        CSharpCodeParser.UsingDirectiveDescriptor
     };
 
+    // Test accessor
+    internal static IEnumerable<DirectiveDescriptor> DefaultDirectives => s_defaultDirectives;
+
     // internal for testing
     // Do not forget to update both insert and display text !important
     internal static readonly IReadOnlyDictionary<string, (string InsertText, string DisplayText)> s_singleLineDirectiveSnippets = new Dictionary<string, (string InsertText, string DisplayText)>(StringComparer.Ordinal)
@@ -45,7 +49,8 @@ internal class DirectiveCompletionItemProvider : IRazorCompletionItemProvider
         ["preservewhitespace"] = ("preservewhitespace ${1:true}$0", "preservewhitespace true"),
         ["removeTagHelper"] = ("removeTagHelper ${1:*}, ${2:Microsoft.AspNetCore.Mvc.TagHelpers}", "removeTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers"),
         ["tagHelperPrefix"] = ("tagHelperPrefix ${1:prefix}$0", "tagHelperPrefix prefix"),
-        ["typeparam"] = ("typeparam ${1:T}$0", "typeparam T")
+        ["typeparam"] = ("typeparam ${1:T}$0", "typeparam T"),
+        ["using"] = ("using ${1:MyNamespace}$0", "using MyNamespace")
     };
 
     public ImmutableArray<RazorCompletionItem> GetCompletionItems(RazorCompletionContext context)
@@ -145,6 +150,10 @@ internal static ImmutableArray<RazorCompletionItem> GetDirectiveCompletionItems(
                 completionDisplayText,
                 directive.Directive,
                 RazorCompletionItemKind.Directive,
+                // Make sort text one less than display text so if there are any delegated completion items
+                // with the same display text in the combined completion list, they will be sorted below
+                // our items.
+                sortText: completionDisplayText[..Math.Max(1, completionDisplayText.Length - 1)],
                 commitCharacters: commitCharacters,
                 isSnippet: false);
             var completionDescription = new DirectiveCompletionDescription(directive.Description);
@@ -154,9 +163,11 @@ internal static ImmutableArray<RazorCompletionItem> GetDirectiveCompletionItems(
             if (s_singleLineDirectiveSnippets.TryGetValue(directive.Directive, out var snippetTexts))
             {
                 var snippetCompletionItem = new RazorCompletionItem(
-                    $"{completionDisplayText} ...",
+                    $"{completionDisplayText} {SR.Directive}",
                     snippetTexts.InsertText,
                     RazorCompletionItemKind.Directive,
+                    // Use the same sort text here as the directive completion item so both items are grouped together
+                    sortText: completionItem.SortText,
                     commitCharacters: commitCharacters,
                     isSnippet: true);
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/SR.resx b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/SR.resx
index 22bc9113f99..571ca36cea8 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/SR.resx
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/SR.resx
@@ -120,6 +120,9 @@
   <data name="ArgumentCannotBeNullOrEmpty" xml:space="preserve">
     <value>Value cannot be null or an empty string.</value>
   </data>
+  <data name="Directive" xml:space="preserve">
+    <value>directive</value>
+  </data>
   <data name="DirectiveSnippetDescription" xml:space="preserve">
     <value>Insert a directive code snippet
 [Tab] to navigate between elements, [Enter] to complete</value>
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.cs.xlf b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.cs.xlf
index 5418d05e56c..f1d1c666902 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.cs.xlf
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.cs.xlf
@@ -7,6 +7,11 @@
         <target state="translated">Hodnota nesmí být null ani prázdný řetězec.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Directive">
+        <source>directive</source>
+        <target state="new">directive</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DirectiveSnippetDescription">
         <source>Insert a directive code snippet
 [Tab] to navigate between elements, [Enter] to complete</source>
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.de.xlf b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.de.xlf
index 9285a7e8b16..b10265901c5 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.de.xlf
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.de.xlf
@@ -7,6 +7,11 @@
         <target state="translated">Der Wert darf nicht NULL oder eine leere Zeichenfolge sein.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Directive">
+        <source>directive</source>
+        <target state="new">directive</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DirectiveSnippetDescription">
         <source>Insert a directive code snippet
 [Tab] to navigate between elements, [Enter] to complete</source>
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.es.xlf b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.es.xlf
index 8afa9aaed1d..2a9588ac4e4 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.es.xlf
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.es.xlf
@@ -7,6 +7,11 @@
         <target state="translated">El valor no puede ser nulo ni una cadena vacía.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Directive">
+        <source>directive</source>
+        <target state="new">directive</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DirectiveSnippetDescription">
         <source>Insert a directive code snippet
 [Tab] to navigate between elements, [Enter] to complete</source>
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.fr.xlf b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.fr.xlf
index eae018c262e..de625acad56 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.fr.xlf
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.fr.xlf
@@ -7,6 +7,11 @@
         <target state="translated">La valeur ne peut pas être Null ni être une chaîne vide.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Directive">
+        <source>directive</source>
+        <target state="new">directive</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DirectiveSnippetDescription">
         <source>Insert a directive code snippet
 [Tab] to navigate between elements, [Enter] to complete</source>
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.it.xlf b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.it.xlf
index 28273072d78..7f96461abe2 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.it.xlf
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.it.xlf
@@ -7,6 +7,11 @@
         <target state="translated">Il valore non può essere null o una stringa vuota.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Directive">
+        <source>directive</source>
+        <target state="new">directive</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DirectiveSnippetDescription">
         <source>Insert a directive code snippet
 [Tab] to navigate between elements, [Enter] to complete</source>
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.ja.xlf b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.ja.xlf
index 4fcb0bf9976..fa406ea0dce 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.ja.xlf
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.ja.xlf
@@ -7,6 +7,11 @@
         <target state="translated">値を null または空の文字列にすることはできません。</target>
         <note />
       </trans-unit>
+      <trans-unit id="Directive">
+        <source>directive</source>
+        <target state="new">directive</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DirectiveSnippetDescription">
         <source>Insert a directive code snippet
 [Tab] to navigate between elements, [Enter] to complete</source>
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.ko.xlf b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.ko.xlf
index 2cf0712461e..4c77218887b 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.ko.xlf
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.ko.xlf
@@ -7,6 +7,11 @@
         <target state="translated">값은 null이거나 빈 문자열일 수 없습니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Directive">
+        <source>directive</source>
+        <target state="new">directive</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DirectiveSnippetDescription">
         <source>Insert a directive code snippet
 [Tab] to navigate between elements, [Enter] to complete</source>
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.pl.xlf b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.pl.xlf
index c77dafd9cc2..be442c65de1 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.pl.xlf
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.pl.xlf
@@ -7,6 +7,11 @@
         <target state="translated">Wartość nie może być wartością null ani pustym ciągiem.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Directive">
+        <source>directive</source>
+        <target state="new">directive</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DirectiveSnippetDescription">
         <source>Insert a directive code snippet
 [Tab] to navigate between elements, [Enter] to complete</source>
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.pt-BR.xlf b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.pt-BR.xlf
index 79b0f7e87d2..0d4ce789f83 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.pt-BR.xlf
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.pt-BR.xlf
@@ -7,6 +7,11 @@
         <target state="translated">O valor não pode ser nulo ou uma cadeia de caracteres vazia.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Directive">
+        <source>directive</source>
+        <target state="new">directive</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DirectiveSnippetDescription">
         <source>Insert a directive code snippet
 [Tab] to navigate between elements, [Enter] to complete</source>
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.ru.xlf b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.ru.xlf
index 98c42ce86f7..eb6e4a9b6c8 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.ru.xlf
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.ru.xlf
@@ -7,6 +7,11 @@
         <target state="translated">Значение не может быть NULL или пустой строкой.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Directive">
+        <source>directive</source>
+        <target state="new">directive</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DirectiveSnippetDescription">
         <source>Insert a directive code snippet
 [Tab] to navigate between elements, [Enter] to complete</source>
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.tr.xlf b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.tr.xlf
index aece5d4c70f..84314324f21 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.tr.xlf
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.tr.xlf
@@ -7,6 +7,11 @@
         <target state="translated">Değer null veya boş bir dize olamaz.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Directive">
+        <source>directive</source>
+        <target state="new">directive</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DirectiveSnippetDescription">
         <source>Insert a directive code snippet
 [Tab] to navigate between elements, [Enter] to complete</source>
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.zh-Hans.xlf b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.zh-Hans.xlf
index 365b4c933b7..029cc7b495f 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.zh-Hans.xlf
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.zh-Hans.xlf
@@ -7,6 +7,11 @@
         <target state="translated">值不能为 null 或空字符串。</target>
         <note />
       </trans-unit>
+      <trans-unit id="Directive">
+        <source>directive</source>
+        <target state="new">directive</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DirectiveSnippetDescription">
         <source>Insert a directive code snippet
 [Tab] to navigate between elements, [Enter] to complete</source>
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.zh-Hant.xlf b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.zh-Hant.xlf
index e100a142cf3..2c8cb3b7a4b 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.zh-Hant.xlf
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources/xlf/SR.zh-Hant.xlf
@@ -7,6 +7,11 @@
         <target state="translated">值不能為 Null 或空字串。</target>
         <note />
       </trans-unit>
+      <trans-unit id="Directive">
+        <source>directive</source>
+        <target state="new">directive</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DirectiveSnippetDescription">
         <source>Insert a directive code snippet
 [Tab] to navigate between elements, [Enter] to complete</source>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/DirectiveVerifier.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/DirectiveVerifier.cs
new file mode 100644
index 00000000000..dd2e60af942
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/DirectiveVerifier.cs
@@ -0,0 +1,38 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis.Razor.Completion;
+using Microsoft.VisualStudio.LanguageServer.Protocol;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.LanguageServer.Completion;
+
+internal static class DirectiveVerifier
+{
+    private static readonly Action<CompletionItem>[] s_defaultDirectiveCollectionVerifiers;
+
+    public static Action<CompletionItem>[] DefaultDirectiveCollectionVerifiers => s_defaultDirectiveCollectionVerifiers;
+
+    static DirectiveVerifier()
+    {
+        var defaultDirectiveVerifierList = new List<Action<CompletionItem>>(DirectiveCompletionItemProvider.DefaultDirectives.Count() * 2);
+
+        foreach (var directive in DirectiveCompletionItemProvider.DefaultDirectives)
+        {
+            defaultDirectiveVerifierList.Add(item => Assert.Equal(directive.Directive, item.InsertText));
+            defaultDirectiveVerifierList.Add(item => AssertDirectiveSnippet(item, directive.Directive));
+        }
+
+        s_defaultDirectiveCollectionVerifiers = defaultDirectiveVerifierList.ToArray();
+    }
+
+    private static void AssertDirectiveSnippet(CompletionItem completionItem, string directive)
+    {
+        Assert.StartsWith(directive, completionItem.InsertText);
+        Assert.Equal(DirectiveCompletionItemProvider.s_singleLineDirectiveSnippets[directive].InsertText, completionItem.InsertText);
+        Assert.Equal(CompletionItemKind.Snippet, completionItem.Kind);
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/LegacyRazorCompletionEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/LegacyRazorCompletionEndpointTest.cs
index 8d77f0f1257..32c1aea766e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/LegacyRazorCompletionEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/LegacyRazorCompletionEndpointTest.cs
@@ -396,12 +396,7 @@ public async Task Handle_ProvidesDirectiveCompletionItems()
 
         // These are the default directives that don't need to be separately registered, they should always be part of the completion list.
         Assert.Collection(completionList.Items,
-            item => Assert.Equal("addTagHelper", item.InsertText),
-            item => AssertDirectiveSnippet(item, "addTagHelper"),
-            item => Assert.Equal("removeTagHelper", item.InsertText),
-            item => AssertDirectiveSnippet(item, "removeTagHelper"),
-            item => Assert.Equal("tagHelperPrefix", item.InsertText),
-            item => AssertDirectiveSnippet(item, "tagHelperPrefix")
+            DirectiveVerifier.DefaultDirectiveCollectionVerifiers
         );
     }
 
@@ -440,12 +435,7 @@ public async Task Handle_ProvidesInjectOnIncomplete_KeywordIn()
 
         // Assert
         Assert.Collection(completionList.Items,
-            item => Assert.Equal("addTagHelper", item.InsertText),
-            item => AssertDirectiveSnippet(item, "addTagHelper"),
-            item => Assert.Equal("removeTagHelper", item.InsertText),
-            item => AssertDirectiveSnippet(item, "removeTagHelper"),
-            item => Assert.Equal("tagHelperPrefix", item.InsertText),
-            item => AssertDirectiveSnippet(item, "tagHelperPrefix")
+            DirectiveVerifier.DefaultDirectiveCollectionVerifiers
         );
     }
 
@@ -520,12 +510,7 @@ public async Task Handle_ProvidesInjectOnIncomplete()
 
         // Assert
         Assert.Collection(completionList.Items,
-            item => Assert.Equal("addTagHelper", item.InsertText),
-            item => AssertDirectiveSnippet(item, "addTagHelper"),
-            item => Assert.Equal("removeTagHelper", item.InsertText),
-            item => AssertDirectiveSnippet(item, "removeTagHelper"),
-            item => Assert.Equal("tagHelperPrefix", item.InsertText),
-            item => AssertDirectiveSnippet(item, "tagHelperPrefix")
+            DirectiveVerifier.DefaultDirectiveCollectionVerifiers
         );
     }
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/RazorCompletionListProvierTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/RazorCompletionListProvierTest.cs
index 8338d0f85b5..ac62f818c84 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/RazorCompletionListProvierTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/RazorCompletionListProvierTest.cs
@@ -376,12 +376,7 @@ public async Task GetCompletionListAsync_ProvidesDirectiveCompletionItems(string
 
         // These are the default directives that don't need to be separately registered, they should always be part of the completion list.
         Assert.Collection(completionList.Items,
-            item => Assert.Equal("addTagHelper", item.InsertText),
-            item => AssertDirectiveSnippet(item, "addTagHelper"),
-            item => Assert.Equal("removeTagHelper", item.InsertText),
-            item => AssertDirectiveSnippet(item, "removeTagHelper"),
-            item => Assert.Equal("tagHelperPrefix", item.InsertText),
-            item => AssertDirectiveSnippet(item, "tagHelperPrefix")
+            DirectiveVerifier.DefaultDirectiveCollectionVerifiers
         );
     }
 
@@ -437,12 +432,7 @@ public async Task GetCompletionListAsync_ProvidesInjectOnIncomplete_KeywordIn()
 
         // Assert
         Assert.Collection(completionList.Items,
-            item => Assert.Equal("addTagHelper", item.InsertText),
-            item => AssertDirectiveSnippet(item, "addTagHelper"),
-            item => Assert.Equal("removeTagHelper", item.InsertText),
-            item => AssertDirectiveSnippet(item, "removeTagHelper"),
-            item => Assert.Equal("tagHelperPrefix", item.InsertText),
-            item => AssertDirectiveSnippet(item, "tagHelperPrefix")
+            DirectiveVerifier.DefaultDirectiveCollectionVerifiers
         );
     }
 
@@ -499,12 +489,7 @@ public async Task GetCompletionListAsync_ProvidesInjectOnIncomplete()
 
         // Assert
         Assert.Collection(completionList.Items,
-            item => Assert.Equal("addTagHelper", item.InsertText),
-            item => AssertDirectiveSnippet(item, "addTagHelper"),
-            item => Assert.Equal("removeTagHelper", item.InsertText),
-            item => AssertDirectiveSnippet(item, "removeTagHelper"),
-            item => Assert.Equal("tagHelperPrefix", item.InsertText),
-            item => AssertDirectiveSnippet(item, "tagHelperPrefix")
+            DirectiveVerifier.DefaultDirectiveCollectionVerifiers
         );
     }
 
@@ -607,11 +592,4 @@ private static RazorCodeDocument CreateCodeDocument(string text)
         codeDocument.SetTagHelperContext(tagHelperDocumentContext);
         return codeDocument;
     }
-
-    private static void AssertDirectiveSnippet(CompletionItem completionItem, string directive)
-    {
-        Assert.StartsWith(directive, completionItem.InsertText);
-        Assert.Equal(DirectiveCompletionItemProvider.s_singleLineDirectiveSnippets[directive].InsertText, completionItem.InsertText);
-        Assert.Equal(CompletionItemKind.Snippet, completionItem.Kind);
-    }
 }
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Completion/DirectiveCompletionItemProviderTest.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Completion/DirectiveCompletionItemProviderTest.cs
index 748f8a655fd..50d4ad29bb0 100644
--- a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Completion/DirectiveCompletionItemProviderTest.cs
+++ b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Completion/DirectiveCompletionItemProviderTest.cs
@@ -3,10 +3,11 @@
 
 #nullable disable
 
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Extensions;
-using Microsoft.AspNetCore.Razor.Language.Legacy;
 using Microsoft.AspNetCore.Razor.Language.Syntax;
 using Microsoft.AspNetCore.Razor.Test.Common;
 using Microsoft.CodeAnalysis.Razor.Workspaces.Extensions;
@@ -17,12 +18,20 @@ namespace Microsoft.CodeAnalysis.Razor.Completion;
 
 public class DirectiveCompletionItemProviderTest : ToolingTestBase
 {
-    private static readonly IReadOnlyList<DirectiveDescriptor> s_defaultDirectives = new[]
+    private static readonly Action<RazorCompletionItem>[] s_defaultDirectiveCollectionVerifiers;
+
+    static DirectiveCompletionItemProviderTest()
     {
-        CSharpCodeParser.AddTagHelperDirectiveDescriptor,
-        CSharpCodeParser.RemoveTagHelperDirectiveDescriptor,
-        CSharpCodeParser.TagHelperPrefixDirectiveDescriptor,
-    };
+        var defaultDirectiveList = new List<Action<RazorCompletionItem>>(DirectiveCompletionItemProvider.DefaultDirectives.Count() * 2);
+
+        foreach (var directive in DirectiveCompletionItemProvider.DefaultDirectives)
+        {
+            defaultDirectiveList.Add(item => AssertRazorCompletionItem(directive, item, isSnippet: false));
+            defaultDirectiveList.Add(item => AssertRazorCompletionItem(directive, item, isSnippet: true));
+        }
+
+        s_defaultDirectiveCollectionVerifiers = defaultDirectiveList.ToArray();
+    }
 
     public DirectiveCompletionItemProviderTest(ITestOutputHelper testOutput)
         : base(testOutput)
@@ -42,12 +51,8 @@ public void GetDirectiveCompletionItems_ReturnsDefaultDirectivesAsCompletionItem
         // Assert
         Assert.Collection(
             completionItems,
-            item => AssertRazorCompletionItem(s_defaultDirectives[0], item, isSnippet: false),
-            item => AssertRazorCompletionItem(s_defaultDirectives[0], item, isSnippet: true),
-            item => AssertRazorCompletionItem(s_defaultDirectives[1], item, isSnippet: false),
-            item => AssertRazorCompletionItem(s_defaultDirectives[1], item, isSnippet: true),
-            item => AssertRazorCompletionItem(s_defaultDirectives[2], item, isSnippet: false),
-            item => AssertRazorCompletionItem(s_defaultDirectives[2], item, isSnippet: true));
+            s_defaultDirectiveCollectionVerifiers
+        );
     }
 
     [Fact]
@@ -64,13 +69,11 @@ public void GetDirectiveCompletionItems_ReturnsCustomDirectivesAsCompletionItems
         // Assert
         Assert.Collection(
             completionItems,
-            item => AssertRazorCompletionItem(customDirective, item),
-            item => AssertRazorCompletionItem(s_defaultDirectives[0], item, isSnippet: false),
-            item => AssertRazorCompletionItem(s_defaultDirectives[0], item, isSnippet: true),
-            item => AssertRazorCompletionItem(s_defaultDirectives[1], item, isSnippet: false),
-            item => AssertRazorCompletionItem(s_defaultDirectives[1], item, isSnippet: true),
-            item => AssertRazorCompletionItem(s_defaultDirectives[2], item, isSnippet: false),
-            item => AssertRazorCompletionItem(s_defaultDirectives[2], item, isSnippet: true));
+            [
+                item => AssertRazorCompletionItem(customDirective, item), ..
+                s_defaultDirectiveCollectionVerifiers
+            ]
+        );
     }
 
     [Fact]
@@ -91,13 +94,11 @@ public void GetDirectiveCompletionItems_UsesDisplayNamesWhenNotNull()
         // Assert
         Assert.Collection(
             completionItems,
-            item => AssertRazorCompletionItem("different", customDirective, item),
-            item => AssertRazorCompletionItem(s_defaultDirectives[0], item, isSnippet: false),
-            item => AssertRazorCompletionItem(s_defaultDirectives[0], item, isSnippet: true),
-            item => AssertRazorCompletionItem(s_defaultDirectives[1], item, isSnippet: false),
-            item => AssertRazorCompletionItem(s_defaultDirectives[1], item, isSnippet: true),
-            item => AssertRazorCompletionItem(s_defaultDirectives[2], item, isSnippet: false),
-            item => AssertRazorCompletionItem(s_defaultDirectives[2], item, isSnippet: true));
+            [
+                item => AssertRazorCompletionItem("different", customDirective, item), ..
+                s_defaultDirectiveCollectionVerifiers
+            ]
+        );
     }
 
     [Fact]
@@ -118,13 +119,11 @@ public void GetDirectiveCompletionItems_CodeBlockCommitCharacters()
         // Assert
         Assert.Collection(
             completionItems,
-            item => AssertRazorCompletionItem("code", customDirective, item, DirectiveCompletionItemProvider.BlockDirectiveCommitCharacters),
-            item => AssertRazorCompletionItem(s_defaultDirectives[0], item, isSnippet: false),
-            item => AssertRazorCompletionItem(s_defaultDirectives[0], item, isSnippet: true),
-            item => AssertRazorCompletionItem(s_defaultDirectives[1], item, isSnippet: false),
-            item => AssertRazorCompletionItem(s_defaultDirectives[1], item, isSnippet: true),
-            item => AssertRazorCompletionItem(s_defaultDirectives[2], item, isSnippet: false),
-            item => AssertRazorCompletionItem(s_defaultDirectives[2], item, isSnippet: true));
+            [
+                item => AssertRazorCompletionItem("code", customDirective, item, DirectiveCompletionItemProvider.BlockDirectiveCommitCharacters), ..
+                s_defaultDirectiveCollectionVerifiers
+            ]
+        );
     }
 
     [Fact]
@@ -134,7 +133,7 @@ public void GetDirectiveCompletionItems_RazorBlockCommitCharacters()
         var customDirective = DirectiveDescriptor.CreateRazorBlockDirective("custom", builder =>
         {
             builder.DisplayName = "section";
-            builder.Description = "My Custom Razozr Block Directive.";
+            builder.Description = "My Custom Razor Block Directive.";
         });
         var syntaxTree = CreateSyntaxTree("@sec", customDirective);
 
@@ -144,13 +143,11 @@ public void GetDirectiveCompletionItems_RazorBlockCommitCharacters()
         // Assert
         Assert.Collection(
             completionItems,
-            item => AssertRazorCompletionItem("section", customDirective, item, DirectiveCompletionItemProvider.BlockDirectiveCommitCharacters),
-            item => AssertRazorCompletionItem(s_defaultDirectives[0], item, isSnippet: false),
-            item => AssertRazorCompletionItem(s_defaultDirectives[0], item, isSnippet: true),
-            item => AssertRazorCompletionItem(s_defaultDirectives[1], item, isSnippet: false),
-            item => AssertRazorCompletionItem(s_defaultDirectives[1], item, isSnippet: true),
-            item => AssertRazorCompletionItem(s_defaultDirectives[2], item, isSnippet: false),
-            item => AssertRazorCompletionItem(s_defaultDirectives[2], item, isSnippet: true));
+            [
+                item => AssertRazorCompletionItem("section", customDirective, item, DirectiveCompletionItemProvider.BlockDirectiveCommitCharacters), ..
+                s_defaultDirectiveCollectionVerifiers
+            ]
+        );
     }
 
     [Theory]
@@ -181,7 +178,7 @@ public void GetDirectiveCompletionItems_ReturnsKnownDirectivesAsSnippets_SingleL
         Assert.Collection(
             completionItems,
             item => AssertRazorCompletionItem(knownDirective, customDirective, item, commitCharacters: DirectiveCompletionItemProvider.BlockDirectiveCommitCharacters, isSnippet: false),
-            item => AssertRazorCompletionItem(knownDirective + " ...", customDirective, item, commitCharacters: DirectiveCompletionItemProvider.BlockDirectiveCommitCharacters, isSnippet: true));
+            item => AssertRazorCompletionItem(knownDirective + " directive", customDirective, item, commitCharacters: DirectiveCompletionItemProvider.BlockDirectiveCommitCharacters, isSnippet: true));
     }
 
     [Fact]
@@ -202,14 +199,12 @@ public void GetDirectiveCompletionItems_ReturnsKnownDirectivesAsSnippets_SingleL
         // Assert
         Assert.Collection(
             completionItems,
-            item => AssertRazorCompletionItem("model", customDirective, item, commitCharacters: DirectiveCompletionItemProvider.BlockDirectiveCommitCharacters, isSnippet: false),
-            item => AssertRazorCompletionItem("model ...", customDirective, item, commitCharacters: DirectiveCompletionItemProvider.BlockDirectiveCommitCharacters, isSnippet: true),
-            item => AssertRazorCompletionItem(s_defaultDirectives[0], item, isSnippet: false),
-            item => AssertRazorCompletionItem(s_defaultDirectives[0], item, isSnippet: true),
-            item => AssertRazorCompletionItem(s_defaultDirectives[1], item, isSnippet: false),
-            item => AssertRazorCompletionItem(s_defaultDirectives[1], item, isSnippet: true),
-            item => AssertRazorCompletionItem(s_defaultDirectives[2], item, isSnippet: false),
-            item => AssertRazorCompletionItem(s_defaultDirectives[2], item, isSnippet: true));
+            [
+                item => AssertRazorCompletionItem("model", customDirective, item, commitCharacters: DirectiveCompletionItemProvider.BlockDirectiveCommitCharacters, isSnippet: false),
+                item => AssertRazorCompletionItem("model directive", customDirective, item, commitCharacters: DirectiveCompletionItemProvider.BlockDirectiveCommitCharacters, isSnippet: true), ..
+                s_defaultDirectiveCollectionVerifiers
+            ]
+        );
     }
 
     [Fact]
@@ -462,7 +457,7 @@ private static void AssertRazorCompletionItem(string completionDisplayText, Dire
     }
 
     private static void AssertRazorCompletionItem(DirectiveDescriptor directive, RazorCompletionItem item, bool isSnippet = false) =>
-        AssertRazorCompletionItem(directive.Directive + (isSnippet ? " ..." : string.Empty), directive, item, isSnippet: isSnippet);
+        AssertRazorCompletionItem(directive.Directive + (isSnippet ? " directive" : string.Empty), directive, item, isSnippet: isSnippet);
 
     private static RazorSyntaxTree CreateSyntaxTree(string text, params DirectiveDescriptor[] directives)
     {
diff --git a/src/Razor/test/Microsoft.VisualStudio.LegacyEditor.Razor.Test/Completion/RazorDirectiveCompletionSourceTest.cs b/src/Razor/test/Microsoft.VisualStudio.LegacyEditor.Razor.Test/Completion/RazorDirectiveCompletionSourceTest.cs
index c03dfdc19b7..77f6b6020d8 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LegacyEditor.Razor.Test/Completion/RazorDirectiveCompletionSourceTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LegacyEditor.Razor.Test/Completion/RazorDirectiveCompletionSourceTest.cs
@@ -30,7 +30,8 @@ public class RazorDirectiveCompletionSourceTest(ITestOutputHelper testOutput) :
     [
         CSharpCodeParser.AddTagHelperDirectiveDescriptor,
         CSharpCodeParser.RemoveTagHelperDirectiveDescriptor,
-        CSharpCodeParser.TagHelperPrefixDirectiveDescriptor
+        CSharpCodeParser.TagHelperPrefixDirectiveDescriptor,
+        CSharpCodeParser.UsingDirectiveDescriptor
     ]);
 
     private readonly IRazorCompletionFactsService _completionFactsService = new RazorCompletionFactsService([new DirectiveCompletionItemProvider()]);
@@ -120,7 +121,9 @@ public async Task GetCompletionContextAsync_ProvidesCompletionsWhenAtCompletionP
             item => AssertRazorCompletionItem(s_defaultDirectives[1], item, completionSource, isSnippet: false),
             item => AssertRazorCompletionItem(s_defaultDirectives[1], item, completionSource, isSnippet: true),
             item => AssertRazorCompletionItem(s_defaultDirectives[2], item, completionSource, isSnippet: false),
-            item => AssertRazorCompletionItem(s_defaultDirectives[2], item, completionSource, isSnippet: true));
+            item => AssertRazorCompletionItem(s_defaultDirectives[2], item, completionSource, isSnippet: true),
+            item => AssertRazorCompletionItem(s_defaultDirectives[3], item, completionSource, isSnippet: false),
+            item => AssertRazorCompletionItem(s_defaultDirectives[3], item, completionSource, isSnippet: true));
     }
 
     [Fact]
@@ -184,7 +187,7 @@ private static void AssertRazorCompletionItem(string completionDisplayText, Dire
 
     private static void AssertRazorCompletionItem(DirectiveDescriptor directive, CompletionItem item, IAsyncCompletionSource source, bool isSnippet = false)
     {
-        var expectedDisplayText = isSnippet ? directive.Directive + " ..." : directive.Directive;
+        var expectedDisplayText = isSnippet ? directive.Directive + " directive" : directive.Directive;
         AssertRazorCompletionItem(expectedDisplayText, directive, item, source, isSnippet: isSnippet);
     }