diff --git a/dev-python/sphinxcontrib-programoutput/metadata.xml b/dev-python/sphinxcontrib-programoutput/metadata.xml
index 16650eae0eb77..e3954e33e9a6f 100644
--- a/dev-python/sphinxcontrib-programoutput/metadata.xml
+++ b/dev-python/sphinxcontrib-programoutput/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<longdescription>
+  <herd>python</herd>
+  <longdescription>
   A Sphinx extension to literally insert the output of arbitrary
   commands into documents, helping you to keep your command examples
   up to date.
 </longdescription>
-<upstream>
-  <remote-id type="pypi">sphinxcontrib-programoutput</remote-id>
-</upstream>
+  <upstream>
+    <remote-id type="pypi">sphinxcontrib-programoutput</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.8.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.8.ebuild
index 96543ce78c188..a8280b6864a41 100644
--- a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.8.ebuild
+++ b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.8.ebuild
@@ -3,7 +3,8 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 
 inherit distutils-r1
 
@@ -30,10 +31,10 @@ python_compile_all() {
 }
 
 python_test() {
-	py.test || die
+	py.test -v -v || die
 }
 
 python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html )
+	use doc && local HTML_DOCS=( doc/_build/html/. )
 	distutils-r1_python_install_all
 }