diff --git a/cucumber.yml b/cucumber.yml
index 7870eae8e..c948854e5 100644
--- a/cucumber.yml
+++ b/cucumber.yml
@@ -1,2 +1,2 @@
-default: --require features --tags ~@wip --format progress
+default: --require features --tags 'not @wip' --format progress
 wip: --require features --tags @wip:3 --wip features
diff --git a/features/support/ruby_features.rb b/features/support/ruby_features.rb
index 98b300440..97fe2678b 100644
--- a/features/support/ruby_features.rb
+++ b/features/support/ruby_features.rb
@@ -1,9 +1,8 @@
-Around "@skip-when-ripper-unsupported" do |scenario, block|
+Before "@skip-when-ripper-unsupported" do |scenario|
   require 'rspec/support/ruby_features'
 
-  if ::RSpec::Support::RubyFeatures.ripper_supported?
-    block.call
-  else
-    warn "Skipping scenario #{scenario.title} because Ripper is not supported"
+  unless ::RSpec::Support::RubyFeatures.ripper_supported?
+    warn "Skipping scenario #{scenario.name} because Ripper is not supported"
+    skip_this_scenario
   end
 end
diff --git a/rspec-expectations.gemspec b/rspec-expectations.gemspec
index 103840dbe..a5a777da9 100644
--- a/rspec-expectations.gemspec
+++ b/rspec-expectations.gemspec
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "diff-lcs", ">= 1.4.4", "< 2.0"
 
   s.add_development_dependency "aruba",    "~> 0.14.10"
-  s.add_development_dependency 'cucumber', '~> 1.3'
+  s.add_development_dependency 'cucumber', '>= 3.2', '!= 4.0.0', '< 8.0.0'
   s.add_development_dependency 'minitest', '~> 5.2'
   s.add_development_dependency 'rake',     '> 12.3.2'
 end