diff --git a/fixtures/base.py b/fixtures/base.py
index 076fa3c..839080d 100644
--- a/fixtures/base.py
+++ b/fixtures/base.py
@@ -53,6 +53,7 @@
     flavor_ram = config.get('flavor_ram', 1536)
     flavor_vcpus = config.get('flavor_vcpus', 1)
     flavor_disk = config.get('flavor_disk', 3)
+    add_hw_vif_multiqueue_enabled_to_image = config.get('add_hw_vif_multiqueue_enabled_to_image', "true")
 
     os_images_list = [image.id for image in
                       openstack_clients.image.images.list(
@@ -61,6 +62,12 @@
     if os_images_list.__len__() == 0:
         pytest.skip("No images with name {}. This name can be redefined "
                     "with 'image_name' env var ".format(image_name))
+
+    if add_hw_vif_multiqueue_enabled_to_image.lower() == "true":
+        logger.info("Adding hw_vif_multiqueue_enabled=true property to image...")
+        openstack_clients.image.images.update(os_images_list[0],
+            hw_vif_multiqueue_enabled = "true")
+
     os_resource['image_id'] = str(os_images_list[0])
     flavor_id = os_actions.get_flavor_id_by_name(flavor_name)
     if flavor_id is None:
@@ -156,6 +163,7 @@
     flavor_ram = config.get('flavor_ram', 1536)
     flavor_vcpus = config.get('flavor_vcpus', 1)
     flavor_disk = config.get('flavor_disk', 3)
+    add_hw_vif_multiqueue_enabled_to_image = config.get('add_hw_vif_multiqueue_enabled_to_image', "true")
     os_images_list = [image.id for image in
                       openstack_alt_clients.image.images.list(
                           filters={'name': image_name})]
@@ -163,6 +171,10 @@
     if os_images_list.__len__() == 0:
         pytest.skip("No images with name {}. This name can be redefined "
                     "with 'image_name' env var ".format(image_name))
+    if add_hw_vif_multiqueue_enabled_to_image.lower() == "true":
+        logger.info("Adding hw_vif_multiqueue_enabled=true property to image...")
+        openstack_alt_clients.image.images.update(os_images_list[0],
+            hw_vif_multiqueue_enabled = "true")
     os_resource_alt_project['image_id'] = str(os_images_list[0])
 
     flavor_id = alt_os_actions.get_flavor_id_by_name(flavor_name)
