diff --git a/acceptance/tests/environment/use_agent_environment_when_enc_doesnt_specify.rb b/acceptance/tests/environment/use_agent_environment_when_enc_doesnt_specify.rb
new file mode 100644
index 000000000..14d4386f4
--- /dev/null
+++ b/acceptance/tests/environment/use_agent_environment_when_enc_doesnt_specify.rb
@@ -0,0 +1,40 @@
+test_name "Agent should use agent environment if there is an enc that does not specify the environment"
+
+testdir = master.tmpdir('use_agent_env')
+
+create_remote_file master, "#{testdir}/enc.rb", <<END
+#!/usr/bin/env ruby
+puts <<YAML
+parameters:
+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"
+
+[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}"