diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md
index 235a3b4b3..da48f1b05 100644
--- a/recipes/README.recipes.md
+++ b/recipes/README.recipes.md
@@ -976,7 +976,7 @@ PYTHON_VERSION_COMPATIBILITY: PY2
 
 PYTHON_VERSION_COMPATIBILITY: PY2+3
 
-— **def [RunSteps](/recipes/recipe_modules/gclient/examples/full.py#66)(api):**
+— **def [RunSteps](/recipes/recipe_modules/gclient/examples/full.py#67)(api):**
 ### *recipes* / [gclient:tests/diff\_deps](/recipes/recipe_modules/gclient/tests/diff_deps.py)
 
 [DEPS](/recipes/recipe_modules/gclient/tests/diff_deps.py#9): [gclient](#recipe_modules-gclient), [recipe\_engine/assertions][recipe_engine/recipe_modules/assertions], [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io]
diff --git a/recipes/recipe_modules/gclient/config.py b/recipes/recipe_modules/gclient/config.py
index c09c06cba..19d092cc9 100644
--- a/recipes/recipe_modules/gclient/config.py
+++ b/recipes/recipe_modules/gclient/config.py
@@ -456,27 +456,34 @@ def tint(c):
   c.got_revision_mapping['tint'] = 'got_revision'
 
 @config_ctx()
+def gerrit(c):
+  s = c.solutions.add()
+  s.name = 'gerrit'
+  s.url = 'https://gerrit.googlesource.com/gerrit.git'
+  c.revisions['gerrit'] = 'refs/heads/master'
+
+@config_ctx(includes=['gerrit'])
 def gerrit_plugins_binary_size(c):
   s = c.solutions.add()
   s.name = 'gerrit_plugins_binary_size'
   s.url = ChromiumGitURL(c, 'infra', 'gerrit-plugins', 'binary-size.git')
   c.got_revision_mapping['gerrit_plugins_binary_size'] = 'got_revision'
 
-@config_ctx()
+@config_ctx(includes=['gerrit'])
 def gerrit_plugins_buildbucket(c):
   s = c.solutions.add()
   s.name = 'gerrit_plugins_buildbucket'
   s.url = ChromiumGitURL(c, 'infra', 'gerrit-plugins', 'buildbucket.git')
   c.got_revision_mapping['gerrit_plugins_buildbucket'] = 'got_revision'
 
-@config_ctx()
+@config_ctx(includes=['gerrit'])
 def gerrit_plugins_chromium_behavior(c):
   s = c.solutions.add()
   s.name = 'gerrit_plugins_chromium_behavior'
   s.url = ChromiumGitURL(c, 'infra', 'gerrit-plugins', 'chromium-behavior.git')
   c.got_revision_mapping['gerrit_plugins_chromium_behavior'] = 'got_revision'
 
-@config_ctx()
+@config_ctx(includes=['gerrit'])
 def gerrit_plugins_chromium_binary_size(c):
   s = c.solutions.add()
   s.name = 'gerrit_plugins_chromium_binary_size'
@@ -484,42 +491,42 @@ def gerrit_plugins_chromium_binary_size(c):
                          'chromium-binary-size.git')
   c.got_revision_mapping['gerrit_plugins_chromium_binary_size'] = 'got_revision'
 
-@config_ctx()
+@config_ctx(includes=['gerrit'])
 def gerrit_plugins_chromium_style(c):
   s = c.solutions.add()
   s.name = 'gerrit_plugins_chromium_style'
   s.url = ChromiumGitURL(c, 'infra', 'gerrit-plugins', 'chromium-style.git')
   c.got_revision_mapping['gerrit_plugins_binary_size'] = 'got_revision'
 
-@config_ctx()
+@config_ctx(includes=['gerrit'])
 def gerrit_plugins_chumpdetector(c):
   s = c.solutions.add()
   s.name = 'gerrit_plugins_chumpdetector'
   s.url = ChromiumGitURL(c, 'infra', 'gerrit-plugins', 'chumpdetector.git')
   c.got_revision_mapping['gerrit_plugins_chumpdetector'] = 'got_revision'
 
-@config_ctx()
+@config_ctx(includes=['gerrit'])
 def gerrit_plugins_code_coverage(c):
   s = c.solutions.add()
   s.name = 'gerrit_plugins_code_coverage'
   s.url = ChromiumGitURL(c, 'infra', 'gerrit-plugins', 'code-coverage.git')
   c.got_revision_mapping['gerrit_plugins_code_coverage'] = 'got_revision'
 
-@config_ctx()
+@config_ctx(includes=['gerrit'])
 def gerrit_plugins_git_numberer(c):
   s = c.solutions.add()
   s.name = 'gerrit_plugins_git_numberer'
   s.url = ChromiumGitURL(c, 'infra', 'gerrit-plugins', 'git-numberer.git')
   c.got_revision_mapping['gerrit_plugins_git_numberer'] = 'got_revision'
 
-@config_ctx()
+@config_ctx(includes=['gerrit'])
 def gerrit_plugins_landingwidget(c):
   s = c.solutions.add()
   s.name = 'gerrit_plugins_landingwidget'
   s.url = ChromiumGitURL(c, 'infra', 'gerrit-plugins', 'landingwidget.git')
   c.got_revision_mapping['gerrit_plugins_landingwidget'] = 'got_revision'
 
-@config_ctx()
+@config_ctx(includes=['gerrit'])
 def gerrit_plugins_tricium(c):
   s = c.solutions.add()
   s.name = 'gerrit_plugins_tricium'
diff --git a/recipes/recipe_modules/gclient/examples/full.py b/recipes/recipe_modules/gclient/examples/full.py
index f0fa9f540..b521dec0b 100644
--- a/recipes/recipe_modules/gclient/examples/full.py
+++ b/recipes/recipe_modules/gclient/examples/full.py
@@ -28,6 +28,7 @@ TEST_CONFIGS = [
   'disable_syntax_validation',
   'emscripten_releases',
   'expect_tests',
+  'gerrit',
   'gerrit_plugins_binary_size',
   'gerrit_plugins_buildbucket',
   'gerrit_plugins_chromium_behavior',