diff --git a/inventory/service/groups.yaml b/inventory/service/groups.yaml
index 1005e404d6..d59219e3e0 100644
--- a/inventory/service/groups.yaml
+++ b/inventory/service/groups.yaml
@@ -94,6 +94,7 @@ groups:
     - nb[0-9]*.opendev.org
     - review-dev[0-9]*.open*.org
     - review[0-9]*.open*.org
+    - review-test.opendev.org
     - static[0-9]*.opendev.org
     - zuul[0-9]*.open*.org
   logstash:
diff --git a/inventory/service/host_vars/review-test.openstack.org.yaml b/inventory/service/host_vars/review-test.opendev.org.yaml
similarity index 100%
rename from inventory/service/host_vars/review-test.openstack.org.yaml
rename to inventory/service/host_vars/review-test.opendev.org.yaml
diff --git a/playbooks/roles/gerrit/tasks/main.yaml b/playbooks/roles/gerrit/tasks/main.yaml
index 2b911a5f01..98160bc68d 100644
--- a/playbooks/roles/gerrit/tasks/main.yaml
+++ b/playbooks/roles/gerrit/tasks/main.yaml
@@ -245,11 +245,12 @@
     name: '[{{ gerrit_vhost_name }}]:29418'
   when: gerrit_self_hostkey is defined
 
-- name: Install apache2
+- name: Install apache2 and mysql client tools
   apt:
     name:
       - apache2
       - apache2-utils
+      - mysql-client-core-5.7
     state: present
 
 - name: Apache modules
diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
index 2de2d6302c..43c594ffb4 100644
--- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
+++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
@@ -144,6 +144,11 @@
 - name: letsencrypt updated review01-opendev-org-main
   include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
 
+# review-test
+
+- name: letsencrypt updated review-test-opendev-org-main
+  include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
+
 # Mirrors
 
 - name: letsencrypt updated mirror01-dfw-rax-main
diff --git a/playbooks/sync-to-review-test.yaml b/playbooks/sync-to-review-test.yaml
index a3fc5b5d4f..51282eba56 100644
--- a/playbooks/sync-to-review-test.yaml
+++ b/playbooks/sync-to-review-test.yaml
@@ -11,22 +11,20 @@
 
     - name: Copy the mysqldump
       shell:
-        cmd: scp mysql_backups/gerrit.sql.gz.1 review-test.opendev.org:/home/gerrit2/gerrit.sql.gz
+        cmd: scp mysql_backups/gerrit.sql.gz.1 gerrit2@review-test.opendev.org:/home/gerrit2/gerrit.sql.gz
         chdir: /home/gerrit2
-      become: gerrit2
 
     - name: Sync the git repos
       shell:
-        cmd: rsync -avz --delete index cache git review-test.opendev.org:/home/gerrit2/review_site
+        cmd: rsync -avz --delete index cache git gerrit2@review-test.opendev.org:/home/gerrit2/review_site
         chdir: /home/gerrit2/review_site
-      become: gerrit2
 
 - hosts: review-test.opendev.org
   tasks:
 
     - name: Apply mysql dump
       shell:
-        cmd: zcat /home/gerrit2/gerrit.sql.gz | mysql
+        cmd: zcat /home/gerrit2/gerrit.sql.gz | mysql --defaults-file=/root/.gerrit_db.cnf
 
     - name: Start gerrit
       shell: