Index: Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/AvalonDockViewHostTest.cs
===================================================================
diff -u -r22bfc7d1330c3602f2e81cb158c2ce3f13325905 -r4ed2036e6cd45d2db79aa23677d5d63ef3474d84
--- Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/AvalonDockViewHostTest.cs	(.../AvalonDockViewHostTest.cs)	(revision 22bfc7d1330c3602f2e81cb158c2ce3f13325905)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/AvalonDockViewHostTest.cs	(.../AvalonDockViewHostTest.cs)	(revision 4ed2036e6cd45d2db79aa23677d5d63ef3474d84)
@@ -365,7 +365,7 @@
         }
 
         [Test]
-        public void Remove_ActiveDocumentViewInViewHostWithMultipleOtherViews_ActiveDocumentViewSetToPreviousAndActiveDocumentEventsFired()
+        public void Remove_ActiveDocumentViewInViewHostWithMultipleOtherViews_ActiveDocumentViewSetToOtherViewAndActiveDocumentEventsFired()
         {
             // Setup
             var testView1 = new TestView();
@@ -384,7 +384,6 @@
                 avalonDockViewHost.AddDocumentView(testView4);
                 avalonDockViewHost.AddToolView(testView5, ToolViewLocation.Left);
 
-                avalonDockViewHost.SetFocusToView(testView3);
                 avalonDockViewHost.SetFocusToView(testView1);
 
                 // Precondition
@@ -400,8 +399,9 @@
                 // Assert
                 Assert.AreEqual(1, activeDocumentViewChangingCounter);
                 Assert.AreEqual(1, activeDocumentViewChangedCounter);
-                Assert.AreSame(testView3, avalonDockViewHost.ActiveDocumentView);
-                Assert.IsTrue(IsFocussedView(avalonDockViewHost, testView3));
+                Assert.IsNotNull(avalonDockViewHost.ActiveDocumentView);
+                Assert.AreNotSame(testView1, avalonDockViewHost.ActiveDocumentView);
+                Assert.IsTrue(IsFocussedView(avalonDockViewHost, avalonDockViewHost.ActiveDocumentView));
             }
         }