diff --git a/.zuul.yaml b/.zuul.yaml
index 4af2e62..1b3cb87 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,9 +5,9 @@
     check:
       jobs:
         - barbican-tempest-plugin-simple-crypto
+        - barbican-tempest-plugin-simple-crypto-victoria
         - barbican-tempest-plugin-simple-crypto-ussuri
         - barbican-tempest-plugin-simple-crypto-train
-        - barbican-tempest-plugin-simple-crypto-stein
         - barbican-tempest-plugin-simple-crypto-ipv6-only
         - barbican-tempest-plugin-simple-crypto-castellan-src
         - barbican-tempest-plugin-simple-crypto-cursive
@@ -27,7 +27,6 @@
       devstack_plugins:
         barbican: https://opendev.org/openstack/barbican
       devstack_localrc:
-        USE_PYTHON3: true
         NOVA_BACKEND: LVM
         LVM_VOLUME_CLEAR: none
       devstack_local_conf:
@@ -54,21 +53,24 @@
         - barbican-tempest-plugin
 
 - job:
+    name: barbican-tempest-plugin-simple-crypto-victoria
+    parent: barbican-tempest-plugin-simple-crypto
+    nodeset: openstack-single-node-bionic
+    override-checkout: stable/victoria
+
+- job:
     name: barbican-tempest-plugin-simple-crypto-ussuri
     parent: barbican-tempest-plugin-simple-crypto
+    nodeset: openstack-single-node-bionic
     override-checkout: stable/ussuri
 
 - job:
     name: barbican-tempest-plugin-simple-crypto-train
     parent: barbican-tempest-plugin-simple-crypto
+    nodeset: openstack-single-node-bionic
     override-checkout: stable/train
 
 - job:
-    name: barbican-tempest-plugin-simple-crypto-stein
-    parent: barbican-tempest-plugin-simple-crypto
-    override-checkout: stable/stein
-
-- job:
     name: barbican-tempest-plugin-simple-crypto-ipv6-only
     parent: devstack-tempest-ipv6
     required-projects: *barbican-tempest-reqs
diff --git a/README.rst b/README.rst
index 929d44f..6ee45c6 100644
--- a/README.rst
+++ b/README.rst
@@ -22,4 +22,4 @@
 
 Bugs
 ----
-Please report bugs to: http://bugs.launchpad.net/barbican
+Please report bugs to: https://storyboard.openstack.org/#!/project/openstack/barbican-tempest-plugin
diff --git a/barbican_tempest_plugin/tests/scenario/manager.py b/barbican_tempest_plugin/tests/scenario/manager.py
index 615e08b..8daf090 100644
--- a/barbican_tempest_plugin/tests/scenario/manager.py
+++ b/barbican_tempest_plugin/tests/scenario/manager.py
@@ -290,6 +290,27 @@
                 self.image_client.update_image(image['id'], data=image_file)
             else:
                 self.image_client.store_image_file(image['id'], image_file)
+
+        if CONF.image_feature_enabled.import_image:
+            available_stores = []
+            try:
+                available_stores = self.image_client.info_stores()['stores']
+            except exceptions.NotFound:
+                pass
+            available_import_methods = self.image_client.info_import()[
+                'import-methods']['value']
+            if ('copy-image' in available_import_methods and
+                    len(available_stores) > 1):
+                self.image_client.image_import(image['id'],
+                                               method='copy-image',
+                                               all_stores=True,
+                                               all_stores_must_succeed=False)
+                failed_stores = waiters.wait_for_image_copied_to_stores(
+                    self.image_client, image['id'])
+                self.assertEqual(0, len(failed_stores),
+                                 "Failed to copy the following stores: %s" %
+                                 str(failed_stores))
+
         return image['id']
 
     def rebuild_server(self, server_id, image=None,
