diff --git a/HACKING.rst b/HACKING.rst
index 22c29bfa..55dd8b83 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -1,4 +1,4 @@
 python-zunclient Style Commandments
-===============================================
+===================================
 
 Read the OpenStack Style Commandments https://docs.openstack.org/hacking/latest/
diff --git a/README.rst b/README.rst
index 5f1567f3..8cb19412 100644
--- a/README.rst
+++ b/README.rst
@@ -33,5 +33,5 @@ and a command-line tool (zun).
 .. _Launchpad project: https://launchpad.net/python-zunclient
 .. _Blueprints: https://blueprints.launchpad.net/python-zunclient
 .. _Bugs: https://bugs.launchpad.net/python-zunclient
-.. _Source: https://git.openstack.org/cgit/openstack/python-zunclient
+.. _Source: https://opendev.org/openstack/python-zunclient
 .. _How to Contribute: https://docs.openstack.org/infra/manual/developers.html
diff --git a/tox.ini b/tox.ini
index 957c6bec..c3a5cc1b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -47,7 +47,7 @@ commands = oslo_debug_helper -t zunclient/tests {posargs}
 [testenv:docs]
 basepython = python3
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+  -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/doc/requirements.txt
 commands =
@@ -63,7 +63,7 @@ commands =
 [testenv:releasenotes]
 basepython = python3
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+  -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/doc/requirements.txt
 commands =
diff --git a/zunclient/tests/functional/hooks/gate_hook.sh b/zunclient/tests/functional/hooks/gate_hook.sh
index 119e6c43..0f4b0d20 100755
--- a/zunclient/tests/functional/hooks/gate_hook.sh
+++ b/zunclient/tests/functional/hooks/gate_hook.sh
@@ -21,8 +21,8 @@
 driver=$1
 db=$2
 
-export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin kuryr-libnetwork https://git.openstack.org/openstack/kuryr-libnetwork"
-export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-container https://git.openstack.org/openstack/devstack-plugin-container"
+export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin kuryr-libnetwork https://opendev.org/openstack/kuryr-libnetwork"
+export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-container https://opendev.org/openstack/devstack-plugin-container"
 export DEVSTACK_LOCAL_CONFIG+=$'\n'"ZUN_USE_UWSGI=True"
 export DEVSTACK_LOCAL_CONFIG+=$'\n'"KURYR_CONFIG_DIR=/etc/kuryr-libnetwork"
 export DEVSTACK_GATE_TEMPEST=0