diff --git a/test/WorkflowCore.IntegrationTests/Scenarios/DiScenario.cs b/test/WorkflowCore.IntegrationTests/Scenarios/DiScenario.cs
index 81a782264..2579e2946 100644
--- a/test/WorkflowCore.IntegrationTests/Scenarios/DiScenario.cs
+++ b/test/WorkflowCore.IntegrationTests/Scenarios/DiScenario.cs
@@ -87,6 +87,8 @@ public abstract class DiScenario : WorkflowTest<DiWorkflow, DiData>
     {
         protected void ConfigureHost(IServiceProvider serviceProvider)
         {
+            Workflow = serviceProvider.GetService<DiWorkflow>();
+
             PersistenceProvider = serviceProvider.GetService<IPersistenceProvider>();
             Host = serviceProvider.GetService<IWorkflowHost>();
             Host.RegisterWorkflow<DiWorkflow, DiData>();
@@ -111,6 +113,7 @@ public DiMsTransientScenario()
             services.AddTransient<Dependency1>();
             services.AddTransient<Dependency2>();
             services.AddTransient<DiStep1>();
+            services.AddTransient<DiWorkflow>();
             services.AddLogging();
             ConfigureServices(services);
 
@@ -149,6 +152,7 @@ public DiMsScopedScenario()
             services.AddScoped<Dependency2>();
             services.AddTransient<DiStep1>();
             services.AddLogging();
+            services.AddTransient<DiWorkflow>();
             ConfigureServices(services);
 
             var serviceProvider = services.BuildServiceProvider();
@@ -191,6 +195,7 @@ public DiAutoFacTransientScenario()
             builder.RegisterType<Dependency1>().InstancePerDependency();
             builder.RegisterType<Dependency2>().InstancePerDependency();
             builder.RegisterType<DiStep1>().InstancePerDependency();
+            builder.RegisterType<DiWorkflow>().InstancePerDependency();
             var container = builder.Build();
 
             var serviceProvider = new AutofacServiceProvider(container);
@@ -233,6 +238,7 @@ public DiAutoFacScopedScenario()
             builder.RegisterType<Dependency1>().InstancePerLifetimeScope();
             builder.RegisterType<Dependency2>().InstancePerLifetimeScope();
             builder.RegisterType<DiStep1>().InstancePerLifetimeScope();
+            builder.RegisterType<DiWorkflow>().InstancePerLifetimeScope();
             var container = builder.Build();
 
             var serviceProvider = new AutofacServiceProvider(container);
diff --git a/test/WorkflowCore.Testing/WorkflowCore.Testing.csproj b/test/WorkflowCore.Testing/WorkflowCore.Testing.csproj
index 32f9c1363..f8ddd588e 100644
--- a/test/WorkflowCore.Testing/WorkflowCore.Testing.csproj
+++ b/test/WorkflowCore.Testing/WorkflowCore.Testing.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.3.0</Version>
-    <AssemblyVersion>2.3.0.0</AssemblyVersion>
-    <FileVersion>2.3.0.0</FileVersion>
+    <Version>2.3.1</Version>
+    <AssemblyVersion>2.3.1.0</AssemblyVersion>
+    <FileVersion>2.3.1.0</FileVersion>
     <Description>Facilitates testing of workflows built on Workflow-Core</Description>
   </PropertyGroup>
 
diff --git a/test/WorkflowCore.Testing/WorkflowTest.cs b/test/WorkflowCore.Testing/WorkflowTest.cs
index f61d6be0a..3fe13845b 100644
--- a/test/WorkflowCore.Testing/WorkflowTest.cs
+++ b/test/WorkflowCore.Testing/WorkflowTest.cs
@@ -1,8 +1,6 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
@@ -13,18 +11,21 @@
 namespace WorkflowCore.Testing
 {
     public abstract class WorkflowTest<TWorkflow, TData> : IDisposable
-        where TWorkflow : IWorkflow<TData>, new()
+        where TWorkflow : class, IWorkflow<TData>
         where TData : class, new()
     {
         protected IWorkflowHost Host;
         protected IPersistenceProvider PersistenceProvider;
         protected List<StepError> UnhandledStepErrors = new List<StepError>();
+        protected TWorkflow Workflow;
 
         protected virtual void Setup()
         {
             //setup dependency injection
             IServiceCollection services = new ServiceCollection();
             services.AddLogging();
+            services.AddTransient<TWorkflow>();
+            
             ConfigureServices(services);
 
             var serviceProvider = services.BuildServiceProvider();
@@ -33,6 +34,8 @@ protected virtual void Setup()
             var loggerFactory = serviceProvider.GetService<ILoggerFactory>();
             //loggerFactory.AddConsole(LogLevel.Debug);
 
+            Workflow = serviceProvider.GetService<TWorkflow>();
+
             PersistenceProvider = serviceProvider.GetService<IPersistenceProvider>();
             Host = serviceProvider.GetService<IWorkflowHost>();
             Host.RegisterWorkflow<TWorkflow, TData>();
@@ -57,15 +60,13 @@ protected virtual void ConfigureServices(IServiceCollection services)
 
         public string StartWorkflow(TData data)
         {
-            var def = new TWorkflow();
-            var workflowId = Host.StartWorkflow<TData>(def.Id, data).Result;
+            var workflowId = Host.StartWorkflow<TData>(Workflow.Id, data).Result;
             return workflowId;
         }
 
         public async Task<string> StartWorkflowAsync(TData data)
         {
-            var def = new TWorkflow();
-            var workflowId = await Host.StartWorkflow(def.Id, data);
+            var workflowId = await Host.StartWorkflow(Workflow.Id, data);
             return workflowId;
         }