diff --git a/features/git.feature b/features/git.feature
index b4e6cc5..b6961e3 100644
--- a/features/git.feature
+++ b/features/git.feature
@@ -1,4 +1,3 @@
-@disable-bundler
 Feature: Git cleanliness
   As a user
   I want Kumade to check if git is clean before deploying
diff --git a/features/jammit.feature b/features/jammit.feature
index 0ece85e..5ec9ec9 100644
--- a/features/jammit.feature
+++ b/features/jammit.feature
@@ -1,4 +1,4 @@
-@slow @disable-bundler
+@slow
 Feature: Jammit
   As a user
   I want Kumade to auto-package with Jammit
diff --git a/features/kumade_executable.feature b/features/kumade_executable.feature
index e7d7f3e..cfb84b7 100644
--- a/features/kumade_executable.feature
+++ b/features/kumade_executable.feature
@@ -1,4 +1,4 @@
-@slow @disable-bundler
+@slow
 Feature: Kumade executable
   As a user
   I want to be able to use the kumade executable
diff --git a/features/kumade_without_jammit.feature b/features/kumade_without_jammit.feature
index 8306344..0b0a714 100644
--- a/features/kumade_without_jammit.feature
+++ b/features/kumade_without_jammit.feature
@@ -1,4 +1,4 @@
-@slow @disable-bundler
+@slow
 Feature: Kumade without jammit
 
   Background:
diff --git a/features/no_op_packager.feature b/features/no_op_packager.feature
index 0f2dc0d..306134b 100644
--- a/features/no_op_packager.feature
+++ b/features/no_op_packager.feature
@@ -1,4 +1,4 @@
-@slow @disable-bundler
+@slow
 Feature: No-op packager
   As a user
   I want Kumade to gracefully handle occasions when I have no assets to package
diff --git a/features/railtie.feature b/features/railtie.feature
index d689b7d..16e7287 100644
--- a/features/railtie.feature
+++ b/features/railtie.feature
@@ -3,7 +3,7 @@ Feature: Railtie
   I want Kumade to autoload Rake tasks for my Rails application
   So that I can integrate Kumade with other Rake tasks
 
-  @disable-bundler @slow
+  @slow
   Scenario: Rake tasks are loaded
     Given a new Rails application with Kumade
     When I create a Heroku remote named "staging"
diff --git a/features/rake_task_before_asset_compilation.feature b/features/rake_task_before_asset_compilation.feature
index d4f1314..8954647 100644
--- a/features/rake_task_before_asset_compilation.feature
+++ b/features/rake_task_before_asset_compilation.feature
@@ -1,4 +1,4 @@
-@slow @disable-bundler
+@slow
 Feature: Rake task that runs before asset compilation
   As a user
   I want a Rake task that runs before packaging
diff --git a/features/support/disable_bundler.rb b/features/support/disable_bundler.rb
new file mode 100644
index 0000000..43dfae8
--- /dev/null
+++ b/features/support/disable_bundler.rb
@@ -0,0 +1,3 @@
+Before do
+  unset_bundler_env_vars
+end