diff --git a/.zuul.yaml b/.zuul.yaml
index 36c3893..7b886da 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -82,8 +82,8 @@
         TEMPEST_PLUGINS: /opt/stack/neutron-tempest-plugin
         NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_tempest) | join(',') }}"
       devstack_plugins:
-        neutron: git://git.openstack.org/openstack/neutron.git
-        neutron-tempest-plugin: git://git.openstack.org/openstack/neutron-tempest-plugin.git
+        neutron: https://git.openstack.org/openstack/neutron.git
+        neutron-tempest-plugin: https://git.openstack.org/openstack/neutron-tempest-plugin.git
       devstack_services:
         tls-proxy: false
         tempest: true
@@ -418,8 +418,8 @@
         ADVANCED_INSTANCE_USER: ubuntu
         BUILD_TIMEOUT: 784
       devstack_plugins:
-        neutron: git://git.openstack.org/openstack/neutron.git
-        neutron-tempest-plugin: git://git.openstack.org/openstack/neutron-tempest-plugin.git
+        neutron: https://git.openstack.org/openstack/neutron.git
+        neutron-tempest-plugin: https://git.openstack.org/openstack/neutron-tempest-plugin.git
       devstack_services:
         tls-proxy: false
         tempest: true
@@ -552,7 +552,7 @@
         # empty
         ADVANCED_IMAGE_NAME: ""
       devstack_plugins:
-        designate: git://git.openstack.org/openstack/designate.git
+        designate: https://git.openstack.org/openstack/designate.git
       devstack_services:
         cinder: false
         designate: true
diff --git a/devstack/customize_image.sh b/devstack/customize_image.sh
index 669c761..77ff699 100644
--- a/devstack/customize_image.sh
+++ b/devstack/customize_image.sh
@@ -9,7 +9,7 @@
 
 # By default enable guest image customization. It will be automatically skipped
 # for cirros images
-CUSTOMIZE_IMAGE=${CUSTOMIZE_IMAGE:-True}
+CUSTOMIZE_IMAGE=${CUSTOMIZE_IMAGE:-False}
 
 # Image customization is performed using virt-customize
 # using direct backend by default
diff --git a/neutron_tempest_plugin/api/admin/test_ports.py b/neutron_tempest_plugin/api/admin/test_ports.py
index 63fb611..bdb66ef 100644
--- a/neutron_tempest_plugin/api/admin/test_ports.py
+++ b/neutron_tempest_plugin/api/admin/test_ports.py
@@ -20,6 +20,7 @@
 from tempest.common import utils
 from tempest.lib.common.utils import data_utils
 from tempest.lib import decorators
+from tempest.lib import exceptions as tlib_exceptions
 
 from neutron_tempest_plugin.api import base
 from neutron_tempest_plugin import config
@@ -150,6 +151,14 @@
         port = self.admin_client.show_port(port_id)['port']
         self.assertIsNone(port['resource_request'])
 
+    @decorators.idempotent_id('7261391f-64cc-45a6-a1e3-435694c54bf5')
+    def test_port_resource_request_no_provider_net_conflict(self):
+        conflict = self.assertRaises(
+            tlib_exceptions.Conflict,
+            self._create_qos_policy_and_port,
+            network=self.network, vnic_type=self.vnic_type)
+        self.assertEqual('QosRuleNotSupported', conflict.resp_body['type'])
+
     @decorators.idempotent_id('0eeb6ffa-9a7a-40b5-83dd-dbdcd67e2e64')
     def test_port_resource_request_empty(self):
         qos_policy = self.create_qos_policy(
diff --git a/neutron_tempest_plugin/scenario/test_floatingip.py b/neutron_tempest_plugin/scenario/test_floatingip.py
index be57475..15a2837 100644
--- a/neutron_tempest_plugin/scenario/test_floatingip.py
+++ b/neutron_tempest_plugin/scenario/test_floatingip.py
@@ -212,6 +212,7 @@
     def resource_setup(cls):
         super(FloatingIPPortDetailsTest, cls).resource_setup()
 
+    @common_utils.unstable_test("bug 1815585")
     @decorators.idempotent_id('a663aeee-dd81-492b-a207-354fd6284dbe')
     def test_floatingip_port_details(self):
         """Tests the following:
diff --git a/neutron_tempest_plugin/scenario/test_migration.py b/neutron_tempest_plugin/scenario/test_migration.py
index 3d6c1dd..f4b918c 100644
--- a/neutron_tempest_plugin/scenario/test_migration.py
+++ b/neutron_tempest_plugin/scenario/test_migration.py
@@ -173,13 +173,11 @@
 
 class NetworkMigrationFromHA(NetworkMigrationTestBase):
 
-    @common_utils.unstable_test("bug 1789434")
     @decorators.idempotent_id('b4e68ac0-3b76-4306-ae8a-51cf4d363b22')
     def test_from_ha_to_legacy(self):
         self._test_migration(before_dvr=False, before_ha=True,
                              after_dvr=False, after_ha=False)
 
-    @common_utils.unstable_test("bug 1789434")
     @decorators.idempotent_id('42260eea-5d56-4d30-b62a-a62694dfe4d5')
     @testtools.skipUnless(
         CONF.neutron_plugin_options.l3_agent_mode == 'dvr_snat',
@@ -188,7 +186,6 @@
         self._test_migration(before_dvr=False, before_ha=True,
                              after_dvr=True, after_ha=False)
 
-    @common_utils.unstable_test("bug 1789434")
     @decorators.idempotent_id('e4149576-248b-43fa-9d0b-a5c2f51967ce')
     @testtools.skipUnless(
         CONF.neutron_plugin_options.l3_agent_mode == 'dvr_snat',