diff --git a/python-pytest/PKGBUILD b/python-pytest/PKGBUILD
deleted file mode 100644
index 49c8323d..00000000
--- a/python-pytest/PKGBUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-# Maintainer: J. Peter Mugaas <jpmugaas@suddenlink.net>
-
-pkgbase=python-pytest
-pkgname=('python3-pytest' 'python2-pytest')
-pkgver=5.0.1
-pkgrel=1
-pkgdesc="Simple powerful testing with Python"
-arch=('any')
-license=('MIT')
-url="https://pytest.org/"
-makedepends=('python2-atomicwrites'
-             'python3-atomicwrites'
-             'python2-attrs'
-             'python3-attrs'
-             'python2-funcsigs'
-             'python2-pathlib2'
-             'python2-pluggy'
-             'python3-pluggy' 
-             'python2-py'
-             'python3-py'
-             'python2-setuptools'
-             'python3-setuptools' 
-             'python2-setuptools-scm'
-             'python3-setuptools-scm'
-             'python2-six'
-             'python3-six')
-source=("pytest-${pkgver}.tar.gz::https://github.com/pytest-dev/pytest/archive/${pkgver}.tar.gz")
-sha512sums=('738f8a3b38ad36be6a66ad036999a9b78023c40dd6c9cb9bd01a023841011ae276fec556eb6dabf35638a6c7cf49304c140d90d5174ded710e0f51b51145e5cb')
-
-prepare() {
-  sed -i "s/'_pytest.vendored_packages'//" pytest-${pkgver}/setup.py
-  sed -i 's/assert numentries == 0/assert numentries == 26/' pytest-${pkgver}/testing/python/collect.py
-  cp -a pytest-${pkgver}{,-py2}
-}
-
-build() {
-  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
-  
-  cd "${srcdir}/pytest-${pkgver}"
-  python3 setup.py build
-
-  cd "${srcdir}/pytest-${pkgver}-py2"
-  python2 setup.py build
-}
-
-package_python3-pytest() {
-  depends=('python3' 
-           'python3-atomicwrites'
-           'python3-attrs'
-           'python3-more-itertools'
-           'python3-pluggy'
-           'python3-py'
-           'python3-setuptools'
-           'python3-six')
-
-  cd pytest-${pkgver}
-  python3 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_python2-pytest() {
-  depends=('python2' 
-           'python2-atomicwrites'
-           'python2-attrs'
-           'python2-more-itertools'
-           'python3-pluggy'
-           'python2-py'
-           'python2-setuptools'
-           'python3-six')
-
-  cd pytest-${pkgver}-py2
-  python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-  for f in {py.test,pytest}; do
-    mv "${pkgdir}"/usr/bin/${f}{,2}
-  done
-}
-
diff --git a/python2-pytest/PKGBUILD b/python2-pytest/PKGBUILD
new file mode 100644
index 00000000..58b87d3b
--- /dev/null
+++ b/python2-pytest/PKGBUILD
@@ -0,0 +1,45 @@
+# Maintainer: J. Peter Mugaas <jpmugaas@suddenlink.net>
+
+pkgbase=python-pytest
+pkgname=('python2-pytest')
+pkgver=4.6.4
+pkgrel=1
+pkgdesc="Simple powerful testing with Python"
+arch=('any')
+license=('MIT')
+url="https://pytest.org/"
+depends=('python2'
+         'python2-atomicwrites'
+         'python2-attrs'
+         'python2-more-itertools'
+         'python2-pluggy'
+         'python2-py'
+         'python2-setuptools'
+         'python2-six')
+makedepends=('python2-setuptools-scm')
+source=("pytest-${pkgver}.tar.gz::https://github.com/pytest-dev/pytest/archive/${pkgver}.tar.gz")
+sha512sums=('58eed6f9e367b23944805eb10f1d727e95a8e42f65fbef673b890656a6395746aee5d0891a0849d2bfa5bb46fafda6120bb1d0b532b0d95586bb196942395dd0')
+
+prepare() {
+  sed -i "s/'_pytest.vendored_packages'//" pytest-${pkgver}/setup.py
+  sed -i 's/assert numentries == 0/assert numentries == 26/' pytest-${pkgver}/testing/python/collect.py
+  cp -a pytest-${pkgver}{,-py2}
+}
+
+build() {
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
+
+  cd "${srcdir}/pytest-${pkgver}-py2"
+  python2 setup.py build
+}
+
+package() {
+  cd pytest-${pkgver}-py2
+  python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+  for f in {py.test,pytest}; do
+    mv "${pkgdir}"/usr/bin/${f}{,2}
+  done
+}
+
diff --git a/python3-pytest/PKGBUILD b/python3-pytest/PKGBUILD
new file mode 100644
index 00000000..0337a3e7
--- /dev/null
+++ b/python3-pytest/PKGBUILD
@@ -0,0 +1,39 @@
+# Maintainer: J. Peter Mugaas <jpmugaas@suddenlink.net>
+
+pkgbase=python-pytest
+pkgname=('python3-pytest')
+pkgver=5.0.1
+pkgrel=1
+pkgdesc="Simple powerful testing with Python"
+arch=('any')
+license=('MIT')
+url="https://pytest.org/"
+depends=('python3' 
+         'python3-atomicwrites'
+         'python3-attrs'
+         'python3-more-itertools'
+         'python3-pluggy'
+         'python3-py'
+         'python3-setuptools'
+         'python3-six')
+makedepends=('python3-setuptools-scm')
+source=("pytest-${pkgver}.tar.gz::https://github.com/pytest-dev/pytest/archive/${pkgver}.tar.gz")
+sha512sums=('738f8a3b38ad36be6a66ad036999a9b78023c40dd6c9cb9bd01a023841011ae276fec556eb6dabf35638a6c7cf49304c140d90d5174ded710e0f51b51145e5cb')
+
+prepare() {
+  sed -i "s/'_pytest.vendored_packages'//" pytest-${pkgver}/setup.py
+  sed -i 's/assert numentries == 0/assert numentries == 26/' pytest-${pkgver}/testing/python/collect.py
+}
+
+build() {
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
+  
+  cd "${srcdir}/pytest-${pkgver}"
+  python3 setup.py build
+}
+
+package() {
+  cd pytest-${pkgver}
+  python3 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}