diff --git a/nova/test.py b/nova/test.py
index 047e07418..caf1f89b8 100644
--- a/nova/test.py
+++ b/nova/test.py
@@ -40,6 +40,7 @@ from oslo_log.fixture import logging_error as log_fixture
 from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_utils import timeutils
+from oslo_versionedobjects import fixture as ovo_fixture
 from oslotest import moxstubout
 import six
 import testtools
@@ -229,7 +230,7 @@ class TestCase(testtools.TestCase):
             objects_base.NovaObjectRegistry._registry._obj_classes)
         self.addCleanup(self._restore_obj_registry)
 
-        self.useFixture(nova_fixtures.StableObjectJsonFixture())
+        self.useFixture(ovo_fixture.StableObjectJsonFixture())
 
         # NOTE(mnaser): All calls to utils.is_neutron() are cached in
         # nova.utils._IS_NEUTRON.  We set it to None to avoid any
diff --git a/nova/tests/fixtures.py b/nova/tests/fixtures.py
index a6301ecbb..8c0a197a3 100644
--- a/nova/tests/fixtures.py
+++ b/nova/tests/fixtures.py
@@ -605,34 +605,6 @@ class BannedDBSchemaOperations(fixtures.Fixture):
                 lambda *a, **k: self._explode(thing, 'alter')))
 
 
-class StableObjectJsonFixture(fixtures.Fixture):
-    """Fixture that makes sure we get stable JSON object representations.
-
-    Since objects contain things like set(), which can't be converted to
-    JSON, we have some situations where the representation isn't fully
-    deterministic. This doesn't matter at all at runtime, but does to
-    unit tests that try to assert things at a low level.
-
-    This fixture mocks the obj_to_primitive() call and makes sure to
-    sort the list of changed fields (which came from a set) before
-    returning it to the caller.
-    """
-    def __init__(self):
-        self._original_otp = obj_base.NovaObject.obj_to_primitive
-
-    def setUp(self):
-        super(StableObjectJsonFixture, self).setUp()
-
-        def _doit(obj, *args, **kwargs):
-            result = self._original_otp(obj, *args, **kwargs)
-            if 'nova_object.changes' in result:
-                result['nova_object.changes'].sort()
-            return result
-
-        self.useFixture(fixtures.MonkeyPatch(
-            'nova.objects.base.NovaObject.obj_to_primitive', _doit))
-
-
 class EngineFacadeFixture(fixtures.Fixture):
     """Fixture to isolation EngineFacade during tests.