diff --git a/tests/hp/requests/compute_v2/server_tests.rb b/tests/hp/requests/compute_v2/server_tests.rb
new file mode 100644
index 000000000..a146ad8ca
--- /dev/null
+++ b/tests/hp/requests/compute_v2/server_tests.rb
@@ -0,0 +1,126 @@
+Shindo.tests("Fog::Compute::HPV2 | server requests", ['hp', 'v2', 'compute']) do
+
+  service = Fog::Compute.new(:provider => 'HP', :version => :v2)
+
+  @server_format = {
+    'addresses'   => Fog::Nullable::Hash,
+    'flavor'      => Hash,
+    'id'          => String,
+    'image'       => Hash,
+    'links'       => [Hash],
+    'hostId'      => String,
+    'metadata'    => Fog::Nullable::Hash,
+    'name'        => String,
+    'accessIPv4'  => Fog::Nullable::String,
+    'accessIPv6'  => Fog::Nullable::String,
+    'progress'    => Fog::Nullable::Integer,
+    'status'      => String,
+    'created'     => String,
+    'updated'     => String,
+    'user_id'     => String,
+    'tenant_id'   => String,
+    'config_drive' => Fog::Nullable::String,
+    'security_groups' => [Hash],
+    'key_name'    => Fog::Nullable::String
+  }
+
+  @list_servers_format = {
+    'links' => [Hash],
+    'name'  => String,
+    'id'    => String
+  }
+
+  @get_console_output_format = {
+    'output' => String
+  }
+
+  @base_image_id = ENV["BASE_IMAGE_ID"] || "7f60b54c-cd15-433f-8bed-00acbcd25a17"
+
+  tests('success') do
+
+    @server_id = nil
+    @server_name = 'fogservertests'
+
+    tests("#create_server(#{@server_name}, 100, #{@base_image_id})").formats(@server_format.merge('adminPass' => String)) do
+      data = service.create_server(@server_name, 100, @base_image_id).body['server']
+      @server_id = data['id']
+      data
+    end
+
+    #Fog::Compute[:hp].servers.get(@server_id).wait_for { ready? }
+
+    tests("#get_server_details(#{@server_id})").formats(@server_format) do
+      service.get_server_details(@server_id).body['server']
+    end
+
+    tests('#list_servers').formats({'servers' => [@list_servers_format]}) do
+      service.list_servers.body
+    end
+
+    tests('#list_servers_detail').formats({'servers' => [@server_format]}) do
+      service.list_servers_detail.body
+    end
+
+    #Fog::Compute[:hp].servers.get(@server_id).wait_for { ready? }
+
+    tests("#update_server(#{@server_id}, :name => 'fogupdateserver')").succeeds do
+      service.update_server(@server_id, :name => 'fogupdateserver')
+    end
+
+    #Fog::Compute[:hp].servers.get(@server_id).wait_for { ready? }
+
+    #tests("#reboot_server(#{@server_id}, 'SOFT')").succeeds do
+    #  Fog::Compute[:hp].reboot_server(@server_id, 'SOFT')
+    #end
+    #
+    #Fog::Compute[:hp].servers.get(@server_id).wait_for { ready? }
+    #
+    #tests("#reboot_server(#{@server_id}, 'HARD')").succeeds do
+    #  Fog::Compute[:hp].reboot_server(@server_id, 'HARD')
+    #end
+    #
+    #Fog::Compute[:hp].servers.get(@server_id).wait_for { ready? }
+    #
+    #tests("#change_password_server(#{@server_id}, 'new_password')").succeeds do
+    #  Fog::Compute[:hp].change_password_server(@server_id, 'new_password')
+    #end
+    #
+    #Fog::Compute[:hp].servers.get(@server_id).wait_for { ready? }
+    #
+    #tests("#get_console_output('#{@server_id}', 10)").formats(@get_console_output_format) do
+    #  Fog::Compute[:hp].get_console_output(@server_id, 10).body
+    #end
+    #
+    #Fog::Compute[:hp].servers.get(@server_id).wait_for { ready? }
+
+    tests("#delete_server(#{@server_id})").succeeds do
+      service.delete_server(@server_id)
+    end
+
+  end
+
+  tests('failure') do
+
+    tests('#delete_server(0)').raises(Fog::Compute::HPV2::NotFound) do
+      service.delete_server(0)
+    end
+
+    tests('#get_server_details(0)').raises(Fog::Compute::HPV2::NotFound) do
+      service.get_server_details(0)
+    end
+
+    tests("#update_server(0, :name => 'fognonserver')").raises(Fog::Compute::HPV2::NotFound) do
+      service.update_server(0, :name => 'fognonserver')
+    end
+
+    #tests('#reboot_server(0)').raises(Fog::Compute::HPV2::NotFound) do
+    #  service.reboot_server(0)
+    #end
+    #
+    #tests("#change_password_server(0}, 'new_password')").raises(Excon::Errors::InternalServerError) do
+    #  service.change_password_server(0, 'new_password')
+    #end
+
+  end
+
+end