diff --git a/jenkins/jobs/infra.yaml b/jenkins/jobs/infra.yaml
index a19ca886a1..b41b2ad134 100644
--- a/jenkins/jobs/infra.yaml
+++ b/jenkins/jobs/infra.yaml
@@ -10,6 +10,20 @@
     publishers:
       - zuul-swift-upload-console-log
 
+- job:
+    name: project-config-gerrit
+    node: 'bare-precise || bare-trusty'
+
+    builders:
+      - revoke-sudo
+      - gerrit-git-prep
+      - tox:
+          envlist: 'gerrit'
+
+    publishers:
+      - console-log
+      - zuul-swift-upload-console-log
+
 - job:
     name: gate-project-config-irc-access
     node: 'bare-precise || bare-trusty'
diff --git a/tools/check_valid_gerrit_config.sh b/tools/check_valid_gerrit_config.sh
new file mode 100755
index 0000000000..5b2b24ee4d
--- /dev/null
+++ b/tools/check_valid_gerrit_config.sh
@@ -0,0 +1,38 @@
+#!/bin/bash -e
+
+# It checks that *.config files respect certain gerrit ACL rules
+
+export TMPDIR=`/bin/mktemp -d`
+trap "rm -rf $TMPDIR" EXIT
+
+pushd $TMPDIR
+CONFIGS_LIST_BASE=$OLDPWD/$1
+
+function check_team_acl {
+    local configs_dir="$1"
+    local configs_list=$(find $configs_dir -name "*.config")
+    local failure=0
+
+    for config in $configs_list; do
+        echo "Checking $config file..."
+
+        if ! grep -q '\>-core\|\>-admins' $config;
+        then
+            echo "$config does not have a core/admins team defined!" >>config_failures
+        fi
+    done
+}
+
+# Add more namespaces here, if necessary
+for namespace in stackforge openstack-dev; do
+    check_team_acl "${CONFIGS_LIST_BASE}${namespace}"
+done
+
+if [ -f config_failures ]; then
+    echo -e; cat config_failures
+    exit 1
+fi
+
+echo "Gerrit ACL configs are valid!"
+
+popd
diff --git a/tox.ini b/tox.ini
index acd1746629..5391851f3d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = pep8,projects,jjb,jenkins-project,zuul
+envlist = pep8,gerrit,projects,jjb,jenkins-project,zuul
 skipsdist = True
 
 [testenv]
@@ -9,6 +9,10 @@ deps = -r{toxinidir}/test-requirements.txt
 [testenv:pep8]
 commands = flake8
 
+[testenv:gerrit]
+commands =
+  {toxinidir}/tools/check_valid_gerrit_config.sh gerrit/acls/
+
 [testenv:projects]
 deps = PyYAML
 commands =
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index b4bcb66d1e..9111ee31b2 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -628,6 +628,10 @@ jobs:
     success-message: XML output is unchanged.
   - name: project-config-compare-xml
     voting: false
+  # TODO(armax): This job is not evaluating all ACL files yet. Make
+  # it voting once we evaluate all files and the test passes cleanly.
+  - name: project-config-gerrit
+    voting: false
     failure-message: Jenkins XML output has changed.
     success-message: Jenkins XML output is unchanged.
   - name: gate-git-review-python34
@@ -3309,6 +3313,7 @@ projects:
       - name: infra-puppet-apply-jobs
     check:
       - project-config-compare-xml
+      - project-config-gerrit
       - gate-project-config-layout
       - gate-project-config-pep8
       - gate-project-config-bashate