diff --git a/Gemfile b/Gemfile
index 536d7c7c..f429c758 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec
-gem 'rake', '~> 0.9'
\ No newline at end of file
+gem 'rake', '~> 10.0.1'
diff --git a/gollum.gemspec b/gollum.gemspec
index 8afc9204..e926c7e6 100644
--- a/gollum.gemspec
+++ b/gollum.gemspec
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.add_dependency('stringex', '~> 1.4.0')
 
   s.add_development_dependency('RedCloth', '~> 4.2.9')
-  s.add_development_dependency('mocha', '~> 0.12.7')
+  s.add_development_dependency('mocha', '~> 0.13.0')
   s.add_development_dependency('org-ruby', '~> 0.7.2')
   s.add_development_dependency('shoulda', '~> 3.3.1')
   s.add_development_dependency('rack-test', '~> 0.6.2')
diff --git a/test/helper.rb b/test/helper.rb
index af7c8c36..ccbc8b4c 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rack/test'
 require 'test/unit'
 require 'shoulda'
-require 'mocha'
+require 'mocha/setup'
 require 'fileutils'
 
 dir = File.dirname(File.expand_path(__FILE__))