diff --git a/package.json b/package.json
index 710079855c..1cc22662a9 100644
--- a/package.json
+++ b/package.json
@@ -138,6 +138,7 @@
     "unit-arm-deployment": "node --max_old_space_size=4096 scripts/unit.js testlist-arm-deployment.txt",
     "unit-vm": "node scripts/unit.js testlist-vm.txt",
     "unit-vm-live": "node scripts/unit.js testlist-vm-live.txt",
+    "unit-arm-compute-all": "node scripts/unit.js testlist-arm-compute-all.txt",
     "unit-arm-vm": "node scripts/unit.js testlist-arm-vm.txt",
     "unit-arm-vm-live": "node scripts/unit.js testlist-arm-vm-live.txt",
     "unit-arm-vm-ping": "node scripts/unit.js testlist-arm-vm-ping.txt",
diff --git a/test/testlist-arm-compute-all.txt b/test/testlist-arm-compute-all.txt
new file mode 100644
index 0000000000..1a9da77a66
--- /dev/null
+++ b/test/testlist-arm-compute-all.txt
@@ -0,0 +1,19 @@
+#owner @huangpf 
+# Live + Playback
+include:./testlist-arm-vmss.txt
+include:./testlist-arm-container.txt
+include:./testlist-arm-vm.txt
+include:./testlist-arm-availset.txt
+include:./testlist-arm-diskvm.txt
+include:./testlist-arm-vm-disk.txt
+include:./testlist-arm-vm-snapshot.txt
+commands/arm/vm/arm.vm-premium-create-tests.js
+commands/arm/vm/arm.vm-usage-tests.js
+commands/arm/vm/arm.vm-stop-restart-tests.js
+commands/arm/vm/arm.vm.disk-attachnew-detach-test.js
+commands/arm/vm/arm.vm-create-generate-ssh-tests.js
+commands/arm/vm/arm.vm.extension-tests.js
+commands/arm/vm/arm.vm.size-tests.js
+# Docker
+commands/arm/vm/arm.vm-docker-tests.js
+commands/arm/vm/arm.vm-docker-ssh-tests.js
diff --git a/test/testlist-arm-vm-live.txt b/test/testlist-arm-vm-live.txt
index 8c178314fb..63d40c585c 100644
--- a/test/testlist-arm-vm-live.txt
+++ b/test/testlist-arm-vm-live.txt
@@ -1,20 +1,2 @@
 #owner @huangpf 
-# Live + Playback
-include:./testlist-arm-vmss.txt
-include:./testlist-arm-container.txt
-include:./testlist-arm-vm.txt
-include:./testlist-arm-availset.txt
-include:./testlist-arm-diskvm.txt
-include:./testlist-arm-vm-disk.txt
-include:./testlist-arm-vm-snapshot.txt
-commands/arm/vm/arm.vm-premium-create-tests.js
-commands/arm/vm/arm.vm-usage-tests.js
-commands/arm/vm/arm.vm-stop-restart-tests.js
-commands/arm/vm/arm.vm.disk-attachnew-detach-test.js
-commands/arm/vm/arm.vm-create-generate-ssh-tests.js
-commands/arm/vm/arm.vm.extension-tests.js
-commands/arm/vm/arm.vm.size-tests.js
-# Docker
-commands/arm/vm/arm.vm-docker-tests.js
-commands/arm/vm/arm.vm-docker-ssh-tests.js
-# Live Only
\ No newline at end of file
+# Live Only Tests -- To be added here
\ No newline at end of file
diff --git a/test/testlist-arm.txt b/test/testlist-arm.txt
index 10e930d13b..f319f0ee00 100644
--- a/test/testlist-arm.txt
+++ b/test/testlist-arm.txt
@@ -35,18 +35,8 @@ commands/arm/insights/arm.insights.usage-tests.js
 #commands/arm/keyvault/arm.keyvault-key-tests.js
 #commands/arm/keyvault/arm.keyvault-secret-tests.js
 # START - Compute Tests
-commands/arm/vm/arm.vm-stop-restart-tests.js
-commands/arm/vm/arm.vm.disk-attachnew-detach-test.js
-commands/arm/vm/arm.vm-docker-tests.js
-commands/arm/vm/arm.vm-docker-ssh-tests.js
-commands/arm/vm/arm.vm-create-generate-ssh-tests.js
-include:./testlist-arm-vm.txt
-include:./testlist-arm-vmss.txt
-include:./testlist-arm-container.txt
-include:./testlist-arm-availset.txt
-include:./testlist-arm-diskvm.txt
-include:./testlist-arm-vm-disk.txt
-include:./testlist-arm-vm-snapshot.txt
+# Please add non-Extension tests in the following test list file
+include:./testlist-arm-compute-all.txt
 # Extension Tests
 commands/arm/vm/arm.vm.extension-tests.js
 #commands/arm/vm/arm.vm.enable-aem-tests.js