diff --git a/testinfra/test_etherpad.py b/testinfra/test_etherpad.py
new file mode 100644
index 0000000000..b5c11af745
--- /dev/null
+++ b/testinfra/test_etherpad.py
@@ -0,0 +1,21 @@
+# Copyright 2018 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+
+testinfra_hosts = ['etherpad01.opendev.org']
+
+
+def test_etherpad_listening(host):
+    etherpad = host.socket("tcp://127.0.0.1:9001")
+    assert etherpad.is_listening
\ No newline at end of file
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index d67b6a7223..77aab46cbc 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -472,6 +472,7 @@
       - playbooks/roles/install-docker/
       - playbooks/roles/pip3/
       - docker/etherpad/
+      - testinfra/test_etherpad.py
 
 - job:
     name: system-config-run-gitea