diff --git a/src/EditorFeatures/CSharpTest/EventHookup/EventHookupTestState.cs b/src/EditorFeatures/CSharpTest/EventHookup/EventHookupTestState.cs
index 7c9b305c1810db207faf9a26d87d7450a3fa48a1..c0ae05f0d98ab94bb2af80921b27ea2c18f3af9d 100644
--- a/src/EditorFeatures/CSharpTest/EventHookup/EventHookupTestState.cs
+++ b/src/EditorFeatures/CSharpTest/EventHookup/EventHookupTestState.cs
@@ -7,11 +7,15 @@
 using System.Threading;
 using System.Xml.Linq;
 using Microsoft.CodeAnalysis.Editor.CSharp.EventHookup;
+using Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.EventHookup;
 using Microsoft.CodeAnalysis.Editor.Implementation.Commands;
 using Microsoft.CodeAnalysis.Editor.UnitTests;
 using Microsoft.CodeAnalysis.Editor.UnitTests.Extensions;
 using Microsoft.CodeAnalysis.Options;
 using Xunit;
+using System.ComponentModel.Composition;
+using System.ComponentModel.Composition.Primitives;
+using Microsoft.VisualStudio.Composition;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.EventHookup
 {
@@ -21,7 +25,7 @@ internal sealed class EventHookupTestState : AbstractCommandHandlerTestState
         private Mutex _testSessionHookupMutex;
 
         public EventHookupTestState(XElement workspaceElement, IDictionary<OptionKey, object> options)
-            : base(workspaceElement, null, false)
+            : base(workspaceElement, GetExtraParts(), false)
         {
             CommandHandlerService t = (CommandHandlerService)Workspace.GetService<ICommandHandlerServiceFactory>().GetService(Workspace.Documents.Single().TextBuffer);
             var field = t.GetType().GetField("_commandHandlers", BindingFlags.NonPublic | BindingFlags.GetField | BindingFlags.Instance);
@@ -33,6 +37,11 @@ public EventHookupTestState(XElement workspaceElement, IDictionary<OptionKey, ob
             Workspace.ApplyOptions(options);
         }
 
+        private static ComposableCatalog GetExtraParts()
+        {
+            return MinimalTestExportProvider.CreateTypeCatalog(new[] { typeof(EventHookupWaiter) });
+        }
+
         public static EventHookupTestState CreateTestState(string markup, IDictionary<OptionKey, object> options = null)
         {
             var workspaceXml = string.Format(@"
diff --git a/src/EditorFeatures/Test/EditorServicesTest.csproj b/src/EditorFeatures/Test/EditorServicesTest.csproj
index 3612a321fe409d03edceca15b458b9000e3a0ce6..02e15ebfa65a714286b3720c598fd84ac8e6e4fe 100644
--- a/src/EditorFeatures/Test/EditorServicesTest.csproj
+++ b/src/EditorFeatures/Test/EditorServicesTest.csproj
@@ -179,7 +179,6 @@
     <Compile Include="EditorAdapter\SpanExtensionsTest.cs" />
     <Compile Include="EditorAdapter\TextSnapshotImplementationTest.cs" />
     <Compile Include="EditorAdapter\TextSpanExtensionsTest.cs" />
-    <Compile Include="EventHookup\EventHookupWaiter.cs" />
     <Compile Include="Extensions\CollectionExtensionsTest.cs" />
     <Compile Include="Extensions\EnumerableExtensionTests.cs" />
     <Compile Include="Extensions\IProjectionBufferFactoryServiceExtensionsTests.cs" />
diff --git a/src/EditorFeatures/Test/EventHookup/EventHookupWaiter.cs b/src/EditorFeatures/TestUtilities/EventHookup/EventHookupWaiter.cs
similarity index 100%
rename from src/EditorFeatures/Test/EventHookup/EventHookupWaiter.cs
rename to src/EditorFeatures/TestUtilities/EventHookup/EventHookupWaiter.cs
diff --git a/src/EditorFeatures/TestUtilities/ServicesTestUtilities.csproj b/src/EditorFeatures/TestUtilities/ServicesTestUtilities.csproj
index 8893a186470c183ac8d64e13ff20c8c646ce3d22..043cce105e8dbfa11eb057afb8559190760af65d 100644
--- a/src/EditorFeatures/TestUtilities/ServicesTestUtilities.csproj
+++ b/src/EditorFeatures/TestUtilities/ServicesTestUtilities.csproj
@@ -185,6 +185,7 @@
     <Compile Include="EditAndContinue\SemanticEditDescription.cs" />
     <Compile Include="EditAndContinue\TestActiveStatementTrackingService.cs" />
     <Compile Include="EditorFactory.cs" />
+    <Compile Include="EventHookup\EventHookupWaiter.cs" />
     <Compile Include="ExceptionUtilities.cs" />
     <Compile Include="Extensions\WorkspaceExtensions.cs" />
     <Compile Include="Extensions\XElementExtensions.cs" />