diff --git a/nova/tests/test_image.py b/nova/tests/test_image.py
index 9680d6f2..9eeefe0e 100644
--- a/nova/tests/test_image.py
+++ b/nova/tests/test_image.py
@@ -39,7 +39,8 @@ class _ImageTestCase(test.TestCase):
             keys = set(image.keys())
             self.assertEquals(keys, set(['id', 'name', 'created_at',
                                          'updated_at', 'deleted_at', 'deleted',
-                                         'status', 'is_public', 'properties']))
+                                         'status', 'is_public', 'properties',
+                                         'disk_format', 'container_format']))
             self.assertTrue(isinstance(image['created_at'], datetime.datetime))
             self.assertTrue(isinstance(image['updated_at'], datetime.datetime))
 
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index d59fb8f5..b7864c9d 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -352,6 +352,47 @@ class LibvirtConnTestCase(test.TestCase):
         instance_data = dict(self.test_instance)
         self._check_xml_and_container(instance_data)
 
+    def test_snapshot_in_ami_format(self):
+        if not self.lazy_load_library_exists():
+            return
+
+        self.flags(image_service='nova.image.fake.FakeImageService')
+
+        # Start test
+        image_service = utils.import_object(FLAGS.image_service)
+
+        # Assign image_ref = 3 from nova/images/fakes for testing
+        # ami image
+        test_instance = copy.deepcopy(self.test_instance)
+        test_instance["image_ref"] = "3"
+
+        # Assuming that base image already exists in image_service
+        instance_ref = db.instance_create(self.context, test_instance)
+        properties = {'instance_id': instance_ref['id'],
+                      'user_id': str(self.context.user_id)}
+        snapshot_name = 'test-snap'
+        sent_meta = {'name': snapshot_name, 'is_public': False,
+                     'status': 'creating', 'properties': properties}
+        # Create new image. It will be updated in snapshot method
+        # To work with it from snapshot, the single image_service is needed
+        recv_meta = image_service.create(context, sent_meta)
+
+        self.mox.StubOutWithMock(connection.LibvirtConnection, '_conn')
+        connection.LibvirtConnection._conn.lookupByName = self.fake_lookup
+        self.mox.StubOutWithMock(connection.utils, 'execute')
+        connection.utils.execute = self.fake_execute
+
+        self.mox.ReplayAll()
+
+        conn = connection.LibvirtConnection(False)
+        conn.snapshot(self.context, instance_ref, recv_meta['id'])
+
+        snapshot = image_service.show(context, recv_meta['id'])
+        self.assertEquals(snapshot['properties']['image_state'], 'available')
+        self.assertEquals(snapshot['status'], 'active')
+        self.assertEquals(snapshot['disk_format'], 'ami')
+        self.assertEquals(snapshot['name'], snapshot_name)
+
     def test_snapshot_in_raw_format(self):
         if not self.lazy_load_library_exists():
             return