diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ElmLogger.cs b/src/Microsoft.AspNet.Diagnostics.Elm/ElmLogger.cs
index ebfdc4849d..71f466d6b0 100644
--- a/src/Microsoft.AspNet.Diagnostics.Elm/ElmLogger.cs
+++ b/src/Microsoft.AspNet.Diagnostics.Elm/ElmLogger.cs
@@ -57,7 +57,7 @@ namespace Microsoft.AspNet.Diagnostics.Elm
             return _options.Filter(_name, logLevel);
         }
 
-        public IDisposable BeginScope(object state)
+        public IDisposable BeginScopeImpl(object state)
         {
             var scope = new ElmScope(_name, state);
             scope.Context = ElmScope.Current?.Context ?? GetNewActivityContext();
diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLogger.cs b/src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLogger.cs
index 01f41e42ae..68f3ad9a69 100644
--- a/src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLogger.cs
+++ b/src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLogger.cs
@@ -62,7 +62,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity
             return true;
         }
 
-        public virtual IDisposable BeginScope(object state)
+        public virtual IDisposable BeginScopeImpl(object state)
         {
             return NullScope.Instance;
         }
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/Helpers/TestLoggerProvider.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/Helpers/TestLoggerProvider.cs
index 19c7e42cf5..f66aea4e19 100644
--- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/Helpers/TestLoggerProvider.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/Helpers/TestLoggerProvider.cs
@@ -40,7 +40,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.FunctionalTests.Helpers
                 return true;
             }
 
-            public IDisposable BeginScope(object state)
+            public IDisposable BeginScopeImpl(object state)
             {
                 return NullScope.Instance;
             }
diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/ElmLoggerTest.cs b/test/Microsoft.AspNet.Diagnostics.Tests/ElmLoggerTest.cs
index e17acb48b5..5241ad3491 100644
--- a/test/Microsoft.AspNet.Diagnostics.Tests/ElmLoggerTest.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Tests/ElmLoggerTest.cs
@@ -179,9 +179,15 @@ namespace Microsoft.AspNet.Diagnostics.Tests
 
             // Assert
             // get the root of the activity for scope "test2"
-            var root1 = (store.GetActivities()).Where(a => a.Root.State.Equals("test2"))?.FirstOrDefault()?.Root;
+            var root1 = (store.GetActivities())
+                .Where(a => string.Equals(a.Root.State?.ToString(), "test2"))?
+                .FirstOrDefault()?
+                .Root;
             Assert.NotNull(root1);
-            var root2 = (store.GetActivities()).Where(a => a.Root.State.Equals("test12"))?.FirstOrDefault()?.Root;
+            var root2 = (store.GetActivities())
+                .Where(a => string.Equals(a.Root.State?.ToString(), "test12"))?
+                .FirstOrDefault()?
+                .Root;
             Assert.NotNull(root2);
 
             Assert.Equal(0, root1.Children.Count);
@@ -269,7 +275,9 @@ namespace Microsoft.AspNet.Diagnostics.Tests
 
             // Assert
             Assert.Single(store.GetActivities());
-            var context = store.GetActivities().Where(a => a.Root.State.Equals("test8")).First();
+            var context = store.GetActivities()
+                .Where(a => string.Equals(a.Root.State?.ToString(), "test8"))
+                .First();
             Assert.Empty(context.Root.Children);
         }