diff --git a/.zuul.yaml b/.zuul.yaml
index 81fe9a18f4772a6e5488dfd031b0197dfc95d4b1..a9c3823d22dfbfadfe14cb8032b750d0d0401d73 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,6 +2,6 @@
     templates:
       - check-requirements
       - lib-forward-testing-python3
-      - openstack-python3-xena-jobs
+      - openstack-python3-yoga-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
diff --git a/oslo_vmware/tests/test_service.py b/oslo_vmware/tests/test_service.py
index b03c3ffd64fc9b856d78b51864b7d1a57d19e6b2..29f72865f88da2f447dec539a38f477a5c68fdd8 100644
--- a/oslo_vmware/tests/test_service.py
+++ b/oslo_vmware/tests/test_service.py
@@ -493,8 +493,7 @@ class RequestsTransportTest(base.TestCase):
         transport = service.RequestsTransport()
 
         url = 'file:///foo'
-        request = requests.PreparedRequest()
-        request.url = url
+        request = requests.Request('GET', url).prepare()
 
         data = b"Hello World"
         get_size_mock.return_value = len(data)
@@ -502,7 +501,6 @@ class RequestsTransportTest(base.TestCase):
         def read_mock():
             return data
 
-        builtin_open = 'builtins.open'
         open_mock = mock.MagicMock(name='file_handle',
                                    spec=open)
         file_spec = list(set(dir(io.TextIOWrapper)).union(
@@ -514,7 +512,7 @@ class RequestsTransportTest(base.TestCase):
         file_handle.read.side_effect = read_mock
         open_mock.return_value = file_handle
 
-        with mock.patch(builtin_open, open_mock, create=True):
+        with mock.patch('builtins.open', open_mock, create=True):
             resp = transport.session.send(request)
             self.assertEqual(data, resp.content)
 
diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst
index 492b5f32391287f9e52260cbeca6cae52782c945..7200d329647c2d590c43fb89dd661f48fb5941f0 100644
--- a/releasenotes/source/index.rst
+++ b/releasenotes/source/index.rst
@@ -6,6 +6,7 @@
     :maxdepth: 1
 
     unreleased
+    xena
     wallaby
     victoria
     ussuri
diff --git a/releasenotes/source/xena.rst b/releasenotes/source/xena.rst
new file mode 100644
index 0000000000000000000000000000000000000000..1be85be3ebf18741d311aa41096d417a99c970bf
--- /dev/null
+++ b/releasenotes/source/xena.rst
@@ -0,0 +1,6 @@
+=========================
+Xena Series Release Notes
+=========================
+
+.. release-notes::
+   :branch: stable/xena
diff --git a/requirements.txt b/requirements.txt
index b4ef5f4b5f26474ee1ab848d2c0664e049ed2b13..924e1d684aa1e3c4619ddd9c15d7e13e33c8acd1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,7 +14,7 @@ oslo.utils>=3.33.0 # Apache-2.0
 PyYAML>=3.13 # MIT
 
 lxml>=4.5.0 # BSD
-suds-jurko>=0.6 # LGPLv3+
+suds-community>=0.6 # LGPLv3+
 eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
 requests>=2.14.2 # Apache-2.0
 urllib3>=1.21.1 # MIT