diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml
index d006973e64..05d19729b5 100644
--- a/inventory/base/hosts.yaml
+++ b/inventory/base/hosts.yaml
@@ -648,6 +648,14 @@ all:
         region_name: DFW
       public_v4: 23.253.109.153
       public_v6: 2001:4800:7819:104:be76:4eff:fe04:8e55
+    # Temporary host for testing gerrit upgrade
+    review-test.opendev.org:
+      ansible_host: 104.130.159.4
+      location:
+        cloud: openstackci-rax
+        region_name: DFW
+      public_v4: 104.130.159.4
+      public_v6: 2001:4800:7818:102:be76:4eff:fe04:3a2e
     review01.openstack.org:
       ansible_host: 104.130.246.32
       location:
diff --git a/inventory/service/groups.yaml b/inventory/service/groups.yaml
index bfa81ff57c..59e5d58233 100644
--- a/inventory/service/groups.yaml
+++ b/inventory/service/groups.yaml
@@ -197,6 +197,7 @@ groups:
     - review-dev[0-9]*.open*.org
   review:
     - review[0-9]*.open*.org
+    - review-test.opendev.org
   static:
     - static[0-9]*.opendev.org
   status:
diff --git a/inventory/service/host_vars/review-test.openstack.org.yaml b/inventory/service/host_vars/review-test.openstack.org.yaml
new file mode 100644
index 0000000000..3ad618cb23
--- /dev/null
+++ b/inventory/service/host_vars/review-test.openstack.org.yaml
@@ -0,0 +1,17 @@
+gerrit_replication:
+  - name: 'local'
+    url: 'file:///opt/lib/git/'
+    replicationDelay: '1'
+    threads: '4'
+    mirror: true
+gerrit_storyboard_url: https://storyboard.openstack.org
+gerrit_vhost_name: review-test.opendev.org
+gerrit_heap_limit: 48g
+letsencrypt_certs:
+  review-test-opendev-org-main:
+    - review-test.opendev.org
+# We have to set the letsencrypt_gid to something that isn't 3000
+# to not conflict with gerrit2's gid.
+# Also, on review01.openstack.org, 3001 is openstackwatch and
+# 3002 is github.
+letsencrypt_gid: 3003
diff --git a/playbooks/roles/gerrit/tasks/main.yaml b/playbooks/roles/gerrit/tasks/main.yaml
index 875d6b7674..6e62ff6b14 100644
--- a/playbooks/roles/gerrit/tasks/main.yaml
+++ b/playbooks/roles/gerrit/tasks/main.yaml
@@ -243,6 +243,7 @@
     state: present
     key: '{{ gerrit_self_hostkey }}'
     name: '[{{ gerrit_vhost_name }}]:29418'
+  when: gerrit_self_hostkey is defined
 
 - name: Install apache2
   apt: