diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj b/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj
index f6807462d3df..269999c0cefc 100644
--- a/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj
+++ b/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj
@@ -229,15 +229,6 @@
     <None Include="ScenarioTests\DummyConfig.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="ScenarioTests\Generated\VirtualMachineDynamicTest1.ps1">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="ScenarioTests\Generated\VirtualMachineDynamicTest2.ps1">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="ScenarioTests\Generated\VirtualMachineDynamicTest3.ps1">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Include="ScenarioTests\RunnerTests.csv">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/RunnerTests.cs b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/RunnerTests.cs
index 6ed37e4823fa..5e62cb991c17 100644
--- a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/RunnerTests.cs
+++ b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/RunnerTests.cs
@@ -34,6 +34,7 @@ public void ExecuteRunnerTests()
             var credential = new ClientCredential(testEnv.ClientId, envDictionary["ApplicationSecret"]);
 
             var result = authenticationContext.AcquireToken("https://management.core.windows.net/", clientCredential: credential);
+
             Assert.NotNull(result.AccessToken);
             envDictionary["RawToken"] = result.AccessToken;
 
@@ -54,7 +55,11 @@ public void ExecuteRunnerTests()
                     var testClassInstance = constructorInfo.Invoke(new object[] {});
                     var testMethod = type.GetMethod(method);
 
+                    Console.WriteLine("Invoking method : " + testMethod);
+
                     testMethod.Invoke(testClassInstance, new object[] {});
+
+                    Console.WriteLine("Method " + testMethod + " has finished");
                 }
             }
         }
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/RunnerTests.csv b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/RunnerTests.csv
index a39087cf3bae..8c31d8680a86 100644
--- a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/RunnerTests.csv
+++ b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/RunnerTests.csv
@@ -1,5 +1 @@
-Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AvailabilitySetTests;TestAvailabilitySet
-Microsoft.Azure.Commands.Compute.Test.ScenarioTests.ComputeCloudExceptionTests;RunComputeCloudExceptionTests
-Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests;TestLinuxVirtualMachine
-Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineProfileTests;TestVirtualMachineProfile
-Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VMDynamicTests;RunVMDynamicTests
+Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VMDynamicTests;RunVMDynamicTests
\ No newline at end of file
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VMDynamicTests.cs b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VMDynamicTests.cs
index 7ebe28708b0b..d22c639b10c6 100644
--- a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VMDynamicTests.cs
+++ b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VMDynamicTests.cs
@@ -12,6 +12,8 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using System;
+using System.IO;
 using Microsoft.Azure.Test.HttpRecorder;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using Xunit;
@@ -24,7 +26,7 @@ public partial class VMDynamicTests
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void RunVMDynamicTests()
         {
-            ComputeTestController.NewInstance.RunPsTest("Run-VMDynamicTests");
+            ComputeTestController.NewInstance.RunPsTest("Run-VMDynamicTests -num_total_generated_tests 1");
         }
     }
 }