diff --git a/src/Features/Core/Portable/Features.csproj b/src/Features/Core/Portable/Features.csproj
index a9b431c3c7b8ea323528150ddaa659655d89ba6d..f4f918aaa7cf3a74ea150ba9e12c2895c5d0de34 100644
--- a/src/Features/Core/Portable/Features.csproj
+++ b/src/Features/Core/Portable/Features.csproj
@@ -84,6 +84,7 @@
     <InternalsVisibleToTypeScript Include="Roslyn.Services.Editor.TypeScript.UnitTests" />
     <InternalsVisibleToFSharp Include="FSharp.Editor" />
     <InternalsVisibleToMoq Include="DynamicProxyGenAssembly2" />
+    <InternalsVisibleToVisualStudio Include="Microsoft.Test.Apex.VisualStudio" />
     <InternalsVisibleToVisualStudio Include="Microsoft.VisualStudio.Alm.Shared.CodeAnalysisClient" />
     <InternalsVisibleToVisualStudio Include="Microsoft.VisualStudio.CodeSense.ReferencesProvider" />
     <InternalsVisibleToVisualStudio Include="Microsoft.VisualStudio.CodeSense.TestsProvider" />
diff --git a/src/Test/Diagnostics/Diagnostics.csproj b/src/Test/Diagnostics/Diagnostics.csproj
index e5faba7c514ab98a81b15e33a9cb4013994978b4..99b4d769d3fcbf683c587fcbc0489028b04be09e 100644
--- a/src/Test/Diagnostics/Diagnostics.csproj
+++ b/src/Test/Diagnostics/Diagnostics.csproj
@@ -84,6 +84,7 @@
     <Compile Include="Waiters\ReferenceHighlightingWaiter.cs" />
     <Compile Include="Waiters\RenameWaiter.cs" />
     <Compile Include="Waiters\SignatureHelpWaiter.cs" />
+    <Compile Include="Waiters\SnippetWaiter.cs" />
     <Compile Include="Waiters\SolutionCrawlerWaiter.cs" />
     <Compile Include="Waiters\TodoCommentListWaiter.cs" />
     <Compile Include="Waiters\WorkspaceWaiter.cs" />
@@ -102,4 +103,4 @@
     <None Include="project.json" />
   </ItemGroup>
   <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/Test/Diagnostics/Waiters/SnippetWaiter.cs b/src/Test/Diagnostics/Waiters/SnippetWaiter.cs
new file mode 100644
index 0000000000000000000000000000000000000000..e09b3d982bcf3cc0ca424d51cf174e67843fe7e8
--- /dev/null
+++ b/src/Test/Diagnostics/Waiters/SnippetWaiter.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Composition;
+using Microsoft.CodeAnalysis.Shared.TestHooks;
+
+namespace Roslyn.Hosting.Diagnostics.Waiters
+{
+    [Shared]
+    [Export(typeof(IAsynchronousOperationListener))]
+    [Export(typeof(IAsynchronousOperationWaiter))]
+    [Feature(FeatureAttribute.Snippets)]
+    internal class SnippetWaiter : AsynchronousOperationListener { }
+}