diff --git a/playbooks/zuul/upgrade-review.yaml b/playbooks/zuul/upgrade-review.yaml
new file mode 100644
index 0000000000..888c2ab34a
--- /dev/null
+++ b/playbooks/zuul/upgrade-review.yaml
@@ -0,0 +1,22 @@
+- name: Ensure initial gerrit state
+  import_playbook: ../service-review.yaml
+  vars:
+    gerrit_container_image: docker.io/opendevorg/gerrit:3.2
+
+- hosts: "review:!disabled"
+  name: "Prepare Gerrit for Upgrade"
+  tasks:
+    - name: Pause for a few seconds to give gerrit time to start
+      wait_for:
+        timeout: 30
+
+    - name: Stop gerrit before we upgrade
+      shell:
+        cmd: docker-compose down
+        chdir: /etc/gerrit-compose/
+
+- name: Perform gerrit upgrade
+  import_playbook: ../service-review.yaml
+  vars:
+    gerrit_container_image: docker.io/opendevorg/gerrit:3.3
+    gerrit_run_init: true
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 3973266b71..bbc92531b1 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -71,6 +71,13 @@
               - name: opendev-buildset-registry
               - name: system-config-build-image-gerrit-3.3
                 soft: true
+        - system-config-upgrade-review:
+            dependencies:
+              - name: opendev-buildset-registry
+              - name: system-config-build-image-gerrit-3.2
+                soft: true
+              - name: system-config-build-image-gerrit-3.3
+                soft: true
         - system-config-build-image-refstack
         - system-config-run-refstack:
             dependencies:
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index 30adf4bd8e..ebffe9e366 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -901,6 +901,20 @@
     vars:
       zuul_test_gerrit_version: '3.3'
 
+- job:
+    name: system-config-upgrade-review
+    parent: system-config-run-review-base
+    description: |
+      Test we can upgrade a gerrit 3.2 to 3.3
+    requires:
+      - gerrit-3.2-container-image
+      - gerrit-3.3-container-image
+    vars:
+      run_playbooks:
+        - playbooks/letsencrypt.yaml
+        - playbooks/zuul/upgrade-review.yaml
+      zuul_test_gerrit_version: '3.2'
+
 - job:
     name: system-config-run-static
     parent: system-config-run