diff --git a/nova/db/main/api.py b/nova/db/main/api.py
index c9cdbbde5b64..b199a9402429 100644
--- a/nova/db/main/api.py
+++ b/nova/db/main/api.py
@@ -600,7 +600,7 @@ def _compute_node_fetchall(context, filters=None, limit=None, marker=None):
     results = conn.execute(select).fetchall()
 
     # Callers expect dict-like objects, not SQLAlchemy RowProxy objects...
-    results = [dict(r) for r in results]
+    results = [dict(r._mapping) for r in results]
     conn.close()
     return results
 
diff --git a/nova/tests/fixtures/nova.py b/nova/tests/fixtures/nova.py
index 6d8cb65e68a0..b1f4b5bbd274 100644
--- a/nova/tests/fixtures/nova.py
+++ b/nova/tests/fixtures/nova.py
@@ -865,18 +865,6 @@ class WarningsFixture(fixtures.Fixture):
             message=r'The Column.copy\(\) method is deprecated .*',
             category=sqla_exc.SADeprecationWarning)
 
-        warnings.filterwarnings(
-            'ignore',
-            module='nova',
-            message=r'The Row.keys\(\) method is considered legacy .*',
-            category=sqla_exc.SADeprecationWarning)
-
-        warnings.filterwarnings(
-            'ignore',
-            module='nova',
-            message=r'Using non-integer/slice indices on Row is deprecated .*',
-            category=sqla_exc.SADeprecationWarning)
-
         warnings.filterwarnings(
             'ignore',
             module='nova',