diff --git a/src/ApiManagement/ApiManagement.ServiceManagement.Test/ScenarioTests/ApiManagementTestRunner.cs b/src/ApiManagement/ApiManagement.ServiceManagement.Test/ScenarioTests/ApiManagementTestRunner.cs
new file mode 100644
index 000000000000..4b203974a457
--- /dev/null
+++ b/src/ApiManagement/ApiManagement.ServiceManagement.Test/ScenarioTests/ApiManagementTestRunner.cs
@@ -0,0 +1,41 @@
+//
+// Copyright (c) Microsoft.  All rights reserved.
+//
+//  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.Commands.TestFx;
+using Xunit.Abstractions;
+
+namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Test.ScenarioTests
+{
+    public class ApiManagementTestRunner
+    {
+        protected readonly ITestRunner TestRunner;
+
+        protected ApiManagementTestRunner(ITestOutputHelper output)
+        {
+            TestRunner = TestManager.CreateInstance(output)
+                .WithNewPsScriptFilename($"{GetType().Name}.ps1")
+                .WithProjectSubfolderForTests("ScenarioTests")
+                .WithCommonPsScripts(new[]
+                {
+                    @"Common.ps1"
+                })
+                .WithNewRmModules(helper => new[]
+               {
+                    helper.RMProfileModule,
+                    helper.GetRMModulePath("Az.ApiManagement.psd1")
+                })
+                .Build();
+        }
+    }
+}
diff --git a/src/ApiManagement/ApiManagement.ServiceManagement.Test/ScenarioTests/ApiManagementTests.cs b/src/ApiManagement/ApiManagement.ServiceManagement.Test/ScenarioTests/ApiManagementTests.cs
index 552b87f71030..8d28f10a9636 100644
--- a/src/ApiManagement/ApiManagement.ServiceManagement.Test/ScenarioTests/ApiManagementTests.cs
+++ b/src/ApiManagement/ApiManagement.ServiceManagement.Test/ScenarioTests/ApiManagementTests.cs
@@ -12,41 +12,13 @@
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
 
-using Microsoft.Azure.Commands.TestFx;
 using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using System.Linq;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Test.ScenarioTests
 {
-    public class ApiManagementTestRunner
-    {
-        protected readonly ITestRunner TestRunner;
-
-        protected ApiManagementTestRunner(ITestOutputHelper output)
-        {
-            TestRunner = TestManager.CreateInstance (output)
-                .WithNewPsScriptFilename ($"{GetType().Name}.ps1")
-                .WithProjectSubfolderForTests ("ScenarioTests")
-                .WithCommonPsScripts (new[]
-                {
-                    @"Common.ps1"
-                })
-                .WithNewRmModules (helper => new[]
-                {
-                    helper.RMProfileModule,
-                    helper.GetRMModulePath("Az.ApiManagement.psd1")
-                })
-                .WithManagementClients(
-                    ApiManagementHelper.GetApiManagementClient,
-                    ApiManagementHelper.GetResourceManagementClient
-                )
-                .Build();
-        }
-    }
-
     public class ApiManagementTests : ApiManagementTestRunner
     {
         public string Location { get; set; }
diff --git a/src/ApiManagement/ApiManagement.Test/ScenarioTests/ApiManagementTestRunner.cs b/src/ApiManagement/ApiManagement.Test/ScenarioTests/ApiManagementTestRunner.cs
new file mode 100644
index 000000000000..57de11de43f7
--- /dev/null
+++ b/src/ApiManagement/ApiManagement.Test/ScenarioTests/ApiManagementTestRunner.cs
@@ -0,0 +1,56 @@
+//
+// Copyright (c) Microsoft.  All rights reserved.
+//
+//  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.ApiManagement.Test.ScenarioTests
+{
+    public class ApiManagementTestRunner
+    {
+        protected readonly ITestRunner TestRunner;
+
+        protected ApiManagementTestRunner(ITestOutputHelper output)
+        {
+            TestRunner = TestManager.CreateInstance(output)
+                .WithNewPsScriptFilename($"{GetType().Name}.ps1")
+                .WithProjectSubfolderForTests("ScenarioTests")
+                .WithCommonPsScripts(new[]
+                {
+                    @"Common.ps1",
+                    @"../AzureRM.Storage.ps1",
+                    @"../AzureRM.Resources.ps1"
+                })
+                .WithNewRmModules(helper => new[]
+               {
+                    helper.RMProfileModule,
+                    helper.GetRMModulePath("Az.ApiManagement.psd1")
+                })
+                .WithNewRecordMatcherArguments(
+                    userAgentsToIgnore: new Dictionary<string, string>
+                    {
+                        {"Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01"},
+                    },
+                    resourceProviders: new Dictionary<string, string>
+                    {
+                        {"Microsoft.Resources", null},
+                        {"Microsoft.Features", null},
+                        {"Microsoft.Authorization", null}
+                    }
+                )
+                .Build();
+        }
+    }
+}
diff --git a/src/ApiManagement/ApiManagement.Test/ScenarioTests/ApiManagementTests.cs b/src/ApiManagement/ApiManagement.Test/ScenarioTests/ApiManagementTests.cs
index 8426ba10dc60..85b0aea157b5 100644
--- a/src/ApiManagement/ApiManagement.Test/ScenarioTests/ApiManagementTests.cs
+++ b/src/ApiManagement/ApiManagement.Test/ScenarioTests/ApiManagementTests.cs
@@ -12,82 +12,11 @@
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
 
-using Microsoft.Azure.Commands.Common.Authentication;
-using Microsoft.Azure.Management.Storage.Version2017_10_01;
-using Microsoft.Azure.ServiceManagement.Common.Models;
-using Microsoft.Azure.Test.HttpRecorder;
-using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
-using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
 using Xunit;
-using ResourceManagementClient = Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient;
-using TestEnvironmentFactory = Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestEnvironmentFactory;
-using Microsoft.Azure.Commands.TestFx;
-using Xunit.Abstractions;
 
 namespace Microsoft.Azure.Commands.ApiManagement.Test.ScenarioTests
 {
-    using ApiManagementClient = Management.ApiManagement.ApiManagementClient;
-
-    public class ApiManagementTestRunner
-    {
-        protected readonly ITestRunner TestRunner;
-
-        protected ApiManagementTestRunner(ITestOutputHelper output)
-        {
-            TestRunner = TestManager.CreateInstance (output)
-                .WithNewPsScriptFilename ($"{GetType().Name}.ps1")
-                .WithProjectSubfolderForTests ("ScenarioTests")
-                .WithCommonPsScripts (new[]
-                {
-                    @"Common.ps1",
-                    @"../AzureRM.Storage.ps1",
-                    @"../AzureRM.Resources.ps1"
-                })
-                .WithNewRmModules (helper => new[]
-                {
-                    helper.RMProfileModule,
-                    helper.GetRMModulePath("Az.ApiManagement.psd1")
-                })
-                .WithNewRecordMatcherArguments (
-                    userAgentsToIgnore: new Dictionary<string, string>
-                    {
-                        {"Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01"},
-                    },
-                    resourceProviders: new Dictionary<string, string>
-                    {
-                        {"Microsoft.Resources", null},
-                        {"Microsoft.Features", null},
-                        {"Microsoft.Authorization", null}
-                    }
-                ).WithManagementClients(
-                    GetResourceManagementClient,
-                    GetArmStorageManagementClient,
-                    GetApiManagementManagementClient
-                )
-                .Build();
-        }
-
-        private static StorageManagementClient GetArmStorageManagementClient(MockContext context)
-        {
-            return context.GetServiceClient<StorageManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
-        }
-
-        private static ResourceManagementClient GetResourceManagementClient(MockContext context)
-        {
-            return context.GetServiceClient<ResourceManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
-        }
-
-        private static ApiManagementClient GetApiManagementManagementClient(MockContext context)
-        {
-            return context.GetServiceClient<ApiManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
-        }
-    }
-
     public class ApiManagementTests : ApiManagementTestRunner
     {
         public ApiManagementTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)