diff --git a/www-apps/twint/metadata.xml b/www-apps/twint/metadata.xml
index 1b56f8c174..050abe23fb 100644
--- a/www-apps/twint/metadata.xml
+++ b/www-apps/twint/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>lssndrbarbieri@gmail.com</email>
diff --git a/www-apps/twint/twint-2.1.20-r2.ebuild b/www-apps/twint/twint-2.1.20-r2.ebuild
index e059ada669..925735b9f9 100644
--- a/www-apps/twint/twint-2.1.20-r2.ebuild
+++ b/www-apps/twint/twint-2.1.20-r2.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{8..9} )
-
 inherit distutils-r1
 
 DESCRIPTION="Twitter scraping & OSINT tool written in Python that doesn't use Twitter's API"
@@ -28,13 +26,13 @@ RDEPEND="
 	dev-python/cchardet[${PYTHON_USEDEP}]
 	dev-python/elasticsearch-py[${PYTHON_USEDEP}]
 	dev-python/fake-useragent[${PYTHON_USEDEP}]
-	dev-python/geopy[${PYTHON_USEDEP}]
 	dev-python/googletransx[${PYTHON_USEDEP}]
 	>=dev-python/pandas-0.23.0[${PYTHON_USEDEP}]
 	dev-python/PySocks[${PYTHON_USEDEP}]
 	dev-python/schedule[${PYTHON_USEDEP}]
+	sci-geosciences/geopy[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}"
+BDEPEND="test? ( ${RDEPEND} )"
 
 RESTRICT="test"
 PROPERTIES="test_network"