diff --git a/dev-python/scripttest/metadata.xml b/dev-python/scripttest/metadata.xml
index f8b6275810281..01164eae1e4ab 100644
--- a/dev-python/scripttest/metadata.xml
+++ b/dev-python/scripttest/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Python</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="pypi">ScriptTest</remote-id>
+		<remote-id type="pypi">scripttest</remote-id>
+		<remote-id type="github">pypa/scripttest</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/scripttest/scripttest-1.3.0-r1.ebuild b/dev-python/scripttest/scripttest-1.3.0-r1.ebuild
index 6f5a87847e1d5..ad68f3fadbce6 100644
--- a/dev-python/scripttest/scripttest-1.3.0-r1.ebuild
+++ b/dev-python/scripttest/scripttest-1.3.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A very small text templating language"
-HOMEPAGE="https://pypi.org/project/ScriptTest/
+HOMEPAGE="https://pypi.org/project/scripttest/
 	https://github.com/pypa/scripttest"
 # pypi tarball lacks tests
 SRC_URI="https://github.com/pypa/scripttest/archive/${PV}.tar.gz -> ${P}.tar.gz"