diff --git a/nova/exception.py b/nova/exception.py
index dc1199be3..df2f79e3d 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -811,6 +811,11 @@ class InstanceMetadataNotFound(NotFound):
                 "key %(metadata_key)s.")
 
 
+class InstanceSystemMetadataNotFound(NotFound):
+    message = _("Instance %(instance_uuid)s has no system metadata with "
+                "key %(metadata_key)s.")
+
+
 class InstanceTypeExtraSpecsNotFound(NotFound):
     message = _("Instance Type %(instance_type_id)s has no extra specs with "
                 "key %(extra_specs_key)s.")
diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py
index b5607cee4..c1002d98a 100644
--- a/nova/tests/test_db_api.py
+++ b/nova/tests/test_db_api.py
@@ -168,37 +168,47 @@ class DbApiTestCase(test.TestCase):
         ctxt = context.get_admin_context()
 
         # Create an instance with some metadata
-        metadata = {'host': 'foo'}
-        values = {'metadata': metadata}
+        values = {'metadata': {'host': 'foo'},
+                  'system_metadata': {'original_image_ref': 'blah'}}
         instance = db.instance_create(ctxt, values)
 
         # Update the metadata
-        metadata = {'host': 'bar'}
-        values = {'metadata': metadata}
+        values = {'metadata': {'host': 'bar'},
+                  'system_metadata': {'original_image_ref': 'baz'}}
         db.instance_update(ctxt, instance.id, values)
 
-        # Retrieve the metadata to ensure it was successfully updated
+        # Retrieve the user-provided metadata to ensure it was successfully
+        # updated
         instance_meta = db.instance_metadata_get(ctxt, instance.id)
         self.assertEqual('bar', instance_meta['host'])
 
+        # Retrieve the system metadata to ensure it was successfully updated
+        system_meta = db.instance_system_metadata_get(ctxt, instance.uuid)
+        self.assertEqual('baz', system_meta['original_image_ref'])
+
     def test_instance_update_with_instance_uuid(self):
         """ test instance_update() works when an instance UUID is passed """
         ctxt = context.get_admin_context()
 
         # Create an instance with some metadata
-        metadata = {'host': 'foo'}
-        values = {'metadata': metadata}
+        values = {'metadata': {'host': 'foo'},
+                  'system_metadata': {'original_image_ref': 'blah'}}
         instance = db.instance_create(ctxt, values)
 
         # Update the metadata
-        metadata = {'host': 'bar'}
-        values = {'metadata': metadata}
+        values = {'metadata': {'host': 'bar'},
+                  'system_metadata': {'original_image_ref': 'baz'}}
         db.instance_update(ctxt, instance.uuid, values)
 
-        # Retrieve the metadata to ensure it was successfully updated
+        # Retrieve the user-provided metadata to ensure it was successfully
+        # updated
         instance_meta = db.instance_metadata_get(ctxt, instance.id)
         self.assertEqual('bar', instance_meta['host'])
 
+        # Retrieve the system metadata to ensure it was successfully updated
+        system_meta = db.instance_system_metadata_get(ctxt, instance.uuid)
+        self.assertEqual('baz', system_meta['original_image_ref'])
+
     def test_instance_fault_create(self):
         """Ensure we can create an instance fault"""
         ctxt = context.get_admin_context()