diff --git a/lib/fog/rackspace/core.rb b/lib/fog/rackspace/core.rb
index a264020a0..3fa6a2481 100644
--- a/lib/fog/rackspace/core.rb
+++ b/lib/fog/rackspace/core.rb
@@ -101,7 +101,7 @@ module Fog
 
     def self.authenticate(options, connection_options = {})
       rackspace_auth_url = options[:rackspace_auth_url]
-      rackspace_auth_url ||= options[:rackspace_endpoint] == Fog::Compute::RackspaceV2::LON_ENDPOINT ? "lon.auth.api.rackspacecloud.com" : "auth.api.rackspacecloud.com"
+      rackspace_auth_url ||= options[:rackspace_endpoint] == Fog::Compute::RackspaceV2::LON_ENDPOINT ? UK_AUTH_ENDPOINT : US_AUTH_ENDPOINT
       url = rackspace_auth_url.match(/^https?:/) ? \
                 rackspace_auth_url : 'https://' + rackspace_auth_url
       uri = URI.parse(url)
diff --git a/tests/rackspace/cdn_tests.rb b/tests/rackspace/cdn_tests.rb
index 37f875b4a..b524c201e 100644
--- a/tests/rackspace/cdn_tests.rb
+++ b/tests/rackspace/cdn_tests.rb
@@ -132,7 +132,7 @@ Shindo.tests('Fog::CDN::Rackspace', ['rackspace']) do
     
   begin      
     tests('publish_container').succeeds do
-      returns(nil, "CDN is not enabled") { container_meta_attributes['X-CDN-Enabled'] }
+      returns("False", "CDN is not enabled") { container_meta_attributes['X-CDN-Enabled'] }
       urls = @cdn.publish_container @directory
       returns(true, "hash contains expected urls") { Fog::CDN::Rackspace::Base::URI_HEADERS.values.all? { |url_type| urls[url_type] } }
       returns("True", "CDN is enabled") { container_meta_attributes['X-Cdn-Enabled'] }