diff --git a/www-servers/thin/thin-1.6.2.ebuild b/www-servers/thin/thin-1.6.2.ebuild
index 2890fe4..15ddfcf 100644
--- a/www-servers/thin/thin-1.6.2.ebuild
+++ b/www-servers/thin/thin-1.6.2.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 USE_RUBY="ruby19 ruby20"
 
-RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_TASK_TEST="spec:main spec:group:0 spec:group:1 spec:group:2"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
@@ -52,6 +52,12 @@ all_ruby_prepare() {
 	# Avoid CLEAN since it may not be available and we don't need it.
 	sed -i -e '/CLEAN/ s:^:#:' tasks/*.rake || die
 
+	# Disable a test that is known for freezing the testsuite,
+	# reported upstream. In thin 1.5.1 this just fails.
+	sed -i \
+		-e '/should force kill process in pid file/,/^  end/ s:^:#:' \
+		spec/daemonizing_spec.rb || die
+
 	# nasty but too complex to fix up for now :(
 	use test || rm tasks/spec.rake
 }