diff --git a/tox.ini b/tox.ini
index 8fd42544dc..5aac2e1f36 100644
--- a/tox.ini
+++ b/tox.ini
@@ -38,11 +38,9 @@ commands = sphinx-build -W -E -b html doc/source doc/build/html
 
 [testenv:testinfra]
 deps =
-  # testinfra 1.17.0 has a broken wheel that won't install under python3
-  # testinfra 3.0.0 switched the ansible backend, but broke ipv6 handling
-  testinfra!=1.17.0,!=3.0.0
   ansible-base
   pytest-html # MPL-2.0
+  pytest-testinfra>=6.0.0
 
 # This environment assumes a gate-hosts.yaml file has been written.
 passenv =
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index f5c62314c2..e9a9fc9ff8 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -75,7 +75,7 @@
     required-projects:
       - name: github.com/ansible/ansible
         override-checkout: devel
-      - name: github.com/philpep/testinfra
+      - name: github.com/pytest-dev/pytest-testinfra
       - name: openstack/openstacksdk
       - name: recordsansible/ara
         # NOTE(ianw): 2019-06-11 pinned to stable branch until we handle 1.0