diff --git a/features/generator/generators.feature b/features/generator/generators.feature
index 00cb087c..77814b1f 100644
--- a/features/generator/generators.feature
+++ b/features/generator/generators.feature
@@ -1,3 +1,4 @@
+@gen
 Feature: allow pickle to generate steps
   In order to get going with pickle
   As a dev
diff --git a/features/step_definitions/generator_steps.rb b/features/step_definitions/generator_steps.rb
index 61e9ab74..389f07f3 100644
--- a/features/step_definitions/generator_steps.rb
+++ b/features/step_definitions/generator_steps.rb
@@ -1,8 +1,8 @@
-Before do
+Before('@gen') do
   `mv #{Rails.root}/features/ #{Rails.root}/features.orig/ > /dev/null 2>&1`
 end
 
-After do
+After('@gen') do
   `rm -rf #{Rails.root}/features`
   `mv #{Rails.root}/features.orig/ #{Rails.root}/features/ > /dev/null 2>&1`
 end