diff --git a/lib/fog/hp.rb b/lib/fog/hp.rb
index 9026fa3a9..f232d6931 100644
--- a/lib/fog/hp.rb
+++ b/lib/fog/hp.rb
@@ -107,7 +107,7 @@ module Fog
       @hp_secret_key = options[:hp_secret_key]
       @hp_tenant_id  = options[:hp_tenant_id]
       @hp_service_type  = options[:hp_service_type]
-      @hp_avl_zone   = options[:hp_avl_zone] || :az1
+      @hp_avl_zone   = options[:hp_avl_zone]
 
       ### Decide which auth style to use
       unless (@hp_use_upass_auth_style)
diff --git a/lib/fog/hp/cdn.rb b/lib/fog/hp/cdn.rb
index 5f029b175..e15dbead6 100644
--- a/lib/fog/hp/cdn.rb
+++ b/lib/fog/hp/cdn.rb
@@ -5,7 +5,7 @@ module Fog
   module CDN
     class HP < Fog::Service
 
-      requires    :hp_secret_key, :hp_account_id, :hp_tenant_id
+      requires    :hp_secret_key, :hp_account_id, :hp_tenant_id, :hp_avl_zone
       recognizes  :hp_auth_uri, :hp_cdn_uri, :persistent, :connection_options, :hp_use_upass_auth_style, :hp_auth_version
 
       model_path   'fog/hp/models/cdn'
diff --git a/lib/fog/hp/storage.rb b/lib/fog/hp/storage.rb
index 54e89f144..e04867c4b 100644
--- a/lib/fog/hp/storage.rb
+++ b/lib/fog/hp/storage.rb
@@ -5,7 +5,7 @@ module Fog
   module Storage
     class HP < Fog::Service
 
-      requires    :hp_secret_key, :hp_account_id, :hp_tenant_id
+      requires    :hp_secret_key, :hp_account_id, :hp_tenant_id, :hp_avl_zone
       recognizes  :hp_auth_uri, :hp_servicenet, :hp_cdn_ssl, :hp_cdn_uri, :persistent, :connection_options, :hp_use_upass_auth_style, :hp_auth_version
 
       model_path 'fog/hp/models/storage'
@@ -37,6 +37,7 @@ module Fog
               :hp_auth_uri    => @hp_auth_uri,
               :hp_cdn_uri     => @hp_cdn_uri,
               :hp_tenant_id   => @hp_tenant_id,
+              :hp_avl_zone    => @hp_avl_zone,
               :connection_options => @connection_options
             )
             if @cdn.enabled?
@@ -137,6 +138,7 @@ module Fog
           ### Pass the service type for object storage to the authentication call
           options[:hp_service_type] = "object-store"
           @hp_tenant_id = options[:hp_tenant_id]
+          @hp_avl_zone  = options[:hp_avl_zone]
 
           ### Make the authentication call
           if (auth_version == :v2)
diff --git a/tests/hp/models/compute/address_tests.rb b/tests/hp/models/compute/address_tests.rb
index fc34603f8..9e18066e2 100644
--- a/tests/hp/models/compute/address_tests.rb
+++ b/tests/hp/models/compute/address_tests.rb
@@ -1,6 +1,10 @@
 Shindo.tests("Fog::Compute[:hp] | address", ['hp']) do
 
+<<<<<<< HEAD
   @base_image_id = ENV["BASE_IMAGE_ID"] ||= "1242"
+=======
+  @base_image_id = ENV["BASE_IMAGE_ID"] || 1242
+>>>>>>> cs_auth
 
   model_tests(Fog::Compute[:hp].addresses, {}, true) do
 
diff --git a/tests/hp/requests/compute/address_tests.rb b/tests/hp/requests/compute/address_tests.rb
index 54a51ab09..305c0a04f 100644
--- a/tests/hp/requests/compute/address_tests.rb
+++ b/tests/hp/requests/compute/address_tests.rb
@@ -7,7 +7,11 @@ Shindo.tests('Fog::Compute[:hp] | address requests', ['hp']) do
     'id'          => Integer
   }
 
+<<<<<<< HEAD
   @base_image_id = ENV["BASE_IMAGE_ID"] ||= "1242"
+=======
+  @base_image_id = ENV["BASE_IMAGE_ID"] || 1242
+>>>>>>> cs_auth
 
   tests('success') do
 
diff --git a/tests/hp/requests/compute/image_tests.rb b/tests/hp/requests/compute/image_tests.rb
index 954b1827f..437de70f8 100644
--- a/tests/hp/requests/compute/image_tests.rb
+++ b/tests/hp/requests/compute/image_tests.rb
@@ -18,7 +18,11 @@ Shindo.tests('Fog::Compute[:hp] | image requests', ['hp']) do
     'name'      => String
   }
 
+<<<<<<< HEAD
   @base_image_id = ENV["BASE_IMAGE_ID"] ||= "1242"
+=======
+  @base_image_id = ENV["BASE_IMAGE_ID"] || 1242
+>>>>>>> cs_auth
 
   tests('success') do
     @server_name = "fogservertest"
diff --git a/tests/hp/requests/compute/server_address_tests.rb b/tests/hp/requests/compute/server_address_tests.rb
index 097615e6e..b60fc5c1a 100644
--- a/tests/hp/requests/compute/server_address_tests.rb
+++ b/tests/hp/requests/compute/server_address_tests.rb
@@ -1,6 +1,10 @@
 Shindo.tests('Fog::Compute[:hp] | address requests', ['hp']) do
 
+<<<<<<< HEAD
   @base_image_id = ENV["BASE_IMAGE_ID"] ||= "1242"
+=======
+  @base_image_id = ENV["BASE_IMAGE_ID"] || 1242
+>>>>>>> cs_auth
 
   tests('success') do
     @server = Fog::Compute[:hp].servers.create(:name => 'fogaddresstests', :flavor_id => 100, :image_id => @base_image_id)
diff --git a/tests/hp/requests/compute/server_tests.rb b/tests/hp/requests/compute/server_tests.rb
index 6779ab393..ab14261d0 100644
--- a/tests/hp/requests/compute/server_tests.rb
+++ b/tests/hp/requests/compute/server_tests.rb
@@ -34,7 +34,11 @@ Shindo.tests('Fog::Compute[:hp] | server requests', ['hp']) do
     'output' => String
   }
 
+<<<<<<< HEAD
   @base_image_id = ENV["BASE_IMAGE_ID"] ||= "1242"
+=======
+  @base_image_id = ENV["BASE_IMAGE_ID"] || 1242
+>>>>>>> cs_auth
 
   tests('success') do