diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/ActivatorTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/ActivatorTests.cs
index da0c7c59de..4d23790d48 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/ActivatorTests.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/ActivatorTests.cs
@@ -21,11 +21,11 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
             // Arrange
             var server = TestServer.Create(_provider, _app);
             var client = server.CreateClient();
-            var expectedMessage = "TODO: No service for type 'ActivatorWebSite.CannotBeActivatedController+FakeType' " +
+            var expectedMessage = "No service for type 'ActivatorWebSite.CannotBeActivatedController+FakeType' " +
                                    "has been registered.";
 
             // Act & Assert
-            var ex = await Assert.ThrowsAsync<Exception>(() => client.GetAsync("http://localhost/CannotBeActivated/Index"));
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => client.GetAsync("http://localhost/CannotBeActivated/Index"));
             Assert.Equal(expectedMessage, ex.Message);
         }
 
@@ -158,11 +158,11 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
             // Arrange
             var server = TestServer.Create(_provider, _app);
             var client = server.CreateClient();
-            var expectedMessage = "TODO: No service for type 'ActivatorWebSite.CannotBeActivatedComponent+FakeType' " +
+            var expectedMessage = "No service for type 'ActivatorWebSite.CannotBeActivatedComponent+FakeType' " +
                                    "has been registered.";
 
             // Act & Assert
-            var ex = await Assert.ThrowsAsync<Exception>(
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(
                 () => client.GetAsync("http://localhost/View/ConsumeCannotBeActivatedComponent"));
             Assert.Equal(expectedMessage, ex.Message);
         }
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/FiltersTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/FiltersTest.cs
index 0c13710b0b..bf4ba11293 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/FiltersTest.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/FiltersTest.cs
@@ -125,7 +125,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
             var url = "http://localhost/RandomNumber/GetAuthorizedRandomNumber";
 
             // Act & Assert
-            await Assert.ThrowsAsync<Exception>(() => client.GetAsync(url));
+            await Assert.ThrowsAsync<InvalidOperationException>(() => client.GetAsync(url));
         }
 
         [Fact]
@@ -153,7 +153,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
             var url = "http://localhost/RandomNumber/GetHalfOfModifiedRandomNumber?randomNumber=3";
 
             // Act & Assert
-            await Assert.ThrowsAsync<Exception>(() => client.GetAsync(url));
+            await Assert.ThrowsAsync<InvalidOperationException>(() => client.GetAsync(url));
         }
 
         [Fact]