diff --git a/salt/fileclient.py b/salt/fileclient.py
index <HASH>..<HASH> 100644
--- a/salt/fileclient.py
+++ b/salt/fileclient.py
@@ -1023,10 +1023,7 @@ class LocalClient(Client):
         '''
         Return the available environments
         '''
-        ret = []
-        for saltenv in self.opts['file_roots']:
-            ret.append(saltenv)
-        return ret
+        return list(self.opts['file_roots'])
 
     def master_tops(self):
         '''
diff --git a/salt/pillar/__init__.py b/salt/pillar/__init__.py
index <HASH>..<HASH> 100644
--- a/salt/pillar/__init__.py
+++ b/salt/pillar/__init__.py
@@ -469,10 +469,7 @@ class Pillar(object):
         '''
         Pull the file server environments out of the master options
         '''
-        envs = set(['base'])
-        if 'file_roots' in self.opts:
-            envs.update(list(self.opts['file_roots']))
-        return envs
+        return set(['base']) | set(self.opts.get('file_roots', []))
 
     def get_tops(self):
         '''
Simplify envs/_get_envs methods

Use list/set operations instead of iterating over the
self.opts['file_roots'] keys individually.