diff --git a/features/step_definitions/git_steps.rb b/features/step_definitions/git_steps.rb
index 162e01e..067788c 100644
--- a/features/step_definitions/git_steps.rb
+++ b/features/step_definitions/git_steps.rb
@@ -18,7 +18,14 @@
   end
 end
 
+Before("@creates-remote") do
+  in_current_dir do
+    remove_all_git_remotes
+  end
+end
+
 After("@creates-remote") do
-  heroku_remotes = `git remote -v show | grep heroku | grep fetch | cut -f1`.strip.split
-  heroku_remotes.each { |remote| `git remote rm #{remote} 2> /dev/null` }
+  in_current_dir do
+    remove_all_git_remotes
+  end
 end
diff --git a/features/support/git_remotes.rb b/features/support/git_remotes.rb
new file mode 100644
index 0000000..d0e09ef
--- /dev/null
+++ b/features/support/git_remotes.rb
@@ -0,0 +1,8 @@
+module GitRemoteHelpers
+  def remove_all_git_remotes
+    remotes = `git remote -v show | grep fetch | cut -f1`.strip.split
+    remotes.each { |remote| `git remote rm #{remote} 2> /dev/null` }
+  end
+end
+
+World(GitRemoteHelpers)