diff --git a/lib/fog/hp/requests/block_storage/create_volume.rb b/lib/fog/hp/requests/block_storage/create_volume.rb
index e1230478e..a00ce93c0 100644
--- a/lib/fog/hp/requests/block_storage/create_volume.rb
+++ b/lib/fog/hp/requests/block_storage/create_volume.rb
@@ -56,21 +56,21 @@ module Fog
         def create_volume(name, description, size, options={})
           response = Excon::Response.new
           response.status = 200
-          response.body = {
-            'volume' => {
-              'id'                 => Fog::Mock.random_numbers(3).to_i,
-              'displayName'        => name,
-              'displayDescription' => description,
-              'size'               => size,
-              'status'             => 'creating',
-              'snapshotId'         => options['snapshot_id'] || "",
-              'volumeType'         => nil,
-              'availabilityZone'   => 'nova',
-              'createdAt'          => Time.now.to_s,
-              'metadata'           => options['metadata'] || {},
-              'attachments'        => [{}]
-            }
+          data = {
+            'id'                 => Fog::Mock.random_numbers(3).to_i,
+            'displayName'        => name,
+            'displayDescription' => description,
+            'size'               => size,
+            'status'             => 'creating',
+            'snapshotId'         => options['snapshot_id'] || "",
+            'volumeType'         => nil,
+            'availabilityZone'   => 'nova',
+            'createdAt'          => Time.now.to_s,
+            'metadata'           => options['metadata'] || {},
+            'attachments'        => [{}]
           }
+          self.data[:volumes][data['id']] = data
+          response.body = { 'volume' => data }
           response
         end
       end
diff --git a/lib/fog/hp/requests/block_storage/delete_volume.rb b/lib/fog/hp/requests/block_storage/delete_volume.rb
index 058614f73..4be3e6d23 100644
--- a/lib/fog/hp/requests/block_storage/delete_volume.rb
+++ b/lib/fog/hp/requests/block_storage/delete_volume.rb
@@ -23,7 +23,8 @@ module Fog
 
         def delete_volume(volume_id)
           response = Excon::Response.new
-          if volume = self.data[:volumes][volume_id]
+          if self.data[:volumes][volume_id]
+            self.data[:volumes].delete(volume_id)
             response.status = 202
           else
             raise Fog::BlockStorage::HP::NotFound