diff --git a/dev-ruby/hiera-eyaml/hiera-eyaml-2.1.0.ebuild b/dev-ruby/hiera-eyaml/hiera-eyaml-2.1.0.ebuild
index 6afd988b9266b..05be0dd4b982b 100644
--- a/dev-ruby/hiera-eyaml/hiera-eyaml-2.1.0.ebuild
+++ b/dev-ruby/hiera-eyaml/hiera-eyaml-2.1.0.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"
+USE_RUBY="ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md CHANGES.md PLUGINS.md"
@@ -36,6 +36,12 @@ all_ruby_prepare() {
 		features/puppet.feature
 }
 
+each_ruby_prepare() {
+	# Run tests with the correct ruby interpreter
+	sed -i -e 's:I run `eyaml:I run `'${RUBY}' '${S}'/bin/eyaml:' features/*.feature || die
+
+}
+
 each_ruby_test() {
 	${RUBY} -S cucumber --format progress features || die
 }