diff --git a/blobstore_client/Gemfile b/blobstore_client/Gemfile
index <HASH>..<HASH> 100644
--- a/blobstore_client/Gemfile
+++ b/blobstore_client/Gemfile
@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source :rubygems
 
 gem "httpclient"
 
diff --git a/blobstore_client/lib/blobstore_client.rb b/blobstore_client/lib/blobstore_client.rb
index <HASH>..<HASH> 100644
--- a/blobstore_client/lib/blobstore_client.rb
+++ b/blobstore_client/lib/blobstore_client.rb
@@ -7,6 +7,8 @@ end
 
 require "base64"
 
+require "httpclient"
+
 require "blobstore_client/client"
 require "blobstore_client/simple_blobstore_client"
 
diff --git a/blobstore_client/spec/spec_helper.rb b/blobstore_client/spec/spec_helper.rb
index <HASH>..<HASH> 100644
--- a/blobstore_client/spec/spec_helper.rb
+++ b/blobstore_client/spec/spec_helper.rb
@@ -1,5 +1,8 @@
 $:.unshift(File.expand_path("../../lib", __FILE__))
 
+require "bundler"
+require "bundler/setup"
+
 require "blobstore_client"
 
 Bundler.require(:test)
bundler <I> for blobstore client