diff --git a/azure-cli.pyproj b/azure-cli.pyproj
index aecd865ee05..729ddbf4a9c 100644
--- a/azure-cli.pyproj
+++ b/azure-cli.pyproj
@@ -132,6 +132,8 @@
     <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\tests\test_commands.py" />
     <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\generated.py" />
     <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\custom.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\tests\test_vm_image.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\tests\__init__.py" />
     <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\_validators.py">
       <SubType>Code</SubType>
     </Compile>
@@ -220,6 +222,7 @@
     <Content Include="command_modules\azure-cli-resource\requirements.txt" />
     <Content Include="command_modules\azure-cli-storage\requirements.txt" />
     <Content Include="command_modules\azure-cli-taskhelp\requirements.txt" />
+    <Content Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\tests\aliases.json" />
     <Content Include="command_modules\azure-cli-vm\requirements.txt" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/test/__init__.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/__init__.py
similarity index 100%
rename from src/command_modules/azure-cli-vm/azure/cli/command_modules/test/__init__.py
rename to src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/__init__.py
diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/test/aliases.json b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/aliases.json
similarity index 100%
rename from src/command_modules/azure-cli-vm/azure/cli/command_modules/test/aliases.json
rename to src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/aliases.json
diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_commands.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_commands.py
index aee9ab8e7fe..a3535f416c6 100644
--- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_commands.py
+++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_commands.py
@@ -1,7 +1,7 @@
 import os
 import unittest
 from azure.cli.utils.command_test_util import CommandTestGenerator
-from command_specs import TEST_DEF, ENV_VAR
+from command_specs import TEST_DEF, ENV_VAR #pylint: disable=import-error,relative-import
 
 class TestCommands(unittest.TestCase):
     pass
diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_custom_vm_commands.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_custom_vm_commands.py
index 51077643c4e..1d347b0c968 100644
--- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_custom_vm_commands.py
+++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_custom_vm_commands.py
@@ -1,5 +1,4 @@
-import json
-import unittest
+import unittest
 from azure.cli.command_modules.vm._validators import MinMaxValue
 
 class Test_Vm_Custom(unittest.TestCase):
diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/test/test_vm_image.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_image.py
similarity index 100%
rename from src/command_modules/azure-cli-vm/azure/cli/command_modules/test/test_vm_image.py
rename to src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_image.py