diff --git a/src/Microsoft.DotNet.ProjectModel.Server/ProjectManager.cs b/src/Microsoft.DotNet.ProjectModel.Server/ProjectManager.cs
index 058b23c3c..7da25727e 100644
--- a/src/Microsoft.DotNet.ProjectModel.Server/ProjectManager.cs
+++ b/src/Microsoft.DotNet.ProjectModel.Server/ProjectManager.cs
@@ -55,9 +55,9 @@ namespace Microsoft.DotNet.ProjectModel.Server
             _messengers = new List<Messenger<ProjectContextSnapshot>>
             {
                 new DependencyDiagnosticsMessenger(Transmit),
+                new ReferencesMessenger(Transmit),
                 new DependenciesMessenger(Transmit),
                 new CompilerOptionsMessenger(Transmit),
-                new ReferencesMessenger(Transmit),
                 new SourcesMessenger(Transmit)
             };
 
diff --git a/test/Microsoft.DotNet.ProjectModel.Server.Tests/DthTests.cs b/test/Microsoft.DotNet.ProjectModel.Server.Tests/DthTests.cs
index 590aefb8d..072981ece 100644
--- a/test/Microsoft.DotNet.ProjectModel.Server.Tests/DthTests.cs
+++ b/test/Microsoft.DotNet.ProjectModel.Server.Tests/DthTests.cs
@@ -100,27 +100,7 @@ namespace Microsoft.DotNet.ProjectModel.Server.Tests
             {
                 client.Initialize(projectPath);
 
-                var unresolveDependency = client.DrainTillFirst("Dependencies")
-                                                .EnsureSource(server, client)
-                                                .RetrieveDependency(expectedUnresolvedDependency);
-
-                unresolveDependency.AssertProperty("Name", expectedUnresolvedDependency)
-                                   .AssertProperty("DisplayName", expectedUnresolvedDependency)
-                                   .AssertProperty("Resolved", false)
-                                   .AssertProperty("Type", expectedUnresolvedType);
-
-                if (expectedUnresolvedType == "Project")
-                {
-                    unresolveDependency.AssertProperty("Path", Path.Combine(Path.GetDirectoryName(projectPath),
-                                                                            expectedUnresolvedDependency,
-                                                                            Project.FileName));
-                }
-                else
-                {
-                    Assert.False(unresolveDependency["Path"].HasValues);
-                }
-
-                var referencesMessage = client.DrainTillFirst("References", TimeSpan.FromDays(1))
+                var referencesMessage = client.DrainTillFirst(MessageTypes.References, TimeSpan.FromDays(1))
                                               .EnsureSource(server, client);
 
                 if (referenceType == "Project")
@@ -143,6 +123,26 @@ namespace Microsoft.DotNet.ProjectModel.Server.Tests
                                      .RetrievePropertyAs<JArray>("ProjectReferences")
                                      .AssertJArrayCount(0);
                 }
+
+                var unresolveDependency = client.DrainTillFirst(MessageTypes.Dependencies)
+                                                .EnsureSource(server, client)
+                                                .RetrieveDependency(expectedUnresolvedDependency);
+
+                unresolveDependency.AssertProperty("Name", expectedUnresolvedDependency)
+                                   .AssertProperty("DisplayName", expectedUnresolvedDependency)
+                                   .AssertProperty("Resolved", false)
+                                   .AssertProperty("Type", expectedUnresolvedType);
+
+                if (expectedUnresolvedType == "Project")
+                {
+                    unresolveDependency.AssertProperty("Path", Path.Combine(Path.GetDirectoryName(projectPath),
+                                                                            expectedUnresolvedDependency,
+                                                                            Project.FileName));
+                }
+                else
+                {
+                    Assert.False(unresolveDependency["Path"].HasValues);
+                }
             }
         }