8 files changed, 9 insertions, 9 deletions
diff --git a/spec/integration/knife/client_create_spec.rb b/spec/integration/knife/client_create_spec.rb
index d24755a48a..86609a63cd 100644
--- a/spec/integration/knife/client_create_spec.rb
+++ b/spec/integration/knife/client_create_spec.rb
@@ -44,7 +44,7 @@ EOM
     it "refuses to add an existing client" do
       pending "Knife client create must not blindly overwrite an existing client"
       knife("client create -k bah").should_succeed stderr: out
-      expect { knife("client create -k bah") }.to raise_error(Net::HTTPServerException)
+      expect { knife("client create -k bah") }.to raise_error(Net::HTTPClientException)
     end
 
     it "saves the private key to a file" do
diff --git a/spec/integration/knife/client_key_create_spec.rb b/spec/integration/knife/client_key_create_spec.rb
index b588afbe50..7ccec8bffd 100644
--- a/spec/integration/knife/client_key_create_spec.rb
+++ b/spec/integration/knife/client_key_create_spec.rb
@@ -43,7 +43,7 @@ describe "knife client key create", :workstation do
 
     it "refuses to add an already existing key" do
       knife("client key create -k new bah")
-      expect { knife("client key create -k new bah") }.to raise_error(Net::HTTPServerException)
+      expect { knife("client key create -k new bah") }.to raise_error(Net::HTTPClientException)
     end
 
     it "saves the private key to a file" do
diff --git a/spec/integration/knife/cookbook_download_spec.rb b/spec/integration/knife/cookbook_download_spec.rb
index 57174a1548..2dbf9e5ae5 100644
--- a/spec/integration/knife/cookbook_download_spec.rb
+++ b/spec/integration/knife/cookbook_download_spec.rb
@@ -49,7 +49,7 @@ EOM
     end
 
     it "knife cookbook download with an unknown version raises an error" do
-      expect { knife("cookbook download -d #{tmpdir} x 1.0.0") }.to raise_error(Net::HTTPServerException)
+      expect { knife("cookbook download -d #{tmpdir} x 1.0.0") }.to raise_error(Net::HTTPClientException)
     end
   end
 
diff --git a/spec/integration/knife/cookbook_show_spec.rb b/spec/integration/knife/cookbook_show_spec.rb
index fe7e6fa930..a8e87204e4 100644
--- a/spec/integration/knife/cookbook_show_spec.rb
+++ b/spec/integration/knife/cookbook_show_spec.rb
@@ -138,11 +138,11 @@ EOM
     end
 
     it "knife cookbook show with a non-existent version displays an error" do
-      expect { knife("cookbook show x 1.0.1") }.to raise_error(Net::HTTPServerException)
+      expect { knife("cookbook show x 1.0.1") }.to raise_error(Net::HTTPClientException)
     end
 
     it "knife cookbook show with a non-existent cookbook displays an error" do
-      expect { knife("cookbook show y") }.to raise_error(Net::HTTPServerException)
+      expect { knife("cookbook show y") }.to raise_error(Net::HTTPClientException)
     end
   end
 end
diff --git a/spec/integration/knife/data_bag_create_spec.rb b/spec/integration/knife/data_bag_create_spec.rb
index dc61d55fd5..5ee7a2f00d 100644
--- a/spec/integration/knife/data_bag_create_spec.rb
+++ b/spec/integration/knife/data_bag_create_spec.rb
@@ -49,7 +49,7 @@ describe "knife data bag create", :workstation do
 
     it "fails to add an existing item" do
       knife("data bag create foo bar").should_succeed stdout: out, stderr: err
-      expect { knife("data bag create foo bar") }.to raise_error(Net::HTTPServerException)
+      expect { knife("data bag create foo bar") }.to raise_error(Net::HTTPClientException)
     end
   end
 end
diff --git a/spec/integration/knife/environment_create_spec.rb b/spec/integration/knife/environment_create_spec.rb
index 03fd4e63f7..2647a08f8b 100644
--- a/spec/integration/knife/environment_create_spec.rb
+++ b/spec/integration/knife/environment_create_spec.rb
@@ -33,7 +33,7 @@ describe "knife environment create", :workstation do
     it "refuses to add an existing environment" do
       pending "Knife environment create must not blindly overwrite an existing environment"
       knife("environment create bah").should_succeed out
-      expect { knife("environment create bah") }.to raise_error(Net::HTTPServerException)
+      expect { knife("environment create bah") }.to raise_error(Net::HTTPClientException)
     end
 
   end
diff --git a/spec/integration/knife/node_create_spec.rb b/spec/integration/knife/node_create_spec.rb
index 93a2f9ce6f..36778b3dfa 100644
--- a/spec/integration/knife/node_create_spec.rb
+++ b/spec/integration/knife/node_create_spec.rb
@@ -39,7 +39,7 @@ describe "knife node create", :workstation do
     it "refuses to add an existing node" do
       pending "Knife node create must not blindly overwrite an existing node"
       knife("node create bah").should_succeed out
-      expect { knife("node create bah") }.to raise_error(Net::HTTPServerException)
+      expect { knife("node create bah") }.to raise_error(Net::HTTPClientException)
     end
 
   end
diff --git a/spec/integration/knife/role_create_spec.rb b/spec/integration/knife/role_create_spec.rb
index 941eaf5cb6..54ade9de09 100644
--- a/spec/integration/knife/role_create_spec.rb
+++ b/spec/integration/knife/role_create_spec.rb
@@ -33,7 +33,7 @@ describe "knife role create", :workstation do
     it "refuses to add an existing role" do
       pending "Knife role create must not blindly overwrite an existing role"
       knife("role create bah").should_succeed out
-      expect { knife("role create bah") }.to raise_error(Net::HTTPServerException)
+      expect { knife("role create bah") }.to raise_error(Net::HTTPClientException)
     end
 
   end