diff --git a/functions b/functions
index fcb79a9..656f906 100644
--- a/functions
+++ b/functions
@@ -10,9 +10,9 @@ install_gems() {
   # use puppet-nova to test the gem
   if [ -e /usr/zuul-env/bin/zuul-cloner ] ; then
       /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
-          https://git.openstack.org openstack/puppet-nova
+          https://opendev.org openstack/puppet-nova
   else
-      git clone https://git.openstack.org/openstack/puppet-nova openstack/puppet-nova
+      git clone https://opendev.org/openstack/puppet-nova openstack/puppet-nova
   fi
   cd openstack/puppet-nova
 
diff --git a/lib/puppet-openstack_spec_helper/beaker_spec_helper.rb b/lib/puppet-openstack_spec_helper/beaker_spec_helper.rb
index 9c500df..431ed29 100644
--- a/lib/puppet-openstack_spec_helper/beaker_spec_helper.rb
+++ b/lib/puppet-openstack_spec_helper/beaker_spec_helper.rb
@@ -43,10 +43,10 @@ RSpec.configure do |c|
         zuul_clone_cmd = '/usr/zuul-env/bin/zuul-cloner '
         zuul_clone_cmd += '--cache-dir /opt/git '
         zuul_clone_cmd += "--zuul-branch #{zuul_branch} "
-        zuul_clone_cmd += "https://git.openstack.org #{repo}"
+        zuul_clone_cmd += "https://opendev.org #{repo}"
         on host, zuul_clone_cmd
       else
-        on host, "git clone https://git.openstack.org/#{repo} #{repo}"
+        on host, "git clone https://opendev.org/#{repo} #{repo}"
       end
 
       on host, "ZUUL_BRANCH=#{zuul_branch} PUPPET_MAJ_VERSION=#{puppet_maj_version} bash #{repo}/install_modules.sh"
diff --git a/lib/puppet-openstack_spec_helper/rake_tasks.rb b/lib/puppet-openstack_spec_helper/rake_tasks.rb
index 159dced..4c44605 100644
--- a/lib/puppet-openstack_spec_helper/rake_tasks.rb
+++ b/lib/puppet-openstack_spec_helper/rake_tasks.rb
@@ -54,10 +54,10 @@ task :spec_prep do
       zuul_clone_cmd = ['/usr/zuul-env/bin/zuul-cloner']
       zuul_clone_cmd += ['--cache-dir', '/opt/git']
       zuul_clone_cmd += ['--zuul-branch', "#{zuul_branch}"]
-      zuul_clone_cmd += ['https://git.openstack.org', "#{repo}"]
+      zuul_clone_cmd += ['https://opendev.org', "#{repo}"]
       sh(*zuul_clone_cmd)
     else
-      sh("git clone https://git.openstack.org/#{repo} #{repo}")
+      sh("git clone https://opendev.org/#{repo} #{repo}")
     end
     # Allow to a repository to have extra modules that are not
     # in puppet-openstack-integration
diff --git a/tox.ini b/tox.ini
index e3eeb86..0aea3cf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@ skipsdist = True
 envlist = releasenotes
 
 [testenv]
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
+install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} {opts} {packages}
 
 [testenv:releasenotes]
 basepython = python3