diff --git a/acceptance/tests/environment/use_agent_environment_when_no_enc.rb b/acceptance/tests/environment/use_agent_environment_when_no_enc.rb
new file mode 100644
index 000000000..87be8b3e7
--- /dev/null
+++ b/acceptance/tests/environment/use_agent_environment_when_no_enc.rb
@@ -0,0 +1,30 @@
+test_name "Agent should use agent environment if there is no enc-specified environment"
+
+testdir = master.tmpdir('use_agent_env')
+
+create_remote_file master, "#{testdir}/puppet.conf", <<END
+[main]
+manifest = "#{testdir}/site.pp"
+
+[production]
+manifest = "#{testdir}/different.pp"
+
+[more_different]
+manifest = "#{testdir}/more_different.pp"
+END
+
+create_remote_file(master, "#{testdir}/different.pp", 'notify { "production environment": }')
+create_remote_file(master, "#{testdir}/more_different.pp", 'notify { "more_different_string": }')
+
+on master, "chown -R root:puppet #{testdir}"
+on master, "chmod -R g+rwX #{testdir}"
+
+with_master_running_on(master, "--config #{testdir}/puppet.conf --daemonize --dns_alt_names=\"puppet,$(hostname -s),$(hostname -f)\" --autosign true") do
+
+  agents.each do |agent|
+    run_agent_on(agent, "--no-daemonize --onetime --server #{master} --verbose --environment more_different")
+    assert_match(/more_different_string/, stdout, "Did not find more_different_string from \"more_different\" environment")
+  end
+end
+
+on master, "rm -rf #{testdir}"
diff --git a/acceptance/tests/environment/use_enc_environment.rb b/acceptance/tests/environment/use_enc_environment.rb
new file mode 100644
index 000000000..553e1ad89
--- /dev/null
+++ b/acceptance/tests/environment/use_enc_environment.rb
@@ -0,0 +1,37 @@
+test_name "Agent should environment given by ENC"
+
+testdir = master.tmpdir('use_enc_env')
+
+create_remote_file master, "#{testdir}/enc.rb", <<END
+#!/usr/bin/env ruby
+puts <<YAML
+parameters:
+environment: special
+YAML
+END
+on master, "chmod 755 #{testdir}/enc.rb"
+
+create_remote_file master, "#{testdir}/puppet.conf", <<END
+[main]
+node_terminus = exec
+external_nodes = "#{testdir}/enc.rb"
+manifest = "#{testdir}/site.pp"
+
+[special]
+manifest = "#{testdir}/different.pp"
+END
+
+create_remote_file(master, "#{testdir}/different.pp", 'notify { "expected_string": }')
+
+on master, "chown -R root:puppet #{testdir}"
+on master, "chmod -R g+rwX #{testdir}"
+
+with_master_running_on(master, "--config #{testdir}/puppet.conf --daemonize --dns_alt_names=\"puppet,$(hostname -s),$(hostname -f)\" --autosign true") do
+
+  agents.each do |agent|
+    run_agent_on(agent, "--no-daemonize --onetime --server #{master} --verbose")
+    assert_match(/expected_string/, stdout, "Did not find expected_string from \"special\" environment")
+  end
+end
+
+on master, "rm -rf #{testdir}"
diff --git a/acceptance/tests/environment/use_enc_environment_for_files.rb b/acceptance/tests/environment/use_enc_environment_for_files.rb
new file mode 100644
index 000000000..b921fa90f
--- /dev/null
+++ b/acceptance/tests/environment/use_enc_environment_for_files.rb
@@ -0,0 +1,52 @@
+test_name "Agent should environment given by ENC for pluginsync"
+
+testdir = master.tmpdir('respect_enc_test')
+
+create_remote_file master, "#{testdir}/enc.rb", <<END
+#!/usr/bin/env ruby
+puts <<YAML
+parameters:
+environment: special
+YAML
+END
+on master, "chmod 755 #{testdir}/enc.rb"
+
+create_remote_file master, "#{testdir}/puppet.conf", <<END
+[main]
+node_terminus = exec
+external_nodes = "#{testdir}/enc.rb"
+
+[special]
+modulepath = "#{testdir}/special"
+manifest = "#{testdir}/different.pp"
+END
+
+on master, "mkdir -p #{testdir}/modules"
+# Create a plugin file on the master
+on master, "mkdir -p #{testdir}/special/amod/files"
+create_remote_file(master, "#{testdir}/special/amod/files/testy", "special_environment")
+
+on master, "chown -R root:puppet #{testdir}"
+on master, "chmod -R g+rwX #{testdir}"
+
+with_master_running_on(master, "--config #{testdir}/puppet.conf --daemonize --dns_alt_names=\"puppet,$(hostname -s),$(hostname -f)\" --autosign true") do
+
+  agents.each do |agent|
+    atmp = agent.tmpdir('respect_enc_test')
+    create_remote_file master, "#{testdir}/different.pp", <<END
+file { "#{atmp}/special_testy":
+  source => "puppet:///amod/testy",
+}
+
+notify { "mytemp is ${::mytemp}": }
+END
+    on master, "chmod 644 #{testdir}/different.pp"
+
+    run_agent_on(agent, "--no-daemonize --onetime --server #{master} --verbose")
+    on agent, "cat #{atmp}/special_testy"
+    assert_match(/special_environment/, stdout, "The file from environment 'special' was not found")
+    on agent, "rm -rf #{atmp}"
+  end
+end
+
+on master, "rm -rf #{testdir}"
diff --git a/acceptance/tests/environment/use_enc_environment_for_pluginsync.rb b/acceptance/tests/environment/use_enc_environment_for_pluginsync.rb
new file mode 100644
index 000000000..d447daad0
--- /dev/null
+++ b/acceptance/tests/environment/use_enc_environment_for_pluginsync.rb
@@ -0,0 +1,41 @@
+test_name "Agent should use environment given by ENC for pluginsync"
+
+testdir = master.tmpdir('respect_enc_test')
+
+create_remote_file master, "#{testdir}/enc.rb", <<END
+#!/usr/bin/env ruby
+puts <<YAML
+parameters:
+environment: special
+YAML
+END
+on master, "chmod 755 #{testdir}/enc.rb"
+
+create_remote_file master, "#{testdir}/puppet.conf", <<END
+[main]
+node_terminus = exec
+external_nodes = "#{testdir}/enc.rb"
+
+[special]
+modulepath = "#{testdir}/special"
+END
+
+on master, "mkdir -p #{testdir}/modules"
+# Create a plugin file on the master
+on master, "mkdir -p #{testdir}/special/amod/lib/puppet"
+create_remote_file(master, "#{testdir}/special/amod/lib/puppet/foo.rb", "#special_version")
+
+on master, "chown -R root:puppet #{testdir}"
+on master, "chmod -R g+rwX #{testdir}"
+
+with_master_running_on(master, "--config #{testdir}/puppet.conf --daemonize --dns_alt_names=\"puppet,$(hostname -s),$(hostname -f)\" --autosign true") do
+
+  agents.each do |agent|
+    run_agent_on(agent, "--no-daemonize --onetime --server #{master}")
+    on agent, "cat #{agent['puppetvardir']}/lib/puppet/foo.rb"
+    assert_match(/#special_version/, stdout, "The plugin from environment 'special' was not synced")
+    on agent, "rm -rf #{agent['puppetvardir']}/lib"
+  end
+end
+
+on master, "rm -rf #{testdir}"