diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/BasicTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/BasicTests.cs
index f2637e9b2c..1c4a28def3 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/BasicTests.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/BasicTests.cs
@@ -104,8 +104,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
 
             // Assert
             Assert.Equal(HttpStatusCode.NoContent, response.StatusCode);
-            var body = await response.Content.ReadAsStringAsync();
-            Assert.Equal("Hello world", body);
+            Assert.Equal("Hello, World!", Assert.Single(response.Headers.GetValues("Message")));
         }
 
         [Fact]
diff --git a/test/WebSites/BasicWebSite/Controllers/HomeController.cs b/test/WebSites/BasicWebSite/Controllers/HomeController.cs
index 88c5d2190a..13464b6ec2 100644
--- a/test/WebSites/BasicWebSite/Controllers/HomeController.cs
+++ b/test/WebSites/BasicWebSite/Controllers/HomeController.cs
@@ -48,9 +48,10 @@ namespace BasicWebSite.Controllers
             return new HttpStatusCodeResult(200);
         }
 
-        public async Task ActionReturningTask()
+        public Task ActionReturningTask()
         {
-            await Context.Response.WriteAsync("Hello world");
+            Response.Headers.Add("Message", new[] { "Hello, World!" });
+            return Task.FromResult(true);
         }
 
         public IActionResult JsonTextInView()