diff --git a/oa-oauth/spec/omniauth/strategies/oauth/dopplr_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/dopplr_spec.rb
index 5fc2035..859ba76 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/dopplr_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/dopplr_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Dopplr do
   it_should_behave_like "an oauth strategy"
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/douban_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/douban_spec.rb
index 1ce8cac..849b29a 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/douban_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/douban_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Douban do
   it_should_behave_like 'an oauth strategy'
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/dropbox_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/dropbox_spec.rb
index 4b44c25..ec0a1a5 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/dropbox_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/dropbox_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Dropbox do
   it_should_behave_like "an oauth strategy"
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/evernote_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/evernote_spec.rb
index 2926f2e..cc67239 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/evernote_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/evernote_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Evernote do
   it_should_behave_like "an oauth strategy"
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/flattr_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/flattr_spec.rb
index 7169472..3afe23c 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/flattr_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/flattr_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Flattr do
   it_should_behave_like 'an oauth strategy'
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/goodreads_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/goodreads_spec.rb
index e52a260..d44200a 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/goodreads_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/goodreads_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Goodreads do
   it_should_behave_like 'an oauth strategy'
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/google_health_sandbox_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/google_health_sandbox_spec.rb
index 81bbc5f..604a205 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/google_health_sandbox_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/google_health_sandbox_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::GoogleHealthSandbox do
   it_should_behave_like 'an oauth strategy'
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/google_health_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/google_health_spec.rb
index 62320eb..51c57fb 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/google_health_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/google_health_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::GoogleHealth do
   it_should_behave_like 'an oauth strategy'
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/google_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/google_spec.rb
index 77464f6..9336939 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/google_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/google_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Google do
   it_should_behave_like 'an oauth strategy'
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/hyves_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/hyves_spec.rb
index bafbc54..5bdb952 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/hyves_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/hyves_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Hyves do
   it_should_behave_like "an oauth strategy"
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/identica_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/identica_spec.rb
index 63ef548..a5df866 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/identica_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/identica_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Identica do
   it_should_behave_like 'an oauth strategy'
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/linked_in_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/linked_in_spec.rb
index 8cbf2b5..535a1bb 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/linked_in_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/linked_in_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::LinkedIn do
   it_should_behave_like "an oauth strategy"
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/meetup_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/meetup_spec.rb
index 086a852..f9e79a3 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/meetup_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/meetup_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Meetup do
   it_should_behave_like 'an oauth strategy'
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/miso_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/miso_spec.rb
index 6db2b1b..5d43693 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/miso_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/miso_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Miso do
   it_should_behave_like 'an oauth strategy'
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/netflix_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/netflix_spec.rb
index 5095219..f09f7ac 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/netflix_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/netflix_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Netflix do
   it_should_behave_like "an oauth strategy"
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/oauth_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/oauth_spec.rb
index 7227076..b8f8072 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/oauth_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/oauth_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe "OmniAuth::Strategies::OAuth" do
 
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/orkut_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/orkut_spec.rb
index 1d6015b..7562ff4 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/orkut_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/orkut_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Orkut do
   it_should_behave_like 'an oauth strategy'
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/plurk_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/plurk_spec.rb
index 7bb3c39..01c5d41 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/plurk_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/plurk_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Plurk do
   it_should_behave_like 'an oauth strategy'
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/rdio_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/rdio_spec.rb
index 3af2763..4821c4e 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/rdio_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/rdio_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Rdio do
   it_should_behave_like "an oauth strategy"
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/smug_mug_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/smug_mug_spec.rb
index 1a09561..3ee8292 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/smug_mug_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/smug_mug_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::SmugMug do
   it_should_behave_like 'an oauth strategy'
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/sound_cloud_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/sound_cloud_spec.rb
index decf2dc..469b741 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/sound_cloud_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/sound_cloud_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::SoundCloud do
   it_should_behave_like 'an oauth strategy'
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/t163_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/t163_spec.rb
index 02fbda0..f9f2113 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/t163_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/t163_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::T163 do
   it_should_behave_like "an oauth strategy"
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/trade_me_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/trade_me_spec.rb
index 51cf349..116ccae 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/trade_me_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/trade_me_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::TradeMe do
   it_should_behave_like 'an oauth strategy'
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/trip_it_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/trip_it_spec.rb
index 924722e..354cb4d 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/trip_it_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/trip_it_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::TripIt do
   it_should_behave_like 'an oauth strategy'
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/tsina_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/tsina_spec.rb
index e49f84b..a29452d 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/tsina_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/tsina_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Tsina do
   it_should_behave_like "an oauth strategy"
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/tumblr_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/tumblr_spec.rb
index 6ef80b4..2508d29 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/tumblr_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/tumblr_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Tumblr do
   it_should_behave_like 'an oauth strategy'
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/twitter_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/twitter_spec.rb
index 7b29707..cd28523 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/twitter_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/twitter_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Twitter do
   it_should_behave_like 'an oauth strategy'
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/type_pad_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/type_pad_spec.rb
index fe879c5..c3f691f 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/type_pad_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/type_pad_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::TypePad do
   it_should_behave_like 'an oauth strategy'
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/vimeo_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/vimeo_spec.rb
index 429ff62..cfe2547 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/vimeo_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/vimeo_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Vimeo do
   it_should_behave_like 'an oauth strategy'
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/yahoo_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/yahoo_spec.rb
index 3d00033..c2d979e 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/yahoo_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/yahoo_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Yahoo do
   it_should_behave_like 'an oauth strategy'
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/yammer_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/yammer_spec.rb
index 6c6dae3..b63ed22 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/yammer_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/yammer_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Yammer do
   it_should_behave_like 'an oauth strategy'
diff --git a/oa-oauth/spec/omniauth/strategies/oauth/you_tube_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth/you_tube_spec.rb
index 8de4bd4..ad70973 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth/you_tube_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth/you_tube_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::YouTube do
   it_should_behave_like 'an oauth strategy'
diff --git a/oa-oauth/spec/omniauth/strategies/oauth2/bitly_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth2/bitly_spec.rb
index 7f75acf..227f2e2 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth2/bitly_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth2/bitly_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Bitly do
   it_should_behave_like "an oauth2 strategy"
diff --git a/oa-oauth/spec/omniauth/strategies/oauth2/cobot_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth2/cobot_spec.rb
index dc6440b..f22a718 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth2/cobot_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth2/cobot_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Cobot do
   it_should_behave_like "an oauth2 strategy"
diff --git a/oa-oauth/spec/omniauth/strategies/oauth2/dailymile_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth2/dailymile_spec.rb
index 67468ab..55e8c16 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth2/dailymile_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth2/dailymile_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Dailymile do
   it_should_behave_like "an oauth2 strategy"
diff --git a/oa-oauth/spec/omniauth/strategies/oauth2/doit_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth2/doit_spec.rb
index ddb8ce8..9c64a9e 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth2/doit_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth2/doit_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Doit do
   it_should_behave_like "an oauth2 strategy"
diff --git a/oa-oauth/spec/omniauth/strategies/oauth2/facebook_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth2/facebook_spec.rb
index 623a579..eda8c28 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth2/facebook_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth2/facebook_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Facebook do
   it_should_behave_like "an oauth2 strategy"
diff --git a/oa-oauth/spec/omniauth/strategies/oauth2/foursquare_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth2/foursquare_spec.rb
index 3607148..4f9888c 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth2/foursquare_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth2/foursquare_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Foursquare do
   it_should_behave_like "an oauth2 strategy"
diff --git a/oa-oauth/spec/omniauth/strategies/oauth2/github_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth2/github_spec.rb
index d09f669..aa4f259 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth2/github_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth2/github_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::GitHub do
   it_should_behave_like "an oauth2 strategy"
diff --git a/oa-oauth/spec/omniauth/strategies/oauth2/glitch_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth2/glitch_spec.rb
index b7fd3e4..e771ab6 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth2/glitch_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth2/glitch_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Glitch do
   it_should_behave_like 'an oauth2 strategy'
diff --git a/oa-oauth/spec/omniauth/strategies/oauth2/gowalla_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth2/gowalla_spec.rb
index 25e2d1d..bdf79a0 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth2/gowalla_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth2/gowalla_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Gowalla do
   it_should_behave_like "an oauth2 strategy"
diff --git a/oa-oauth/spec/omniauth/strategies/oauth2/mailru_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth2/mailru_spec.rb
index b13d483..0e64f88 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth2/mailru_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth2/mailru_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Mailru do
   it_should_behave_like "an oauth2 strategy"
diff --git a/oa-oauth/spec/omniauth/strategies/oauth2/salesforce_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth2/salesforce_spec.rb
index d5d0a46..2bd7442 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth2/salesforce_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth2/salesforce_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Salesforce do
   it_should_behave_like 'an oauth2 strategy'
diff --git a/oa-oauth/spec/omniauth/strategies/oauth2/taobao_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth2/taobao_spec.rb
index 71b6878..d846f61 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth2/taobao_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth2/taobao_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::TaoBao do
   it_should_behave_like "an oauth2 strategy"
diff --git a/oa-oauth/spec/omniauth/strategies/oauth2/teambox_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth2/teambox_spec.rb
index 8280397..8a969ea 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth2/teambox_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth2/teambox_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Teambox do
   it_should_behave_like "an oauth2 strategy"
diff --git a/oa-oauth/spec/omniauth/strategies/oauth2/thirty_seven_signals_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth2/thirty_seven_signals_spec.rb
index 40e9700..7f54fb9 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth2/thirty_seven_signals_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth2/thirty_seven_signals_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::ThirtySevenSignals do
   it_should_behave_like 'an oauth2 strategy'
diff --git a/oa-oauth/spec/omniauth/strategies/oauth2/vkontakte_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth2/vkontakte_spec.rb
index 705998c..99165fb 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth2/vkontakte_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth2/vkontakte_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::Vkontakte do
   it_should_behave_like "an oauth2 strategy"
diff --git a/oa-oauth/spec/omniauth/strategies/oauth2/we_pay_spec.rb b/oa-oauth/spec/omniauth/strategies/oauth2/we_pay_spec.rb
index d89a664..83c3488 100644
--- a/oa-oauth/spec/omniauth/strategies/oauth2/we_pay_spec.rb
+++ b/oa-oauth/spec/omniauth/strategies/oauth2/we_pay_spec.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe OmniAuth::Strategies::WePay do
   it_should_behave_like "an oauth2 strategy"
diff --git a/oa-oauth/spec/helper.rb b/oa-oauth/spec/spec_helper.rb
similarity index 93%
rename from oa-oauth/spec/helper.rb
rename to oa-oauth/spec/spec_helper.rb
index 8b1a142..4b3b371 100644
--- a/oa-oauth/spec/helper.rb
+++ b/oa-oauth/spec/spec_helper.rb
@@ -5,6 +5,7 @@ SimpleCov.start
 require 'rspec'
 require 'rack/test'
 require 'webmock/rspec'
+require 'vcr'
 require 'omniauth/core'
 require 'omniauth/test'
 require 'omniauth/oauth'
@@ -12,6 +13,7 @@ require File.expand_path('../support/shared_examples', __FILE__)
 
 RSpec.configure do |config|
   config.include WebMock::API
+  config.extend VCR::RSpec::Macros
   config.include Rack::Test::Methods
   config.extend  OmniAuth::Test::StrategyMacros, :type => :strategy
 end