diff --git a/docker/hound/sample-projects.yaml b/docker/hound/sample-projects.yaml
index ff3da1aaed..1074fbffc7 100644
--- a/docker/hound/sample-projects.yaml
+++ b/docker/hound/sample-projects.yaml
@@ -13,3 +13,8 @@
   groups:
     - zuul
   description: The Gatekeeper, or a project gating system
+- project: cirros/cirros
+  use-storyboard: false
+  groups:
+    - openstack-ci
+  description: Cirros uses "main" instead of "master"
diff --git a/playbooks/test-codesearch.yaml b/playbooks/test-codesearch.yaml
new file mode 100644
index 0000000000..d1c3637681
--- /dev/null
+++ b/playbooks/test-codesearch.yaml
@@ -0,0 +1,6 @@
+- hosts: "codesearch"
+  tasks:
+
+    - name: Run selenium container
+      include_role:
+        name: run-selenium
diff --git a/testinfra/test_codesearch.py b/testinfra/test_codesearch.py
index 0a575ea1ff..b7df48c0af 100644
--- a/testinfra/test_codesearch.py
+++ b/testinfra/test_codesearch.py
@@ -12,6 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from util import take_screenshots
 
 testinfra_hosts = ['codesearch01.opendev.org']
 
@@ -31,3 +32,11 @@ def test_codesearch_robots(host):
                    '--resolve codesearch.opendev.org:443:127.0.0.1 '
                    'https://codesearch.opendev.org/robots.txt')
     assert 'Disallow: /' in cmd.stdout
+
+def test_codesearch_screenshots(host):
+    shots = (
+        ('https://localhost/', None, 'codesearch-main-page.png'),
+        ('https://localhost/?q=zuul&i=nope&literal=nope&files=&excludeFiles=&repos=', None, 'codesearch-zuul.png'),
+        ('https://localhost/?q=cirros&i=nope&literal=nope&files=&excludeFiles=&repos=cirros/cirros', None, 'codesearch-cirros.png'),
+    )
+    take_screenshots(host, shots)
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index e6f4212e07..80863fbc6a 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -530,6 +530,7 @@
       run_playbooks:
         - playbooks/letsencrypt.yaml
         - playbooks/service-codesearch.yaml
+      run_test_playbook: playbooks/test-codesearch.yaml
     files:
       - playbooks/bootstrap-bridge.yaml
       - playbooks/letsencrypt.yaml