diff --git a/vmware_nsx/db/nsx_models.py b/vmware_nsx/db/nsx_models.py
index 496cd2cff7..b655bc6bed 100644
--- a/vmware_nsx/db/nsx_models.py
+++ b/vmware_nsx/db/nsx_models.py
@@ -418,7 +418,9 @@ class NsxProjectPluginMapping(model_base.BASEV2, models.TimestampMixin):
     """Stores the mapping between the neutron plugin and the project id"""
     __tablename__ = 'nsx_project_plugin_mappings'
     project = sa.Column(sa.String(36), primary_key=True)
-    plugin = sa.Column(sa.Enum('dvs', 'nsx-v', 'nsx-t'), nullable=False)
+    plugin = sa.Column(sa.Enum('dvs', 'nsx-v', 'nsx-t',
+                               name='nsx_plugin_type'),
+                       nullable=False)
 
 
 class NsxVpnConnectionMapping(model_base.BASEV2, models.TimestampMixin):
diff --git a/vmware_nsx/tests/unit/db/test_migrations.py b/vmware_nsx/tests/unit/db/test_migrations.py
index 9d012a59f6..f948492f99 100644
--- a/vmware_nsx/tests/unit/db/test_migrations.py
+++ b/vmware_nsx/tests/unit/db/test_migrations.py
@@ -91,9 +91,14 @@ FWAAS_TABLES = {
     'cisco_firewall_associations',
 }
 
+VPNAAS_TABLES = {
+    'vpn_endpoint_groups',
+    'vpn_endpoints',
+}
+
 # EXTERNAL_TABLES should contain all names of tables that are not related to
 # current repo.
-EXTERNAL_TABLES = (set(external.TABLES) | LBAAS_TABLES |
+EXTERNAL_TABLES = (set(external.TABLES) | LBAAS_TABLES | VPNAAS_TABLES |
                    L2GW_TABLES | SFC_TABLES | TAAS_TABLES | FWAAS_TABLES)