diff --git a/dev-python/gcloud/Manifest b/dev-python/gcloud/Manifest
index 74047b3c4..aa1c83213 100644
--- a/dev-python/gcloud/Manifest
+++ b/dev-python/gcloud/Manifest
@@ -1,3 +1,3 @@
 DIST gcloud-0.18.3.tar.gz 454375 BLAKE2B e36924e6d61035ce98530039f1fc7ac8390595058281eb51e879b0df6db9270553a419278d6ebe2ff44470d29e4acc040b142abebc68bab44b62b78538d491e1 SHA512 e76c71c2459983898996092ec308e38ef49631f8288d1a7ad0ab8e0ffae0da2d61ed291e1c0ba442f4446e7f90d70fc206761e14aefa04fb7f9b6f759af8006f
-EBUILD gcloud-0.18.3.ebuild 768 BLAKE2B 81d6be9de94d09a252d0fdf328aac5d3a8bb20b8af997710f01fe2938482734bc1513f693927c9a8e26d5a749998b1257fa68db72d11e54be20c3ed23e79dd29 SHA512 0491c97181a3678383dd1d6a9f08bed0d95f702824b6e3f1af3118d49e00fbfb0a75c8d32ce5e16c78827c8367d985022f01cba3e715a8fb03663bea17cf7588
-MISC metadata.xml 468 BLAKE2B 41130f3c032c6860401f487b121f4d9bf4a40c1d40beeebc02dad230425085c4d5401bedb81843b29aa173a4eaf99645e66d3e93fc25545ad2baf5eb0fc35ba0 SHA512 608db27667d7736e6fbb9d55dc3e77a1e73cbd34f7e5be289170467996850795dfe7fb2836f412dbcfadb9fb847d52cc13003b5c376f2af4cadc1d2f94a85140
+EBUILD gcloud-0.18.3.ebuild 775 BLAKE2B 9da47050b5314d6f000672f3be4dea2b3b9c4ebf89028f78d3a904bb62d207c3852d5db244c9d1d07876484b4211c272dbf697eeef332b76a7cbd144c6ddccf4 SHA512 99e9def05c64bd72c9b183c7b4842abd29e9752b23d7720673739efc04db57aa3aeaa587bc2cc71f55a49163f7c61bde291a19d4e96b63950ef302da2ba2003e
+MISC metadata.xml 464 BLAKE2B 5a012b44e73a6b266d9bbf0087f9d2864fdf6be73aaeec593c0b6359f2cb0def3374b8dd982bd42afd8c8787054303b7c3baa86288e76272717d2cf42b6bc5b8 SHA512 b5c36a52e5f1a742f5452199d7c33a292977e3de6c24ea5acfe6638f62594f0b83c38e2a2c561333476e8be8c8366c125f611608765ee991c6bcae7a1896d4e2
diff --git a/dev-python/gcloud/gcloud-0.18.3.ebuild b/dev-python/gcloud/gcloud-0.18.3.ebuild
index 360bd1a2c..0015dd8c6 100644
--- a/dev-python/gcloud/gcloud-0.18.3.ebuild
+++ b/dev-python/gcloud/gcloud-0.18.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -31,3 +31,5 @@ python_test() {
 	nosetests --verbose || die
 	py.test -v -v || die
 }
+
+distutils_enable_tests pytest
diff --git a/dev-python/gcloud/metadata.xml b/dev-python/gcloud/metadata.xml
index e8471f1ad..1b468db54 100644
--- a/dev-python/gcloud/metadata.xml
+++ b/dev-python/gcloud/metadata.xml
@@ -8,7 +8,7 @@
   <upstream>
     <remote-id type="pypi">gcloud</remote-id>
     <maintainer status="unknown">
-      <email>jjg+gcloud-python@google.com</email>
+      <email>gcloud-python@google.com</email>
       <name>Google Cloud Platform</name>
     </maintainer>
   </upstream>