diff --git a/dev-python/agate-dbf/agate-dbf-0.2.1.ebuild b/dev-python/agate-dbf/agate-dbf-0.2.1-r1.ebuild
similarity index 79%
rename from dev-python/agate-dbf/agate-dbf-0.2.1.ebuild
rename to dev-python/agate-dbf/agate-dbf-0.2.1-r1.ebuild
index c62bf6278..83442198d 100644
--- a/dev-python/agate-dbf/agate-dbf-0.2.1.ebuild
+++ b/dev-python/agate-dbf/agate-dbf-0.2.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -13,8 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 KEYWORDS="~amd64 ~arm64 ~mips ~x86"
 LICENSE="MIT"
-SLOT=0
-IUSE=""
+SLOT="0"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-python/dbfread[${PYTHON_USEDEP}]"
diff --git a/dev-python/agate-excel/agate-excel-0.2.3.ebuild b/dev-python/agate-excel/agate-excel-0.2.3-r1.ebuild
similarity index 65%
rename from dev-python/agate-excel/agate-excel-0.2.3.ebuild
rename to dev-python/agate-excel/agate-excel-0.2.3-r1.ebuild
index dbb3252a1..111773524 100644
--- a/dev-python/agate-excel/agate-excel-0.2.3.ebuild
+++ b/dev-python/agate-excel/agate-excel-0.2.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -11,12 +11,17 @@ DESCRIPTION="Adds read support for Excel files (xls and xlsx) to agate"
 HOMEPAGE="https://agate-excel.readthedocs.io/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm64 ~mips ~x86"
 LICENSE="MIT"
-SLOT=0
-IUSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-python/agate[${PYTHON_USEDEP}]
 	dev-python/xlrd[${PYTHON_USEDEP}]
 	dev-python/openpyxl[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/agate-sql/agate-sql-0.5.4.ebuild b/dev-python/agate-sql/agate-sql-0.5.4-r1.ebuild
similarity index 72%
rename from dev-python/agate-sql/agate-sql-0.5.4.ebuild
rename to dev-python/agate-sql/agate-sql-0.5.4-r1.ebuild
index dbb962cc5..f3e124577 100644
--- a/dev-python/agate-sql/agate-sql-0.5.4.ebuild
+++ b/dev-python/agate-sql/agate-sql-0.5.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -11,11 +11,10 @@ DESCRIPTION="Adds SQL read/write support to agate"
 HOMEPAGE="http://agate-sql.readthedocs.io/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm64 ~mips ~x86"
 LICENSE="MIT"
-SLOT=0
-IUSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~mips ~x86"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-python/agate[${PYTHON_USEDEP}]
-	dev-python/sqlalchemy[${PYTHON_USEDEP}]"
+	>=dev-python/sqlalchemy-1.0.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/agate/agate-1.6.1.ebuild b/dev-python/agate/agate-1.6.1-r1.ebuild
similarity index 83%
rename from dev-python/agate/agate-1.6.1.ebuild
rename to dev-python/agate/agate-1.6.1-r1.ebuild
index 7cca83c49..a5e689a61 100644
--- a/dev-python/agate/agate-1.6.1.ebuild
+++ b/dev-python/agate/agate-1.6.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -12,9 +12,12 @@ HOMEPAGE="https://agate.readthedocs.io/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT=0
+SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~mips ~x86"
-IUSE=""
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-python/Babel[${PYTHON_USEDEP}]
@@ -33,3 +36,5 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/cssselect[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/dbfread/dbfread-2.0.7.ebuild b/dev-python/dbfread/dbfread-2.0.7-r1.ebuild
similarity index 51%
rename from dev-python/dbfread/dbfread-2.0.7.ebuild
rename to dev-python/dbfread/dbfread-2.0.7-r1.ebuild
index ba4e74a97..d0368b66b 100644
--- a/dev-python/dbfread/dbfread-2.0.7.ebuild
+++ b/dev-python/dbfread/dbfread-2.0.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -11,8 +11,20 @@ DESCRIPTION="Read DBF Files with Python"
 HOMEPAGE="https://dbfread.readthedocs.io/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm64 ~mips ~x86"
 LICENSE="MIT"
-SLOT=0
-IUSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+# IUSE="test"
+# REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# RESTRICT="!test? ( test )"
+
 RDEPEND="${PYTHON_DEPS}"
+
+## TODO
+# distutils_enable_tests pytest
+
+# src_prepare() {
+# 	default
+# 	use test && eapply "${FILESDIR}/${P}_fix_tests.patch"
+# }