diff --git a/deployment/puppet/fuel/examples/host.pp b/deployment/puppet/fuel/examples/host.pp
index 6dc9680e41..9a0487141f 100644
--- a/deployment/puppet/fuel/examples/host.pp
+++ b/deployment/puppet/fuel/examples/host.pp
@@ -132,6 +132,7 @@ class { 'osnailyfacter::atop': }
 class { 'osnailyfacter::ssh':
   password_auth  => 'yes',
   listen_address => ['0.0.0.0'],
+  accept_env     => '# LANG LC_*',
 }
 
 class { 'fuel::iptables':
diff --git a/deployment/puppet/osnailyfacter/manifests/ssh.pp b/deployment/puppet/osnailyfacter/manifests/ssh.pp
index 10f494dbbd..1d060f4dbe 100644
--- a/deployment/puppet/osnailyfacter/manifests/ssh.pp
+++ b/deployment/puppet/osnailyfacter/manifests/ssh.pp
@@ -34,6 +34,7 @@ class osnailyfacter::ssh(
   $log_lvl        = 'VERBOSE',
   $password_auth  = 'no',
   $listen_address = [],
+  $accept_env     = 'LANG LC_*',
 ){
 
   case $::osfamily {
@@ -69,6 +70,7 @@ class osnailyfacter::ssh(
       'RSAAuthentication'               => 'yes',
       'UsePrivilegeSeparation'          => 'yes',
       'StrictModes'                     => 'yes',
+      'AcceptEnv'                       => $accept_env,
     }
   }
 
diff --git a/tests/noop/spec/hosts/master/host_spec.rb b/tests/noop/spec/hosts/master/host_spec.rb
index 19da356475..b06d202d32 100644
--- a/tests/noop/spec/hosts/master/host_spec.rb
+++ b/tests/noop/spec/hosts/master/host_spec.rb
@@ -71,6 +71,7 @@ describe manifest do
       parameters = {
           :password_auth  => 'yes',
           :listen_address => ['0.0.0.0'],
+          'accept_env'     => '# LANG LC_*',
       }
       is_expected.to contain_class('osnailyfacter::ssh').with parameters
     end
diff --git a/tests/noop/spec/hosts/tools/tools_spec.rb b/tests/noop/spec/hosts/tools/tools_spec.rb
index 704d98e73a..eef05fc2f2 100644
--- a/tests/noop/spec/hosts/tools/tools_spec.rb
+++ b/tests/noop/spec/hosts/tools/tools_spec.rb
@@ -50,7 +50,9 @@ describe manifest do
 
     it 'should declare tools classes' do
       should contain_class('osnailyfacter::atop')
-      should contain_class('osnailyfacter::ssh')
+      should contain_class('osnailyfacter::ssh').with(
+          'accept_env'     => 'LANG LC_*',
+      )
       should contain_class('osnailyfacter::puppet_pull').with(
         'modules_source'   => puppet['modules'],
         'manifests_source' => puppet['manifests']