diff --git a/tests/configure-gerrit.yml b/tests/configure-gerrit.yml
new file mode 100644
index 0000000..b45bd11
--- /dev/null
+++ b/tests/configure-gerrit.yml
@@ -0,0 +1,109 @@
+- name: Install the gerritforge repo
+  dnf:
+    name: 'https://gerritforge.com/gerritforge-repo-1-2.noarch.rpm'
+    state: present
+    disable_gpg_check: yes
+  become: true
+
+- name: Install gerrit and git review
+  package:
+    name:
+      - initscripts
+      - gerrit-3.3.2-1
+      - git-review
+    state: present
+  become: true
+
+- name: Initialize Gerrit
+  block:
+    - command: java -jar /var/gerrit/bin/gerrit.war init --batch --install-all-plugins -d /var/gerrit
+      become: true
+    - command: java -jar /var/gerrit/bin/gerrit.war reindex -d /var/gerrit
+      become: true
+    - command: git config -f /var/gerrit/etc/gerrit.config gerrit.canonicalWebUrl "http://localhost:8081"
+      become: true
+    - command: git config -f /var/gerrit/etc/gerrit.config httpd.listenUrl "http://*:8081"
+      become: true
+    - shell: /var/gerrit/bin/gerrit.sh run
+      become: true
+      async: 86400
+      poll: 0
+
+- name: Generate admin SSH key for Gerrit
+  command: ssh-keygen -f /tmp/admin -N ''
+  args:
+    creates: /tmp/admin.pub
+
+- name: Generate Zuul SSH key for Gerrit
+  command: ssh-keygen -f /tmp/zuul -N '' -t rsa -m PEM
+  args:
+    creates: /tmp/zuul.pub
+
+- name: Wait for Gerrit first login screen
+  uri:
+    url: http://localhost:8081/a/accounts/self/sshkeys
+    method: GET
+    user: admin
+    password: secret
+  register: first_login
+  until: first_login.status == 200
+  retries: 60
+  delay: 1
+  ignore_errors: true
+
+- name: Add admin SSH key to Gerrit
+  uri:
+    url: http://localhost:8081/a/accounts/self/sshkeys
+    method: POST
+    user: admin
+    password: secret
+    body: "{{ lookup('file', '/tmp/admin.pub') }}"
+    status_code: 201
+    headers:
+      Content-Type: text/plain
+
+- name: Create temp dir for Gerrit config update
+  shell: mktemp -d
+  register: gerrit_tmp
+
+- name: Check out All-Projects config
+  git:
+    repo: ssh://localhost:29418/All-Projects/
+    ssh_opts: "-o StrictHostKeyChecking=no -i /tmp/admin -l admin"
+    dest: "{{ gerrit_tmp.stdout }}/All-Projects"
+    refspec: '+refs/meta/config:refs/meta/config'
+    version: refs/meta/config
+
+- name: Copy new All-Projects config into place
+  copy:
+    src: "gerrit-project.config"
+    dest: "{{ gerrit_tmp.stdout }}/All-Projects/project.config"
+- name: Update All-Projects config in Gerrit
+  shell: |
+    git config user.email 'admin@example.com'
+    git commit -a -m 'update config'
+    git push http://admin:secret@localhost:8081/All-Projects +HEAD:refs/meta/config
+  args:
+    chdir: "{{ gerrit_tmp.stdout }}/All-Projects"
+    warn: false
+
+- name: Check if zuul user exists
+  uri:
+    url: http://localhost:8081/accounts/zuul
+    status_code: 200, 404
+  register: zuul_user_check
+- name: Create zuul Gerrit account
+  when: zuul_user_check.status==404
+  uri:
+    url: http://localhost:8081/a/accounts/zuul
+    method: PUT
+    user: admin
+    password: secret
+    status_code: 201
+    body_format: json
+    body:
+      name: Zuul
+      ssh_key: "{{ lookup('file', '/tmp/zuul.pub') }}"
+      http_password: secret
+      groups:
+        - "Service Users"
diff --git a/tests/create_gerrit_project.yml b/tests/create_gerrit_project.yml
new file mode 100644
index 0000000..90cd99a
--- /dev/null
+++ b/tests/create_gerrit_project.yml
@@ -0,0 +1,36 @@
+- name: Check if {{ project }} project exists
+  uri:
+    url: http://localhost:8081/projects/{{ project }}
+    status_code: 200, 404
+  register: project_check
+- name: Create {{ project }}
+  when: project_check.status==404
+  block:
+    - name: Create temp dir for {{ project }} creation
+      shell: mktemp -d
+      register: project_tmp
+    - name: Create {{ project }} project in Gerrit
+      uri:
+        url: http://localhost:8081/a/projects/{{ project }}
+        method: PUT
+        user: admin
+        password: secret
+        status_code: 201
+    - name: Create initial commit in {{ project }}
+      shell:
+        executable: /bin/sh
+        chdir: "{{ project_tmp.stdout }}"
+        cmd: |
+          git init .
+          git config user.name "Admin"
+          git config user.email "admin@example.com"
+          cat >.gitreview <<EOF
+          [gerrit]
+          host=localhost
+          port=29418
+          project={{ project }}
+          EOF
+          git add .gitreview
+          git commit -m "Initial commit"
+          git remote add gerrit http://admin:secret@localhost:8081/{{ project }}
+          git push -f --set-upstream gerrit +HEAD:master
diff --git a/tests/gerrit-project.config b/tests/gerrit-project.config
new file mode 100644
index 0000000..55514bd
--- /dev/null
+++ b/tests/gerrit-project.config
@@ -0,0 +1,84 @@
+[project]
+	description = Access inherited by all other projects.
+[receive]
+	requireContributorAgreement = false
+	requireSignedOffBy = false
+	requireChangeId = true
+	enableSignedPush = false
+[submit]
+	mergeContent = true
+[capability]
+	administrateServer = group Administrators
+	priority = batch group Service Users
+	streamEvents = group Service Users
+[access "refs/*"]
+	read = group Administrators
+	read = group Anonymous Users
+[access "refs/for/*"]
+	addPatchSet = group Registered Users
+	forgeAuthor = group Registered Users
+	forgeCommitter = group Registered Users
+[access "refs/for/refs/*"]
+	push = group Registered Users
+	pushMerge = group Registered Users
+[access "refs/heads/*"]
+	create = group Administrators
+	create = group Project Owners
+	forgeAuthor = group Registered Users
+	forgeCommitter = group Administrators
+	forgeCommitter = group Project Owners
+	forgeCommitter = group Registered Users
+	push = +force group Administrators
+	push = group Project Owners
+	label-Code-Review = -2..+2 group Registered Users
+	label-Verified = -2..+2 group Administrators
+	label-Verified = -2..+2 group Service Users
+	label-Workflow = -1..+1 group Registered Users
+	submit = group Administrators
+	submit = group Project Owners
+	submit = group Service Users
+	editTopicName = +force group Administrators
+	editTopicName = +force group Project Owners
+[access "refs/meta/config"]
+	exclusiveGroupPermissions = read
+	read = group Administrators
+	read = group Project Owners
+	create = group Administrators
+	create = group Project Owners
+	push = group Administrators
+	push = group Project Owners
+	label-Code-Review = -2..+2 group Administrators
+	label-Code-Review = -2..+2 group Project Owners
+	submit = group Administrators
+	submit = group Project Owners
+[access "refs/tags/*"]
+	create = group Administrators
+	create = group Project Owners
+	createTag = group Administrators
+	createTag = group Project Owners
+	createSignedTag = group Administrators
+	createSignedTag = group Project Owners
+[label "Code-Review"]
+	function = MaxWithBlock
+	defaultValue = 0
+	copyMinScore = true
+	copyAllScoresOnTrivialRebase = true
+	value = -2 This shall not be merged
+	value = -1 I would prefer this is not merged as is
+	value =  0 No score
+	value = +1 Looks good to me, but someone else must approve
+	value = +2 Looks good to me, approved
+[label "Verified"]
+	function = MaxWithBlock
+	value = -2 Fails
+	value = -1 Does not seem to work
+	value =  0 No score
+	value = +1 Works for me
+	value = +2 Verified
+	defaultValue = 0
+[label "Workflow"]
+	function = MaxWithBlock
+	value = -1 Work in progress
+	value =  0 Ready for reviews
+	value = +1 Approved
+	defaultValue = 0
diff --git a/tests/main.yaml b/tests/main.yaml
index d6aca6e..cae0ce2 100644
--- a/tests/main.yaml
+++ b/tests/main.yaml
@@ -4,3 +4,6 @@
       local_git:
         config-projects:
           - zuul-config
+      gerrit:
+         untrusted-projects:
+          - test
diff --git a/tests/setup_zuul_core.yml b/tests/setup_zuul_core.yml
index 283da66..a6092a1 100644
--- a/tests/setup_zuul_core.yml
+++ b/tests/setup_zuul_core.yml
@@ -23,6 +23,22 @@
       dburi=postgresql://postgres:mypassword@127.0.0.1:5432/zuul
   become: true
 
+- name: Define the gerrit connection
+  blockinfile:
+    path: /etc/zuul/zuul.conf
+    marker: "# {mark} gerrit"
+    block: |
+    [connection "gerrit"]
+      name=gerrit
+      driver=gerrit
+      server=gerrit
+      sshkey=/tmp/zuul
+      user=zuul
+      password=secret
+      baseurl=http://localhost:8081
+      auth_type=basic
+  become: true
+
 - name: Setup Ansible virtual environment for the Zuul executor
   shell: zuul-manage-ansible -u -r /var/lib/zuul/ansible-bin
   become_user: zuul
diff --git a/tests/tests.yml b/tests/tests.yml
index aeb9225..dce7fcc 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -9,6 +9,9 @@
     - import_tasks: install_zuul_and_client.yml
       tags:
         - install_zuul_and_client
+    - import_tasks: configure_gerrit.yml
+      tags:
+        - configure_gerrit
     - import_tasks: setup_zuul_core.yml
       tags:
         - setup_zuul_core