diff --git a/salt/cli/key.py b/salt/cli/key.py
index d89c3c3b174a..1454a2b43c48 100644
--- a/salt/cli/key.py
+++ b/salt/cli/key.py
@@ -2,6 +2,7 @@
 from __future__ import print_function
 from __future__ import absolute_import
 
+
 from salt.utils import parsers
 from salt.utils.verify import check_user, verify_log
 
diff --git a/salt/cli/salt.py b/salt/cli/salt.py
index a00d8a21f996..1fc9a8350823 100644
--- a/salt/cli/salt.py
+++ b/salt/cli/salt.py
@@ -2,8 +2,9 @@
 
 # Import python libs
 from __future__ import absolute_import, print_function
-import os
 import sys
+sys.modules['pkg_resources'] = None
+import os
 
 # Import Salt libs
 from salt.ext.six import string_types