Index: archive/py2cairo.xml
===================================================================
--- archive/py2cairo.xml	(revision a2e0310cfd40fc4ab1dd3e359ef05d5a781cc376)
+++ archive/py2cairo.xml	(revision 8b819c527cde40c7fb059fde91027d279e19ce50)
@@ -77,4 +77,5 @@
       <bridgehead renderas="sect5">Optional</bridgehead>
       <para role="optional">
+        <!--TODO built for python2? -->
         <ulink url="http://pytest.org">pytest</ulink>
       </para>
Index: general/genlib/libwacom.xml
===================================================================
--- general/genlib/libwacom.xml	(revision a2e0310cfd40fc4ab1dd3e359ef05d5a781cc376)
+++ general/genlib/libwacom.xml	(revision 8b819c527cde40c7fb059fde91027d279e19ce50)
@@ -88,5 +88,5 @@
       <xref linkend="librsvg"/>,
       <xref linkend="valgrind"/> (optional for some tests), and
-      <ulink url="https://docs.pytest.org/en/stable/">pytest</ulink> with
+      <xref linkend="pytest"/> with
       <ulink url="https://pypi.org/project/libevdev/">python-libevdev</ulink> and
       <ulink url="https://pypi.org/project/pyudev/">pyudev</ulink>
@@ -123,5 +123,5 @@
       To test the results, issue: <command>ninja test</command>.
       To run additional tests, install
-      <ulink url="https://docs.pytest.org/en/stable/">pytest</ulink> and remove
+      <xref linkend="pytest"/> and remove
       the "-Dtests=disabled" option from the meson line above.
     </para>
@@ -143,7 +143,6 @@
     <para>
       <parameter>-Dtests=disabled</parameter>: This parameter disables some of
-      the more advanced tests because they require
-      <ulink url="https://docs.pytest.org/en/stable/">pytest</ulink> to work
-      properly.
+      the more advanced tests because they require <xref linkend="pytest"/> to
+      work properly.
     </para>
 
Index: general/prog/python-modules/pycairo.xml
===================================================================
--- general/prog/python-modules/pycairo.xml	(revision a2e0310cfd40fc4ab1dd3e359ef05d5a781cc376)
+++ general/prog/python-modules/pycairo.xml	(revision 8b819c527cde40c7fb059fde91027d279e19ce50)
@@ -77,6 +77,5 @@
       <para role="optional">
         <ulink url="https://hypothesis.readthedocs.io">Hypothesis</ulink> and
-        <ulink url="https://pypi.org/project/pytest/">pytest</ulink>
-        (for tests)
+        <xref linkend="pytest"/> (for tests)
       </para>
 
Index: general/prog/python-modules/pygobject3.xml
===================================================================
--- general/prog/python-modules/pygobject3.xml	(revision a2e0310cfd40fc4ab1dd3e359ef05d5a781cc376)
+++ general/prog/python-modules/pygobject3.xml	(revision 8b819c527cde40c7fb059fde91027d279e19ce50)
@@ -83,5 +83,5 @@
         <ulink url="https://pypi.python.org/pypi/pep8">pep8</ulink>,
         <ulink url="https://pypi.python.org/pypi/pyflakes">pyflakes</ulink>, and
-        <ulink url="https://pypi.python.org/pypi/pytest">pytest</ulink>
+        <xref linkend="pytest"/>
         <!-- pytest brings in a lot of dependencies - upwards of 10 -->
       </para>
Index: networking/netprogs/samba.xml
===================================================================
--- networking/netprogs/samba.xml	(revision a2e0310cfd40fc4ab1dd3e359ef05d5a781cc376)
+++ networking/netprogs/samba.xml	(revision 8b819c527cde40c7fb059fde91027d279e19ce50)
@@ -151,10 +151,9 @@
       Install in listed order:
       <xref linkend="six"/>,
+      <xref linkend="pytest"/>,
       <ulink url="&pypi;/argparse/">argparse</ulink>,
       <ulink url="&pypi;/extras/">extras</ulink>,
-      <ulink url="&pypi;/py/">py</ulink>,
       <!--<ulink url="&pypi;/enum34/">enum34</ulink>,-->
       <ulink url="&pypi;/hypothesis/">hypothesis</ulink>,
-      <ulink url="&pypi;/pytest/">pytest</ulink>,
       <ulink url="&pypi;/coverage/">coverage</ulink>,
       <ulink url="&pypi;/pytest-cov/">pytest-cov</ulink>,
Index: postlfs/filesystems/fuse3.xml
===================================================================
--- postlfs/filesystems/fuse3.xml	(revision a2e0310cfd40fc4ab1dd3e359ef05d5a781cc376)
+++ postlfs/filesystems/fuse3.xml	(revision 8b819c527cde40c7fb059fde91027d279e19ce50)
@@ -77,5 +77,5 @@
     <para role="optional">
       <xref linkend="doxygen"/> (to rebuild the API documentation) and
-      <ulink url="https://pypi.org/project/pytest/">pytest</ulink> (required for tests)
+      <xref linkend="pytest"/> (required for tests)
     </para>
 
@@ -149,5 +149,5 @@
 
     <para>
-      The <ulink url="https://pypi.org/project/pytest/">pytest</ulink> Python
+      The <xref linkend="pytest"/> Python
       module is required for the tests.  One test named
       <filename>test_cuse</filename> will fail if the
