diff --git a/lib/fog/google/compute.rb b/lib/fog/google/compute.rb
index f54db6fd3..faa46aaad 100644
--- a/lib/fog/google/compute.rb
+++ b/lib/fog/google/compute.rb
@@ -1,6 +1,5 @@
 require 'fog/google'
 require 'fog/compute'
-require 'fog/google/oauth/oauth_util'
 require 'google/api_client'
 
 module Fog
@@ -8,6 +7,8 @@ module Fog
     class Google < Fog::Service
 
       requires :google_project
+      requires :google_client_email
+      requires :google_key_location
 
       request_path 'fog/google/requests/compute'
       request :list_servers
@@ -71,13 +72,24 @@ module Fog
           api_scope_url = 'https://www.googleapis.com/auth/compute'
 
           @project = options[:google_project]
+          google_client_email = options[:google_client_email]
           @api_url = base_url + api_version + '/projects/'
+          key = ::Google::APIClient::KeyUtils.load_from_pkcs12(options[:google_key_location], 'notasecret')
+
           @client = ::Google::APIClient.new
+          @client.authorization = Signet::OAuth2::Client.new(
+            :audience => 'https://accounts.google.com/o/oauth2/token',
+            :auth_provider_x509_cert_url => "https://www.googleapis.com/oauth2/v1/certs",
+            :client_x509_cert_url => "https://www.googleapis.com/robot/v1/metadata/x509/#{google_client_email}",
+            :issuer => google_client_email,
+            :scope => api_scope_url,
+            :signing_key => key,
+            :token_credential_uri => 'https://accounts.google.com/o/oauth2/token',
+          )
+          @client.authorization.fetch_access_token!
+
           @compute = @client.discovered_api('compute', api_version)
           @default_network = 'default'
-
-          auth_util = CommandLineOAuthHelper.new(api_scope_url)
-          @client.authorization = auth_util.authorize()
         end
 
         def build_result(api_method, parameters, body_object=nil)
diff --git a/lib/fog/google/oauth/oauth_util.rb b/lib/fog/google/oauth/oauth_util.rb
deleted file mode 100644
index ea7eb4995..000000000
--- a/lib/fog/google/oauth/oauth_util.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'google/api_client'
-require 'google/api_client/client_secrets'
-
-# Small helper for the sample apps for performing OAuth 2.0 flows from the
-# command line. Starts an embedded server to handle redirects.
-class CommandLineOAuthHelper
-
-  def initialize(scope)
-    credentials = Google::APIClient::ClientSecrets.load
-    @authorization = Signet::OAuth2::Client.new(
-      :audience => 'https://accounts.google.com/o/oauth2/token',
-      :issuer => "#{crendentials.client_id}@developer.gserviceaccount.com",
-      :redirect_uri => credentials.redirect_uris.first,
-      :scope => scope,
-      :signing_key => credentials.signing_key,
-      :token_credential_uri => credentials.token_credential_uri,
-    )
-    @authorization.fetch_access_token!
-  end
-
-  def authorize
-    return @authorization
-  end
-end