diff --git a/dev-ruby/capistrano/capistrano-2.15.5-r2.ebuild b/dev-ruby/capistrano/capistrano-2.15.5-r2.ebuild
index df434debd4a0a..e21143a5f4deb 100644
--- a/dev-ruby/capistrano/capistrano-2.15.5-r2.ebuild
+++ b/dev-ruby/capistrano/capistrano-2.15.5-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
diff --git a/dev-ruby/capistrano/capistrano-3.4.1.ebuild b/dev-ruby/capistrano/capistrano-3.4.1.ebuild
index 147c14cc8a28b..e272053f97be7 100644
--- a/dev-ruby/capistrano/capistrano-3.4.1.ebuild
+++ b/dev-ruby/capistrano/capistrano-3.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -25,7 +25,11 @@ ruby_add_rdepend "
 	dev-ruby/i18n:*
 	!!<dev-ruby/capistrano-2.15.5-r2"
 ruby_add_bdepend "
-	test? (	dev-ruby/mocha:0.12 )"
+	test? (	dev-ruby/mocha:0.14 )"
+
+all_ruby_prepare() {
+	sed -i -e '1igem "mocha", "~>0.14.0"' spec/spec_helper.rb || die
+}
 
 pkg_postinst() {
 	einfo "Capistrano 3.1 has some breaking changes. Please check the CHANGELOG: http://goo.gl/SxB0lr"