diff --git a/dev-ruby/png/png-1.2.1.ebuild b/dev-ruby/png/png-1.2.1.ebuild
index 26f73115c7373..435bf21396004 100644
--- a/dev-ruby/png/png-1.2.1.ebuild
+++ b/dev-ruby/png/png-1.2.1.ebuild
@@ -5,8 +5,7 @@
 EAPI=5
 USE_RUBY="ruby20 ruby21"
 
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
 
 inherit ruby-fakegem
@@ -20,9 +19,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "
-	doc? ( dev-ruby/hoe )
 	test? (
-		dev-ruby/hoe
 		dev-ruby/minitest
 	)"
 
@@ -38,6 +35,10 @@ src_test() {
 	ruby-ng_src_test
 }
 
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
+
 all_ruby_install() {
 	all_fakegem_install