diff --git a/tox.ini b/tox.ini
index 89437a5071..7a60b1d86b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -86,6 +86,7 @@ commands =
     stestr run {posargs}
 whitelist_externals =
     stestr
+setenv = EDITOR=vi
 
 [testenv:py36-dev]
 basepython = python3.6
diff --git a/vmware_nsx/shell/admin/plugins/nsxp/migration.py b/vmware_nsx/shell/admin/plugins/nsxp/resources/migration.py
similarity index 92%
rename from vmware_nsx/shell/admin/plugins/nsxp/migration.py
rename to vmware_nsx/shell/admin/plugins/nsxp/resources/migration.py
index c064b8aa3e..f0f0543313 100644
--- a/vmware_nsx/shell/admin/plugins/nsxp/migration.py
+++ b/vmware_nsx/shell/admin/plugins/nsxp/resources/migration.py
@@ -23,7 +23,8 @@ from vmware_nsx.shell import resources as shell
 @admin_utils.output_header
 def cleanup_db_mappings(resource, event, trigger, **kwargs):
     """Delete all entries from nsx-t mapping tables in DB"""
-    return migration.cleanup_db_mappings(resource, event, trigger, **kwargs)
+    return migration.MP2Policy_cleanup_db_mappings(
+        resource, event, trigger, **kwargs)
 
 
 registry.subscribe(cleanup_db_mappings,
diff --git a/vmware_nsx/tests/unit/shell/test_admin_utils.py b/vmware_nsx/tests/unit/shell/test_admin_utils.py
index de4638a72c..4966edb268 100644
--- a/vmware_nsx/tests/unit/shell/test_admin_utils.py
+++ b/vmware_nsx/tests/unit/shell/test_admin_utils.py
@@ -394,6 +394,7 @@ class TestNsxpAdminUtils(AbstractTestAdminUtils,
         return 'nsxp'
 
     def _init_mock_plugin(self):
+        super(TestNsxpAdminUtils, self)._init_mock_plugin()
         self._plugin = nsxp_utils.NsxPolicyPluginWrapper()
 
     def test_nsxp_resources(self):