diff --git a/nova/db/sqlalchemy/api_models.py b/nova/db/sqlalchemy/api_models.py
index cec76f02c6b7..eb8ecfd61545 100644
--- a/nova/db/sqlalchemy/api_models.py
+++ b/nova/db/sqlalchemy/api_models.py
@@ -567,7 +567,7 @@ class Trait(API_BASE):
     name = Column(Unicode(255), nullable=False)
 
 
-class ResourceProviderTraits(API_BASE):
+class ResourceProviderTrait(API_BASE):
     """Represents the relationship between traits and resource provider"""
 
     __tablename__ = "resource_provider_traits"
diff --git a/nova/tests/functional/db/test_resource_provider.py b/nova/tests/functional/db/test_resource_provider.py
index 63eb6b124174..6cd3f02c52aa 100644
--- a/nova/tests/functional/db/test_resource_provider.py
+++ b/nova/tests/functional/db/test_resource_provider.py
@@ -1535,7 +1535,7 @@ class ResourceClassTestCase(ResourceProviderBaseCase):
                           'CUSTOM_IRON_NFV')
 
 
-class ResourceProviderTraitsTestCase(ResourceProviderBaseCase):
+class ResourceProviderTraitTestCase(ResourceProviderBaseCase):
 
     def _assert_traits(self, expected_traits, traits_objs):
         expected_traits.sort()