diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md
index f771d4427..ccb635fc1 100644
--- a/recipes/README.recipes.md
+++ b/recipes/README.recipes.md
@@ -1040,7 +1040,7 @@ PYTHON_VERSION_COMPATIBILITY: PY3
 
 PYTHON_VERSION_COMPATIBILITY: PY3
 
-— **def [RunSteps](/recipes/recipe_modules/gclient/examples/full.py#67)(api):**
+— **def [RunSteps](/recipes/recipe_modules/gclient/examples/full.py#68)(api):**
 ### *recipes* / [gclient:tests/diff\_deps](/recipes/recipe_modules/gclient/tests/diff_deps.py)
 
 [DEPS](/recipes/recipe_modules/gclient/tests/diff_deps.py#10): [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 9a6ca6fbe..4d5963f46 100644
--- a/recipes/recipe_modules/gclient/config.py
+++ b/recipes/recipe_modules/gclient/config.py
@@ -284,6 +284,26 @@ def expect_tests(c):
   soln.url = 'https://chromium.googlesource.com/infra/testing/expect_tests.git'
   c.got_revision_mapping['expect_tests'] = 'got_revision'
 
+
+@config_ctx()
+def infra_superproject(c):
+  soln = c.solutions.add()
+  soln.name = '.'
+  soln.url = 'https://chromium.googlesource.com/infra/infra_superproject.git'
+  # TODO(crbug.com/1415507): When builders can checkout internal code, add
+  # soln.custom_vars = {'checkout_internal': True}
+  c.repo_path_map.update({
+      'https://chromium.googlesource.com/infra/luci/gae':
+      ('infra/go/src/go.chromium.org/gae', 'HEAD'),
+      'https://chromium.googlesource.com/infra/luci/luci-py':
+      ('infra/luci', 'HEAD'),
+      'https://chromium.googlesource.com/infra/luci/luci-go':
+      ('infra/go/src/go.chromium.org/luci', 'HEAD'),
+      'https://chromium.googlesource.com/infra/luci/recipes-py':
+      ('infra/recipes-py', 'HEAD')
+  })
+
+
 @config_ctx()
 def infra(c):
   soln = c.solutions.add()
diff --git a/recipes/recipe_modules/gclient/examples/full.py b/recipes/recipe_modules/gclient/examples/full.py
index 8d54a0ec1..98fa0772c 100644
--- a/recipes/recipe_modules/gclient/examples/full.py
+++ b/recipes/recipe_modules/gclient/examples/full.py
@@ -42,6 +42,7 @@ TEST_CONFIGS = [
   'gerrit_test_cq_normal',
   'gyp',
   'infra',
+  'infra_superproject',
   'infradata_master_manager',
   'infradata_config',
   'infradata_rbe',