diff --git a/dev-python/aplpy/aplpy-1.0.ebuild b/dev-python/aplpy/aplpy-1.0.ebuild
index 5d0cd8a3f5178..4023bfce48f0b 100644
--- a/dev-python/aplpy/aplpy-1.0.ebuild
+++ b/dev-python/aplpy/aplpy-1.0.ebuild
@@ -48,6 +48,5 @@ python_compile() {
 python_test() {
 	distutils_install_for_testing
 	cd "${TEST_DIR}" || die
-	virtx "${EPYTHON}" -c "import aplpy, sys;r = aplpy.test();sys.exit(r)" \
-		|| die "tests fail with ${EPYTHON}"
+	virtx "${EPYTHON}" -c "import aplpy, sys;r = aplpy.test();sys.exit(r)"
 }
diff --git a/dev-python/aplpy/metadata.xml b/dev-python/aplpy/metadata.xml
index 56197151274f8..8fa6a8c707bbc 100644
--- a/dev-python/aplpy/metadata.xml
+++ b/dev-python/aplpy/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>sci-astronomy@gentoo.org</email>
-  <name>Gentoo Astronomy Project</name>
-</maintainer>
-<longdescription lang="en">
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
   APLpy (the Astronomical Plotting Library in Python) is a Python
   module aimed at producing publication-quality plots of astronomical
   imaging data in FITS format. The module uses Matplotlib. It is
   capable of creating output files in several graphical formats,
   including EPS, PDF, PS, PNG, and SVG.
 </longdescription>
-<upstream>
-  <remote-id type="pypi">APLpy</remote-id>
-</upstream>
+  <upstream>
+    <remote-id type="pypi">APLpy</remote-id>
+  </upstream>
 </pkgmetadata>