diff --git a/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountAgreementTests.cs b/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountAgreementTests.cs
index dcdc678cc81f..67a7ba77624d 100644
--- a/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountAgreementTests.cs
+++ b/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountAgreementTests.cs
@@ -15,21 +15,15 @@
 namespace Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests
 {
     using Microsoft.WindowsAzure.Commands.ScenarioTest;
-    using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
-    using ServiceManagement.Common.Models;
     using Xunit;
 
     /// <summary>
     /// Scenario tests for integration account agreement commands.
     /// </summary>
-    public class IntegrationAccountAgreementTests : RMTestBase
+    public class IntegrationAccountAgreementTests : LogicAppTestRunner
     {
-        public XunitTracingInterceptor _logger;
-
-        public IntegrationAccountAgreementTests(Xunit.Abstractions.ITestOutputHelper output)
+        public IntegrationAccountAgreementTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
         }
 
         /// <summary>
@@ -39,7 +33,7 @@ public IntegrationAccountAgreementTests(Xunit.Abstractions.ITestOutputHelper out
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreateAgreementX12()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-CreateIntegrationAccountAgreementX12");
+            TestRunner.RunTestScript("Test-CreateIntegrationAccountAgreementX12");
         }
 
         /// <summary>
@@ -49,7 +43,7 @@ public void TestCreateAgreementX12()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreateAgreementWithFailure()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-CreateIntegrationAccountAgreementWithFailure");
+            TestRunner.RunTestScript("Test-CreateIntegrationAccountAgreementWithFailure");
         }
 
         /// <summary>
@@ -59,7 +53,7 @@ public void TestCreateAgreementWithFailure()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreateAgreementAs2()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-CreateIntegrationAccountAgreementAS2");
+            TestRunner.RunTestScript("Test-CreateIntegrationAccountAgreementAS2");
         }
 
         /// <summary>
@@ -69,7 +63,7 @@ public void TestCreateAgreementAs2()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreateAgreementEdifact()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-CreateIntegrationAccountAgreementEdifact");
+            TestRunner.RunTestScript("Test-CreateIntegrationAccountAgreementEdifact");
         }
 
         /// <summary>
@@ -79,7 +73,7 @@ public void TestCreateAgreementEdifact()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetAgreement()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-GetIntegrationAccountAgreement");
+            TestRunner.RunTestScript("Test-GetIntegrationAccountAgreement");
         }
 
         /// <summary>
@@ -89,7 +83,7 @@ public void TestGetAgreement()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRemoveAgreement()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-RemoveIntegrationAccountAgreement");
+            TestRunner.RunTestScript("Test-RemoveIntegrationAccountAgreement");
         }
 
         /// <summary>
@@ -99,7 +93,7 @@ public void TestRemoveAgreement()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUpdateAgreement()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-UpdateIntegrationAccountAgreement");
+            TestRunner.RunTestScript("Test-UpdateIntegrationAccountAgreement");
         }
 
         /// <summary>
@@ -109,7 +103,7 @@ public void TestUpdateAgreement()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListAgreement()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-ListIntegrationAccountAgreement");
+            TestRunner.RunTestScript("Test-ListIntegrationAccountAgreement");
         }
     }
 }
\ No newline at end of file
diff --git a/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountAssemblyTests.cs b/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountAssemblyTests.cs
index 6c1f6167fffe..e01055f7ea01 100644
--- a/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountAssemblyTests.cs
+++ b/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountAssemblyTests.cs
@@ -13,21 +13,16 @@
 // ----------------------------------------------------------------------------------
 namespace Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests
 {
-    using Microsoft.Azure.ServiceManagement.Common.Models;
     using Microsoft.WindowsAzure.Commands.ScenarioTest;
-    using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
     using Xunit;
 
     /// <summary>
     /// Scenario tests for integration account assembly commands.
     /// </summary>
-    public class IntegrationAccountAssemblyTests : RMTestBase
+    public class IntegrationAccountAssemblyTests : LogicAppTestRunner
     {
-        public XunitTracingInterceptor _logger;
-        public IntegrationAccountAssemblyTests(Xunit.Abstractions.ITestOutputHelper output)
+        public IntegrationAccountAssemblyTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
         }
 
         /// <summary>
@@ -37,7 +32,7 @@ public IntegrationAccountAssemblyTests(Xunit.Abstractions.ITestOutputHelper outp
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestNewAssembly()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-NewIntegrationAccountAssembly");
+            TestRunner.RunTestScript("Test-NewIntegrationAccountAssembly");
         }
 
         /// <summary>
@@ -47,7 +42,7 @@ public void TestNewAssembly()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetAssembly()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-GetIntegrationAccountAssembly");
+            TestRunner.RunTestScript("Test-GetIntegrationAccountAssembly");
         }
 
         /// <summary>
@@ -57,7 +52,7 @@ public void TestGetAssembly()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRemoveAssembly()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-RemoveIntegrationAccountAssembly");
+            TestRunner.RunTestScript("Test-RemoveIntegrationAccountAssembly");
         }
 
         /// <summary>
@@ -67,7 +62,7 @@ public void TestRemoveAssembly()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestSetAssembly()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-SetIntegrationAccountAssembly");
+            TestRunner.RunTestScript("Test-SetIntegrationAccountAssembly");
         }
     }
 }
\ No newline at end of file
diff --git a/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountBatchConfigurationTests.cs b/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountBatchConfigurationTests.cs
index a9bfae1e5b4f..19950e97cfe2 100644
--- a/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountBatchConfigurationTests.cs
+++ b/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountBatchConfigurationTests.cs
@@ -14,21 +14,16 @@
 
 namespace Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests
 {
-    using Microsoft.Azure.ServiceManagement.Common.Models;
     using Microsoft.WindowsAzure.Commands.ScenarioTest;
-    using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
     using Xunit;
 
     /// <summary>
     /// Scenario tests for integration account batch configuration commands.
     /// </summary>
-    public class IntegrationAccountBatchConfigurationTests : RMTestBase
+    public class IntegrationAccountBatchConfigurationTests : LogicAppTestRunner
     {
-        public XunitTracingInterceptor _logger;
-        public IntegrationAccountBatchConfigurationTests(Xunit.Abstractions.ITestOutputHelper output)
+        public IntegrationAccountBatchConfigurationTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
         }
 
         /// <summary>
@@ -38,7 +33,7 @@ public IntegrationAccountBatchConfigurationTests(Xunit.Abstractions.ITestOutputH
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestNewBatchConfiguration()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-NewIntegrationAccountBatchConfiguration");
+            TestRunner.RunTestScript("Test-NewIntegrationAccountBatchConfiguration");
         }
 
         /// <summary>
@@ -48,7 +43,7 @@ public void TestNewBatchConfiguration()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetBatchConfiguration()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-GetIntegrationAccountBatchConfiguration");
+            TestRunner.RunTestScript("Test-GetIntegrationAccountBatchConfiguration");
         }
 
         /// <summary>
@@ -58,7 +53,7 @@ public void TestGetBatchConfiguration()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRemoveBatchConfiguration()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-RemoveIntegrationAccountBatchConfiguration");
+            TestRunner.RunTestScript("Test-RemoveIntegrationAccountBatchConfiguration");
         }
 
         /// <summary>
@@ -68,7 +63,7 @@ public void TestRemoveBatchConfiguration()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestSetBatchConfiguration()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-SetIntegrationAccountBatchConfiguration");
+            TestRunner.RunTestScript("Test-SetIntegrationAccountBatchConfiguration");
         }
     }
 }
\ No newline at end of file
diff --git a/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountCertificateTests.cs b/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountCertificateTests.cs
index cea6ac67d1c3..39b7973c8e51 100644
--- a/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountCertificateTests.cs
+++ b/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountCertificateTests.cs
@@ -15,21 +15,15 @@
 namespace Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests
 {
     using Microsoft.WindowsAzure.Commands.ScenarioTest;
-    using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
-    using ServiceManagement.Common.Models;
     using Xunit;
 
     /// <summary>
     /// Scenario tests for integration account certificate commands.
     /// </summary>
-    public class IntegrationAccountCertificateTests : RMTestBase
+    public class IntegrationAccountCertificateTests : LogicAppTestRunner
     {
-        public XunitTracingInterceptor _logger;
-
-        public IntegrationAccountCertificateTests(Xunit.Abstractions.ITestOutputHelper output)
+        public IntegrationAccountCertificateTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
         }
 
         /// <summary>
@@ -39,7 +33,7 @@ public IntegrationAccountCertificateTests(Xunit.Abstractions.ITestOutputHelper o
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreateCertificate()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-CreateIntegrationAccountCertificate");
+            TestRunner.RunTestScript("Test-CreateIntegrationAccountCertificate");
         }
 
         /// <summary>
@@ -49,7 +43,7 @@ public void TestCreateCertificate()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreateCertificatePrivateKey()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-CreateIntegrationAccountCertificatePrivateKey");
+            TestRunner.RunTestScript("Test-CreateIntegrationAccountCertificatePrivateKey");
         }
 
         /// <summary>
@@ -59,7 +53,7 @@ public void TestCreateCertificatePrivateKey()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetCertificate()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-GetIntegrationAccountCertificate");
+            TestRunner.RunTestScript("Test-GetIntegrationAccountCertificate");
         }
 
         /// <summary>
@@ -69,7 +63,7 @@ public void TestGetCertificate()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRemoveCertificate()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-RemoveIntegrationAccountCertificate");
+            TestRunner.RunTestScript("Test-RemoveIntegrationAccountCertificate");
         }
 
         /// <summary>
@@ -79,7 +73,7 @@ public void TestRemoveCertificate()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUpdateCertificate()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-UpdateIntegrationAccountCertificate");
+            TestRunner.RunTestScript("Test-UpdateIntegrationAccountCertificate");
         }
 
         /// <summary>
@@ -89,7 +83,7 @@ public void TestUpdateCertificate()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreateCertificatePublicKey()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-CreateIntegrationAccountCertificatePublicKey");
+            TestRunner.RunTestScript("Test-CreateIntegrationAccountCertificatePublicKey");
         }
     }
 }
\ No newline at end of file
diff --git a/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountGeneratedIcnTests.cs b/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountGeneratedIcnTests.cs
index ea11404ad1e3..8f5f394d6773 100644
--- a/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountGeneratedIcnTests.cs
+++ b/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountGeneratedIcnTests.cs
@@ -15,21 +15,15 @@
 namespace Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests
 {
     using Microsoft.WindowsAzure.Commands.ScenarioTest;
-    using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
-    using ServiceManagement.Common.Models;
     using Xunit;
 
     /// <summary>
     /// Scenario tests for integration account generated control number commands.
     /// </summary>
-    public class IntegrationAccountGeneratedIcnTests : RMTestBase
+    public class IntegrationAccountGeneratedIcnTests : LogicAppTestRunner
     {
-        public XunitTracingInterceptor _logger;
-
-        public IntegrationAccountGeneratedIcnTests(Xunit.Abstractions.ITestOutputHelper output)
+        public IntegrationAccountGeneratedIcnTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
         }
 
         /// <summary>
@@ -39,7 +33,7 @@ public IntegrationAccountGeneratedIcnTests(Xunit.Abstractions.ITestOutputHelper
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetGeneratedIcn()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-GetGeneratedControlNumber");
+            TestRunner.RunTestScript("Test-GetGeneratedControlNumber");
         }
 
         /// <summary>
@@ -49,7 +43,7 @@ public void TestGetGeneratedIcn()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUpdateGeneratedIcn()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-UpdateGeneratedControlNumber");
+            TestRunner.RunTestScript("Test-UpdateGeneratedControlNumber");
         }
 
         /// <summary>
@@ -59,7 +53,7 @@ public void TestUpdateGeneratedIcn()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListGeneratedIcn()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-ListGeneratedControlNumber");
+            TestRunner.RunTestScript("Test-ListGeneratedControlNumber");
         }
     }
 }
\ No newline at end of file
diff --git a/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountMapTests.cs b/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountMapTests.cs
index 6213dfd8fb52..58cf0c35898b 100644
--- a/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountMapTests.cs
+++ b/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountMapTests.cs
@@ -15,21 +15,15 @@
 namespace Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests
 {
     using Microsoft.WindowsAzure.Commands.ScenarioTest;
-    using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
-    using ServiceManagement.Common.Models;
     using Xunit;
 
     /// <summary>
     /// Scenario tests for integration account map commands.
     /// </summary>
-    public class IntegrationAccountMapTests : RMTestBase
+    public class IntegrationAccountMapTests : LogicAppTestRunner
     {
-        public XunitTracingInterceptor _logger;
-
-        public IntegrationAccountMapTests(Xunit.Abstractions.ITestOutputHelper output)
+        public IntegrationAccountMapTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
         }
 
         /// <summary>
@@ -39,7 +33,7 @@ public IntegrationAccountMapTests(Xunit.Abstractions.ITestOutputHelper output)
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreateMap()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-CreateIntegrationAccountMap");
+            TestRunner.RunTestScript("Test-CreateIntegrationAccountMap");
         }
 
         /// <summary>
@@ -49,7 +43,7 @@ public void TestCreateMap()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetMap()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-GetIntegrationAccountMap");
+            TestRunner.RunTestScript("Test-GetIntegrationAccountMap");
         }
 
         /// <summary>
@@ -59,7 +53,7 @@ public void TestGetMap()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRemoveMap()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-RemoveIntegrationAccountMap");
+            TestRunner.RunTestScript("Test-RemoveIntegrationAccountMap");
         }
 
         /// <summary>
@@ -69,7 +63,7 @@ public void TestRemoveMap()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUpdateMap()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-UpdateIntegrationAccountMap");
+            TestRunner.RunTestScript("Test-UpdateIntegrationAccountMap");
         }
 
         /// <summary>
@@ -79,7 +73,7 @@ public void TestUpdateMap()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListMap()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-ListIntegrationAccountMap");
+            TestRunner.RunTestScript("Test-ListIntegrationAccountMap");
         }
     }
 }
\ No newline at end of file
diff --git a/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountPartnerTests.cs b/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountPartnerTests.cs
index f055add450ba..9dd8811b7a91 100644
--- a/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountPartnerTests.cs
+++ b/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountPartnerTests.cs
@@ -15,21 +15,15 @@
 namespace Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests
 {
     using Microsoft.WindowsAzure.Commands.ScenarioTest;
-    using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
-    using ServiceManagement.Common.Models;
     using Xunit;
 
     /// <summary>
     /// Scenario tests for integration account partner commands.
     /// </summary>
-    public class IntegrationAccountPartnerTests : RMTestBase
+    public class IntegrationAccountPartnerTests : LogicAppTestRunner
     {
-        public XunitTracingInterceptor _logger;
-
-        public IntegrationAccountPartnerTests(Xunit.Abstractions.ITestOutputHelper output)
+        public IntegrationAccountPartnerTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
         }
 
         /// <summary>
@@ -39,7 +33,7 @@ public IntegrationAccountPartnerTests(Xunit.Abstractions.ITestOutputHelper outpu
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreatePartner()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-CreateIntegrationAccountPartner");
+            TestRunner.RunTestScript("Test-CreateIntegrationAccountPartner");
         }
 
         /// <summary>
@@ -49,7 +43,7 @@ public void TestCreatePartner()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetPartner()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-GetIntegrationAccountPartner");
+            TestRunner.RunTestScript("Test-GetIntegrationAccountPartner");
         }
 
         /// <summary>
@@ -59,7 +53,7 @@ public void TestGetPartner()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRemovePartner()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-RemoveIntegrationAccountPartner");
+            TestRunner.RunTestScript("Test-RemoveIntegrationAccountPartner");
         }
 
         /// <summary>
@@ -69,7 +63,7 @@ public void TestRemovePartner()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUpdatePartner()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-UpdateIntegrationAccountPartner");
+            TestRunner.RunTestScript("Test-UpdateIntegrationAccountPartner");
         }
 
         /// <summary>
@@ -79,7 +73,7 @@ public void TestUpdatePartner()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListPartner()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-ListIntegrationAccountPartner");
+            TestRunner.RunTestScript("Test-ListIntegrationAccountPartner");
         }
     }
 }
\ No newline at end of file
diff --git a/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountReceivedIcnTests.cs b/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountReceivedIcnTests.cs
index 546c2a3738b2..245b7faeeb05 100644
--- a/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountReceivedIcnTests.cs
+++ b/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountReceivedIcnTests.cs
@@ -15,21 +15,15 @@
 namespace Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests
 {
     using Microsoft.WindowsAzure.Commands.ScenarioTest;
-    using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
-    using ServiceManagement.Common.Models;
     using Xunit;
 
     /// <summary>
     /// Scenario tests for integration account received control number commands.
     /// </summary>
-    public class IntegrationAccountReceivedIcnTests : RMTestBase
+    public class IntegrationAccountReceivedIcnTests : LogicAppTestRunner
     {
-        public XunitTracingInterceptor _logger;
-
-        public IntegrationAccountReceivedIcnTests(Xunit.Abstractions.ITestOutputHelper output)
+        public IntegrationAccountReceivedIcnTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
         }
 
         /// <summary>
@@ -39,7 +33,7 @@ public IntegrationAccountReceivedIcnTests(Xunit.Abstractions.ITestOutputHelper o
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetReceivedIcn()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-GetReceivedIcn");
+            TestRunner.RunTestScript("Test-GetReceivedIcn");
         }
 
         /// <summary>
@@ -49,7 +43,7 @@ public void TestGetReceivedIcn()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUpdateReceivedIcn()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-UpdateReceivedIcn");
+            TestRunner.RunTestScript("Test-UpdateReceivedIcn");
         }
     }
 }
\ No newline at end of file
diff --git a/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountSchemaTests.cs b/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountSchemaTests.cs
index 349e8b457f84..bf2806a3f84b 100644
--- a/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountSchemaTests.cs
+++ b/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountSchemaTests.cs
@@ -15,23 +15,16 @@
 
 namespace Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests
 {
-    using Microsoft.Rest.Azure;
     using Microsoft.WindowsAzure.Commands.ScenarioTest;
-    using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
-    using ServiceManagement.Common.Models;
     using Xunit;
 
     /// <summary>
     /// Scenario tests for integration account schema commands.
     /// </summary>
-    public class IntegrationAccountSchemaTests : RMTestBase
+    public class IntegrationAccountSchemaTests : LogicAppTestRunner
     {
-        public XunitTracingInterceptor _logger;
-
-        public IntegrationAccountSchemaTests(Xunit.Abstractions.ITestOutputHelper output)
+        public IntegrationAccountSchemaTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
         }
 
         /// <summary>
@@ -41,7 +34,7 @@ public IntegrationAccountSchemaTests(Xunit.Abstractions.ITestOutputHelper output
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreateSchema()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-CreateIntegrationAccountSchema");
+            TestRunner.RunTestScript("Test-CreateIntegrationAccountSchema");
         }
 
         /// <summary>
@@ -51,7 +44,7 @@ public void TestCreateSchema()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetSchema()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-GetIntegrationAccountSchema");
+            TestRunner.RunTestScript("Test-GetIntegrationAccountSchema");
         }
 
         /// <summary>
@@ -61,7 +54,7 @@ public void TestGetSchema()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRemoveSchema()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-RemoveIntegrationAccountSchema");
+            TestRunner.RunTestScript("Test-RemoveIntegrationAccountSchema");
         }
 
         /// <summary>
@@ -71,7 +64,7 @@ public void TestRemoveSchema()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUpdateSchema()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-UpdateIntegrationAccountSchema");
+            TestRunner.RunTestScript("Test-UpdateIntegrationAccountSchema");
         }
 
         /// <summary>
@@ -81,7 +74,7 @@ public void TestUpdateSchema()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListSchema()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-ListIntegrationAccountSchema");
+            TestRunner.RunTestScript("Test-ListIntegrationAccountSchema");
         }
     }
 }
\ No newline at end of file
diff --git a/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountTests.cs b/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountTests.cs
index d6ccfe3c5b0b..a7f1c688d1c8 100644
--- a/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountTests.cs
+++ b/src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountTests.cs
@@ -15,23 +15,16 @@
 
 namespace Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests
 {
-    using Microsoft.Rest.Azure;
     using Microsoft.WindowsAzure.Commands.ScenarioTest;
-    using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
-    using ServiceManagement.Common.Models;
     using Xunit;
 
     /// <summary>
     /// Scenario tests for integration account commands.
     /// </summary>
-    public class IntegrationAccountTests : RMTestBase
+    public class IntegrationAccountTests : LogicAppTestRunner
     {
-        public XunitTracingInterceptor _logger;
-
-        public IntegrationAccountTests(Xunit.Abstractions.ITestOutputHelper output)
+        public IntegrationAccountTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
         }
 
         /// <summary>
@@ -41,7 +34,7 @@ public IntegrationAccountTests(Xunit.Abstractions.ITestOutputHelper output)
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreateIntegrationAccount()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-CreateIntegrationAccount");
+            TestRunner.RunTestScript("Test-CreateIntegrationAccount");
         }
 
         /// <summary>
@@ -51,7 +44,7 @@ public void TestCreateIntegrationAccount()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreateAndGetIntegrationAccount()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-GetIntegrationAccount");
+            TestRunner.RunTestScript("Test-GetIntegrationAccount");
         }
 
         /// <summary>
@@ -61,7 +54,7 @@ public void TestCreateAndGetIntegrationAccount()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRemoveIntegrationAccount()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-RemoveIntegrationAccount");
+            TestRunner.RunTestScript("Test-RemoveIntegrationAccount");
         }
 
         /// <summary>
@@ -71,7 +64,7 @@ public void TestRemoveIntegrationAccount()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUpdateIntegrationAccount()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-UpdateIntegrationAccount");
+            TestRunner.RunTestScript("Test-UpdateIntegrationAccount");
         }
 
         /// <summary>
@@ -81,7 +74,7 @@ public void TestUpdateIntegrationAccount()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetIntegrationAccountCallbackUrl()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-GetIntegrationAccountCallbackUrl");
+            TestRunner.RunTestScript("Test-GetIntegrationAccountCallbackUrl");
         }
     }
 }
\ No newline at end of file
diff --git a/src/LogicApp/LogicApp.Test/ScenarioTests/LogicAppTestRunner.cs b/src/LogicApp/LogicApp.Test/ScenarioTests/LogicAppTestRunner.cs
new file mode 100644
index 000000000000..4026e500eb7f
--- /dev/null
+++ b/src/LogicApp/LogicApp.Test/ScenarioTests/LogicAppTestRunner.cs
@@ -0,0 +1,55 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// 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.
+// ----------------------------------------------------------------------------------
+
+using System.Collections.Generic;
+using Microsoft.Azure.Commands.TestFx;
+using Xunit.Abstractions;
+
+namespace Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests
+{
+    public class LogicAppTestRunner
+    {
+        protected readonly ITestRunner TestRunner;
+
+        protected LogicAppTestRunner(ITestOutputHelper output)
+        {
+            TestRunner = TestManager.CreateInstance(output)
+                .WithNewPsScriptFilename($"{GetType().Name}.ps1")
+                .WithProjectSubfolderForTests("ScenarioTests")
+                .WithCommonPsScripts(new[]
+                {
+                    @"Common.ps1",
+                    @"../AzureRM.Resources.ps1"
+                })
+                .WithNewRmModules(helper => new[]
+                {
+                    helper.RMProfileModule,
+                    helper.GetRMModulePath("Az.LogicApp.psd1")
+                })
+                .WithNewRecordMatcherArguments(
+                    userAgentsToIgnore: new Dictionary<string, string>
+                    {
+                        {"Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01"}
+                    },
+                    resourceProviders: new Dictionary<string, string>
+                    {
+                        {"Microsoft.Authorization", null},
+                        {"Microsoft.Resources", null},
+                        {"Microsoft.Features", null}
+                    }
+                )
+                .Build();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/LogicApp/LogicApp.Test/ScenarioTests/WorkflowController.cs b/src/LogicApp/LogicApp.Test/ScenarioTests/WorkflowController.cs
deleted file mode 100644
index 86bd0b3cd2fa..000000000000
--- a/src/LogicApp/LogicApp.Test/ScenarioTests/WorkflowController.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-// ----------------------------------------------------------------------------------
-//
-// Copyright Microsoft Corporation
-// 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.
-// ----------------------------------------------------------------------------------
-
-using Microsoft.Azure.Management.Internal.Resources;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using Microsoft.Azure.Commands.Common.Authentication;
-using Microsoft.Azure.Management.Logic;
-using Microsoft.Azure.Test.HttpRecorder;
-using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
-using Microsoft.WindowsAzure.Commands.ScenarioTest;
-using System.IO;
-using Microsoft.Azure.ServiceManagement.Common.Models;
-
-namespace Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests
-{
-    public class WorkflowController
-    {
-        private readonly EnvironmentSetupHelper _helper;
-        private const string AuthorizationApiVersion = "2014-07-01-preview";
-
-        public ResourceManagementClient ResourceManagementClient { get; private set; }
-
-        public Management.ResourceManager.ResourceManagementClient OldResourceManagementClient { get; private set; }
-
-        public LogicManagementClient LogicManagementClient { get; private set; }
-
-        public static WorkflowController NewInstance => new WorkflowController();
-
-        public WorkflowController()
-        {
-            _helper = new EnvironmentSetupHelper();
-        }
-
-        public void RunPowerShellTest(XunitTracingInterceptor logger, params string[] scripts)
-        {
-            var sf = new StackTrace().GetFrame(1);
-            var callingClassType = sf.GetMethod().ReflectedType?.ToString();
-            var mockName = sf.GetMethod().Name;
-
-            _helper.TracingInterceptor = logger;
-
-            RunPsTestWorkflow(
-                () => scripts,
-                // no custom cleanup
-                null,
-                callingClassType,
-                mockName);
-        }
-
-        public void RunPsTestWorkflow(
-            Func<string[]> scriptBuilder,
-            Action cleanup,
-            string callingClassType,
-            string mockName)
-        {
-            var d = new Dictionary<string, string>
-            {
-                {"Microsoft.Authorization", AuthorizationApiVersion},
-                {"Microsoft.Resources", null},
-                {"Microsoft.Features", null}
-            };
-            var providersToIgnore = new Dictionary<string, string>
-            {
-                {"Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01"}
-            };
-            HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(true, d, providersToIgnore);
-
-            HttpMockServer.RecordsDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "SessionRecords");
-            using (var context = MockContext.Start(callingClassType, mockName))
-            {
-                SetupManagementClients(context);
-                _helper.SetupEnvironment(AzureModule.AzureResourceManager);
-
-                var callingClassName = callingClassType.Split(new[] {"."}, StringSplitOptions.RemoveEmptyEntries).Last();
-                _helper.SetupModules(AzureModule.AzureResourceManager,
-                    "ScenarioTests\\Common.ps1",
-                    "ScenarioTests\\" + callingClassName + ".ps1",
-                    _helper.RMProfileModule,
-                    _helper.GetRMModulePath(@"Az.LogicApp.psd1"),
-                    "AzureRM.Resources.ps1");
-
-                try
-                {
-                    var psScripts = scriptBuilder?.Invoke();
-                    if (psScripts != null)
-                    {
-                        _helper.RunPowerShellTest(psScripts);
-                    }
-                }
-                finally
-                {
-                    cleanup?.Invoke();
-                }
-            }
-        }
-
-        private void SetupManagementClients(MockContext context)
-        {
-            ResourceManagementClient = GetResourceManagementClient(context);
-            LogicManagementClient = GetLogicManagementClient(context);
-            OldResourceManagementClient = GetOldResourceManagementClient(context);
-            _helper.SetupManagementClients(OldResourceManagementClient, ResourceManagementClient, LogicManagementClient);
-        }
-
-        private static Management.ResourceManager.ResourceManagementClient GetOldResourceManagementClient(MockContext context)
-        {
-            return context.GetServiceClient<Management.ResourceManager.ResourceManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
-        }
-
-        private static ResourceManagementClient GetResourceManagementClient(MockContext context)
-        {
-            return context.GetServiceClient<ResourceManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
-        }
-
-        private static LogicManagementClient GetLogicManagementClient(MockContext context)
-        {
-            return context.GetServiceClient<LogicManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/LogicApp/LogicApp.Test/ScenarioTests/WorkflowRunTests.cs b/src/LogicApp/LogicApp.Test/ScenarioTests/WorkflowRunTests.cs
index eebaaf772c64..170dcc4234b3 100644
--- a/src/LogicApp/LogicApp.Test/ScenarioTests/WorkflowRunTests.cs
+++ b/src/LogicApp/LogicApp.Test/ScenarioTests/WorkflowRunTests.cs
@@ -15,21 +15,15 @@
 namespace Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests
 {
     using Microsoft.WindowsAzure.Commands.ScenarioTest;
-    using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
-    using ServiceManagement.Common.Models;
     using Xunit;
     using Xunit.Abstractions;
     /// <summary>
     /// Scenario tests for the Workflow run commands
     /// </summary>
-    public class WorkflowRunTests : RMTestBase
+    public class WorkflowRunTests : LogicAppTestRunner
     {
-        public XunitTracingInterceptor _logger;
-
-        public WorkflowRunTests(ITestOutputHelper output)
+        public WorkflowRunTests(ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
         }
 
         /// <summary>
@@ -39,7 +33,7 @@ public WorkflowRunTests(ITestOutputHelper output)
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRunLogicApp()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-StartLogicApp");
+            TestRunner.RunTestScript("Test-StartLogicApp");
         }
 
         /// <summary>
@@ -49,7 +43,7 @@ public void TestRunLogicApp()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetAzLogicAppRunHistory()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-GetAzLogicAppRunHistory");
+            TestRunner.RunTestScript("Test-GetAzLogicAppRunHistory");
         }
 
         /// <summary>
@@ -59,7 +53,7 @@ public void TestGetAzLogicAppRunHistory()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetAzLogicAppRunAction()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-GetAzLogicAppRunAction");
+            TestRunner.RunTestScript("Test-GetAzLogicAppRunAction");
         }
 
         /// <summary>
@@ -69,7 +63,7 @@ public void TestGetAzLogicAppRunAction()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestStopAzLogicAppRun()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-StopAzLogicAppRun");
+            TestRunner.RunTestScript("Test-StopAzLogicAppRun");
         }
     }
 }
\ No newline at end of file
diff --git a/src/LogicApp/LogicApp.Test/ScenarioTests/WorkflowTests.cs b/src/LogicApp/LogicApp.Test/ScenarioTests/WorkflowTests.cs
index 5001d675a1a2..7879fce12217 100644
--- a/src/LogicApp/LogicApp.Test/ScenarioTests/WorkflowTests.cs
+++ b/src/LogicApp/LogicApp.Test/ScenarioTests/WorkflowTests.cs
@@ -16,21 +16,15 @@
 namespace Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests
 {
     using Microsoft.WindowsAzure.Commands.ScenarioTest;
-    using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
-    using ServiceManagement.Common.Models;
     using Xunit;
     using Xunit.Abstractions;
     /// <summary>
     /// Scenario tests for the Create logic app command
     /// </summary>
-    public class WorkflowTests : RMTestBase
+    public class WorkflowTests : LogicAppTestRunner
     {
-        public XunitTracingInterceptor _logger;
-
-        public WorkflowTests(ITestOutputHelper output)
+        public WorkflowTests(ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
         }
 
         /// <summary>
@@ -42,7 +36,7 @@ public WorkflowTests(ITestOutputHelper output)
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreateAndRemoveLogicApp()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-CreateAndRemoveLogicApp");
+            TestRunner.RunTestScript("Test-CreateAndRemoveLogicApp");
         }
 
         /// <summary>
@@ -52,7 +46,7 @@ public void TestCreateAndRemoveLogicApp()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreateLogicAppWithDuplicateName()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-CreateLogicAppWithDuplicateName");
+            TestRunner.RunTestScript("Test-CreateLogicAppWithDuplicateName");
         }
 
         /// <summary>
@@ -62,7 +56,7 @@ public void TestCreateLogicAppWithDuplicateName()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreateLogicAppUsingInputfromWorkflowObject()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-CreateLogicAppUsingInputfromWorkflowObject");
+            TestRunner.RunTestScript("Test-CreateLogicAppUsingInputfromWorkflowObject");
         }
 
         /// <summary>
@@ -72,7 +66,7 @@ public void TestCreateLogicAppUsingInputfromWorkflowObject()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreateLogicAppUsingInputParameterAsHashTable()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-CreateLogicAppUsingInputParameterAsHashTable");
+            TestRunner.RunTestScript("Test-CreateLogicAppUsingInputParameterAsHashTable");
         }
 
         /// <summary>
@@ -82,7 +76,7 @@ public void TestCreateLogicAppUsingInputParameterAsHashTable()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreateLogicAppUsingDefinitionWithTriggers()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-CreateLogicAppUsingDefinitionWithTriggers");
+            TestRunner.RunTestScript("Test-CreateLogicAppUsingDefinitionWithTriggers");
         }
 
         /// <summary>
@@ -94,7 +88,7 @@ public void TestCreateLogicAppUsingDefinitionWithTriggers()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreateAndGetLogicAppUsingDefinitionWithActions()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-CreateAndGetLogicAppUsingDefinitionWithActions");
+            TestRunner.RunTestScript("Test-CreateAndGetLogicAppUsingDefinitionWithActions");
         }
 
         /// <summary>
@@ -104,7 +98,7 @@ public void TestCreateAndGetLogicAppUsingDefinitionWithActions()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRemoveNonExistingLogicApp()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-RemoveNonExistingLogicApp");
+            TestRunner.RunTestScript("Test-RemoveNonExistingLogicApp");
         }
 
         /// <summary>
@@ -118,7 +112,7 @@ public void TestRemoveNonExistingLogicApp()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUpdateLogicApp()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-UpdateLogicApp");
+            TestRunner.RunTestScript("Test-UpdateLogicApp");
         }
 
         /// <summary>
@@ -128,7 +122,7 @@ public void TestUpdateLogicApp()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestValidateLogicApp()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-ValidateLogicApp");
+            TestRunner.RunTestScript("Test-ValidateLogicApp");
         }
 
         /// <summary>
@@ -142,7 +136,7 @@ public void TestValidateLogicApp()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetUpgradedDefinitionForLogicApp()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-GetUpgradedDefinitionForLogicApp");
+            TestRunner.RunTestScript("Test-GetUpgradedDefinitionForLogicApp");
         }
 
         /// <summary>
@@ -153,7 +147,7 @@ public void TestGetUpgradedDefinitionForLogicApp()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUpdateLogicAppWithIntegrationAccount()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-UpdateLogicAppWithIntegrationAccount");
+            TestRunner.RunTestScript("Test-UpdateLogicAppWithIntegrationAccount");
         }
     }
 }
\ No newline at end of file
diff --git a/src/LogicApp/LogicApp.Test/ScenarioTests/WorkflowTriggerTests.cs b/src/LogicApp/LogicApp.Test/ScenarioTests/WorkflowTriggerTests.cs
index 94a5d3a259bd..1ca20d381982 100644
--- a/src/LogicApp/LogicApp.Test/ScenarioTests/WorkflowTriggerTests.cs
+++ b/src/LogicApp/LogicApp.Test/ScenarioTests/WorkflowTriggerTests.cs
@@ -16,22 +16,16 @@
 namespace Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests
 {
     using Microsoft.WindowsAzure.Commands.ScenarioTest;
-    using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
-    using ServiceManagement.Common.Models;
     using Xunit;
     using Xunit.Abstractions;
 
     /// <summary>
     /// Scenario tests for the Workflow trigger commands
     /// </summary>
-    public class WorkflowTriggerTests : RMTestBase
+    public class WorkflowTriggerTests : LogicAppTestRunner
     {
-        public XunitTracingInterceptor _logger;
-
-        public WorkflowTriggerTests(ITestOutputHelper output)
+        public WorkflowTriggerTests(ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
         }
 
         /// <summary>
@@ -41,7 +35,7 @@ public WorkflowTriggerTests(ITestOutputHelper output)
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetAzLogicAppTrigger()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-GetAzLogicAppTrigger");
+            TestRunner.RunTestScript("Test-GetAzLogicAppTrigger");
         }
 
         /// <summary>
@@ -51,7 +45,7 @@ public void TestGetAzLogicAppTrigger()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetAzLogicAppTriggerHistory()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-GetAzLogicAppTriggerHistory");
+            TestRunner.RunTestScript("Test-GetAzLogicAppTriggerHistory");
         }
 
         /// <summary>
@@ -61,7 +55,7 @@ public void TestGetAzLogicAppTriggerHistory()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetAzLogicAppTriggerCallbackUrl()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-GetAzLogicAppTriggerCallbackUrl");
+            TestRunner.RunTestScript("Test-GetAzLogicAppTriggerCallbackUrl");
         }
 
         /// <summary>
@@ -71,7 +65,7 @@ public void TestGetAzLogicAppTriggerCallbackUrl()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestStartAzLogicAppTrigger()
         {
-            WorkflowController.NewInstance.RunPowerShellTest(_logger, "Test-StartAzLogicAppTrigger");
+            TestRunner.RunTestScript("Test-StartAzLogicAppTrigger");
         }
     }
 }
\ No newline at end of file