diff --git a/doc/source/admin/apache.md b/doc/source/admin/apache.md
index 9e32e2d4613..57969815d97 100644
--- a/doc/source/admin/apache.md
+++ b/doc/source/admin/apache.md
@@ -228,7 +228,7 @@ previous section:
     ```yaml
     uwsgi:
         #...
-        socket: unix:///srv/galaxy/var/uwsgi.sock
+        socket: /srv/galaxy/var/uwsgi.sock
         mount: /galaxy=galaxy.webapps.galaxy.buildapp:uwsgi_app()
         manage-script-name: true
         # `module` MUST NOT be set when `mount` is in use
diff --git a/doc/source/admin/nginx.md b/doc/source/admin/nginx.md
index 488c9ce0a08..f73f98a9f67 100644
--- a/doc/source/admin/nginx.md
+++ b/doc/source/admin/nginx.md
@@ -220,7 +220,7 @@ previous section:
     ```yaml
     uwsgi:
         #...
-        socket: unix:///srv/galaxy/var/uwsgi.sock
+        socket: /srv/galaxy/var/uwsgi.sock
         mount: /galaxy=galaxy.webapps.galaxy.buildapp:uwsgi_app()
         manage-script-name: true
         # `module` MUST NOT be set when `mount` is in use
diff --git a/lib/galaxy/tools/__init__.py b/lib/galaxy/tools/__init__.py
index 40374aa62f3..527187af465 100755
--- a/lib/galaxy/tools/__init__.py
+++ b/lib/galaxy/tools/__init__.py
@@ -699,6 +699,10 @@ class Tool(Dictifiable):
         self.home_target = home_target
         self.tmp_target = tmp_target
         self.docker_env_pass_through = tool_source.parse_docker_env_pass_through()
+        if self.environment_variables:
+            if not self.docker_env_pass_through:
+                self.docker_env_pass_through = []
+            self.docker_env_pass_through.extend(map(lambda x: x['name'], self.environment_variables))
 
         # Parameters used to build URL for redirection to external app
         redirect_url_params = tool_source.parse_redirect_url_params_elem()