3 files changed, 4 insertions, 34 deletions
diff --git a/spec/functional/http/simple_spec.rb b/spec/functional/http/simple_spec.rb
index 562c037bb0..e835bb0c79 100644
--- a/spec/functional/http/simple_spec.rb
+++ b/spec/functional/http/simple_spec.rb
@@ -32,8 +32,8 @@ describe Chef::HTTP::Simple do
 
   before(:each) do
     Chef::Config[:rest_timeout] = 2
-    Chef::Config[:http_retry_delay] = 0
-    Chef::Config[:http_retry_count] = 0
+    Chef::Config[:http_retry_delay] = 1
+    Chef::Config[:http_retry_count] = 2
   end
 
   after(:all) do
diff --git a/spec/functional/mixin/shell_out_spec.rb b/spec/functional/mixin/shell_out_spec.rb
index b3e9bf796d..df428afdcd 100644
--- a/spec/functional/mixin/shell_out_spec.rb
+++ b/spec/functional/mixin/shell_out_spec.rb
@@ -20,36 +20,6 @@ require "spec_helper"
 describe Chef::Mixin::ShellOut do
   include Chef::Mixin::ShellOut
 
-  describe "shell_out_with_systems_locale" do
-    before do
-      Chef::Config[:treat_deprecation_warnings_as_errors] = false
-    end
-
-    describe "when environment['LC_ALL'] is not set" do
-      it "should use the default shell_out setting" do
-        cmd = if windows?
-                shell_out_with_systems_locale("echo %LC_ALL%")
-              else
-                shell_out_with_systems_locale("echo $LC_ALL")
-              end
-
-        expect(cmd.stdout.chomp).to match_environment_variable("LC_ALL")
-      end
-    end
-
-    describe "when environment['LC_ALL'] is set" do
-      it "should use the option's setting" do
-        cmd = if windows?
-                shell_out_with_systems_locale("echo %LC_ALL%", environment: { "LC_ALL" => "POSIX" })
-              else
-                shell_out_with_systems_locale("echo $LC_ALL", environment: { "LC_ALL" => "POSIX" })
-              end
-
-        expect(cmd.stdout.chomp).to eq "POSIX"
-      end
-    end
-  end
-
   describe "shell_out default_env: false" do
     describe "when environment['LC_ALL'] is not set" do
       it "should use the default shell_out setting" do
diff --git a/spec/functional/resource/remote_file_spec.rb b/spec/functional/resource/remote_file_spec.rb
index a121cbb1f3..44a7a46d68 100644
--- a/spec/functional/resource/remote_file_spec.rb
+++ b/spec/functional/resource/remote_file_spec.rb
@@ -29,8 +29,8 @@ describe Chef::Resource::RemoteFile do
     @old_file_cache = Chef::Config[:file_cache_path]
     Chef::Config[:file_cache_path] = file_cache_path
     Chef::Config[:rest_timeout] = 2
-    Chef::Config[:http_retry_delay] = 0
-    Chef::Config[:http_retry_count] = 0
+    Chef::Config[:http_retry_delay] = 1
+    Chef::Config[:http_retry_count] = 2
   end
 
   after(:each) do