diff --git a/src/Dapr.Workflow/DaprWorkflowActivityContext.cs b/src/Dapr.Workflow/DaprWorkflowActivityContext.cs
new file mode 100644
index 000000000..cf902dea4
--- /dev/null
+++ b/src/Dapr.Workflow/DaprWorkflowActivityContext.cs
@@ -0,0 +1,37 @@
+// ------------------------------------------------------------------------
+// Copyright 2022 The Dapr Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//     http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ------------------------------------------------------------------------
+
+namespace Dapr.Workflow
+{
+    using System;
+    using Microsoft.DurableTask;
+
+    /// <summary>
+    /// Defines properties and methods for task activity context objects.
+    /// </summary>
+    public class DaprWorkflowActivityContext : WorkflowActivityContext
+    {
+        readonly TaskActivityContext innerContext;
+
+        internal DaprWorkflowActivityContext(TaskActivityContext innerContext)
+        {
+            this.innerContext = innerContext ?? throw new ArgumentNullException(nameof(innerContext));
+        }
+
+        /// <inheritdoc/>
+        public override TaskName Name => this.innerContext.Name;
+
+        /// <inheritdoc/>
+        public override string InstanceId => this.innerContext.InstanceId;
+    }
+}
diff --git a/src/Dapr.Workflow/WorkflowActivityContext.cs b/src/Dapr.Workflow/WorkflowActivityContext.cs
index eec32f008..a77c3ef91 100644
--- a/src/Dapr.Workflow/WorkflowActivityContext.cs
+++ b/src/Dapr.Workflow/WorkflowActivityContext.cs
@@ -13,29 +13,21 @@
 
 namespace Dapr.Workflow
 {
-    using System;
     using Microsoft.DurableTask;
 
     /// <summary>
     /// Defines properties and methods for task activity context objects.
     /// </summary>
-    public class WorkflowActivityContext
+    public abstract class WorkflowActivityContext
     {
-        readonly TaskActivityContext innerContext;
-
-        internal WorkflowActivityContext(TaskActivityContext innerContext)
-        {
-            this.innerContext = innerContext ?? throw new ArgumentNullException(nameof(innerContext));
-        }
-
         /// <summary>
         /// Gets the name of the activity.
         /// </summary>
-        public TaskName Name => this.innerContext.Name;
+        public abstract TaskName Name { get; }
 
         /// <summary>
         /// Gets the unique ID of the current workflow instance.
         /// </summary>
-        public string InstanceId => this.innerContext.InstanceId;
+        public abstract string InstanceId {  get; }
     }
 }
diff --git a/src/Dapr.Workflow/WorkflowRuntimeOptions.cs b/src/Dapr.Workflow/WorkflowRuntimeOptions.cs
index 9f0081783..9afdfb5e7 100644
--- a/src/Dapr.Workflow/WorkflowRuntimeOptions.cs
+++ b/src/Dapr.Workflow/WorkflowRuntimeOptions.cs
@@ -97,7 +97,7 @@ public void RegisterActivity<TInput, TOutput>(string name, Func<WorkflowActivity
             {
                 registry.AddActivityFunc<TInput, TOutput>(name, (innerContext, input) =>
                 {
-                    WorkflowActivityContext activityContext = new(innerContext);
+                    WorkflowActivityContext activityContext = new DaprWorkflowActivityContext(innerContext);
                     return implementation(activityContext, input);
                 });
                 WorkflowLoggingService.LogActivityName(name);
@@ -183,7 +183,7 @@ public ActivityWrapper(IWorkflowActivity activity)
 
             public Task<object?> RunAsync(TaskActivityContext context, object? input)
             {
-                return this.activity.RunAsync(new WorkflowActivityContext(context), input);
+                return this.activity.RunAsync(new DaprWorkflowActivityContext(context), input);
             }
         }
     }
diff --git a/test/Dapr.Workflow.Test/Dapr.Workflow.Test.csproj b/test/Dapr.Workflow.Test/Dapr.Workflow.Test.csproj
index 531a0b1f1..36cee5ebc 100644
--- a/test/Dapr.Workflow.Test/Dapr.Workflow.Test.csproj
+++ b/test/Dapr.Workflow.Test/Dapr.Workflow.Test.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
     <PropertyGroup>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
@@ -14,8 +13,8 @@
         <PackageReference Include="xunit" />
         <PackageReference Include="xunit.extensibility.core" />
         <PackageReference Include="xunit.runner.visualstudio" />
+        <PackageReference Include="Moq" />
     </ItemGroup>
-
     <ItemGroup>
         <Using Include="Xunit"/>
     </ItemGroup>
@@ -23,5 +22,4 @@
     <ItemGroup>
       <ProjectReference Include="..\..\src\Dapr.Workflow\Dapr.Workflow.csproj" />
     </ItemGroup>
-
 </Project>
diff --git a/test/Dapr.Workflow.Test/WorkflowActivityTest.cs b/test/Dapr.Workflow.Test/WorkflowActivityTest.cs
new file mode 100644
index 000000000..f6be41fc7
--- /dev/null
+++ b/test/Dapr.Workflow.Test/WorkflowActivityTest.cs
@@ -0,0 +1,55 @@
+// ------------------------------------------------------------------------
+// Copyright 2021 The Dapr Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//     http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ------------------------------------------------------------------------
+
+namespace Dapr.Workflow.Test
+{
+    using Moq;
+    using System.Threading.Tasks;
+    using Xunit;
+    using Xunit.Sdk;
+
+    /// <summary>
+    /// Contains tests for WorkflowActivityContext.
+    /// </summary>
+    public class WorkflowActivityTest
+    {
+        private IWorkflowActivity workflowActivity;
+
+        private Mock<WorkflowActivityContext> workflowActivityContextMock;
+
+        public WorkflowActivityTest()
+        {
+            this.workflowActivity = new TestDaprWorkflowActivity();
+            this.workflowActivityContextMock = new Mock<WorkflowActivityContext>();
+        }
+
+        [Fact]
+        public async Task RunAsync_ShouldReturnCorrectContextInstanceId()
+        {
+            this.workflowActivityContextMock.Setup((x) => x.InstanceId).Returns("instanceId");
+
+            string result = (string) (await this.workflowActivity.RunAsync(this.workflowActivityContextMock.Object, "input"))!;
+
+            Assert.Equal("instanceId", result);
+        }
+
+
+        public class TestDaprWorkflowActivity : WorkflowActivity<string, string>
+        {
+            public override Task<string> RunAsync(WorkflowActivityContext context, string input)
+            {
+                return Task.FromResult(context.InstanceId);
+            }
+        }
+    }
+}