diff --git a/jedi/_compatibility.py b/jedi/_compatibility.py
index 985233d7..a74e87ce 100644
--- a/jedi/_compatibility.py
+++ b/jedi/_compatibility.py
@@ -216,11 +216,6 @@ try:
 except ImportError:
     from itertools import izip_longest as zip_longest  # Python 2  # noqa: F401
 
-try:
-    FileNotFoundError = FileNotFoundError
-except NameError:
-    FileNotFoundError = IOError
-
 try:
     IsADirectoryError = IsADirectoryError
 except NameError:
diff --git a/jedi/api/file_name.py b/jedi/api/file_name.py
index addf4bb6..9a102c1a 100644
--- a/jedi/api/file_name.py
+++ b/jedi/api/file_name.py
@@ -1,6 +1,6 @@
 import os
 
-from jedi._compatibility import FileNotFoundError, force_unicode
+from jedi._compatibility import force_unicode
 from jedi.api import classes
 from jedi.api.strings import StringName, get_quote_ending
 from jedi.api.helpers import match
diff --git a/jedi/api/project.py b/jedi/api/project.py
index d506aae7..4103d37f 100644
--- a/jedi/api/project.py
+++ b/jedi/api/project.py
@@ -12,7 +12,7 @@ import errno
 import json
 import sys
 
-from jedi._compatibility import FileNotFoundError, PermissionError, \
+from jedi._compatibility import PermissionError, \
     IsADirectoryError, NotADirectoryError
 from jedi import debug
 from jedi.api.environment import get_cached_default_environment, create_environment
diff --git a/jedi/file_io.py b/jedi/file_io.py
index c4a5d24a..b3327898 100644
--- a/jedi/file_io.py
+++ b/jedi/file_io.py
@@ -71,7 +71,7 @@ class ZipFileIO(file_io.KnownContentFileIO, FileIOFolderMixin):
     def get_last_modified(self):
         try:
             return os.path.getmtime(self._zip_path)
-        except OSError:  # Python 3 would probably only need FileNotFoundError
+        except (FileNotFoundError, PermissionError):
             return None
 
 
diff --git a/jedi/inference/gradual/typeshed.py b/jedi/inference/gradual/typeshed.py
index 9f8edc55..a4a4ff5e 100644
--- a/jedi/inference/gradual/typeshed.py
+++ b/jedi/inference/gradual/typeshed.py
@@ -5,7 +5,7 @@ from collections import namedtuple
 
 from jedi import settings
 from jedi.file_io import FileIO
-from jedi._compatibility import FileNotFoundError, cast_path
+from jedi._compatibility import cast_path
 from jedi.parser_utils import get_cached_code_lines
 from jedi.inference.base_value import ValueSet, NO_VALUES
 from jedi.inference.gradual.stub_value import TypingModuleWrapper, StubModuleValue
@@ -38,8 +38,7 @@ def _create_stub_map(directory_path_info):
     def generate():
         try:
             listed = os.listdir(directory_path_info.path)
-        except (FileNotFoundError, OSError):
-            # OSError is Python 2
+        except FileNotFoundError:
             return
 
         for entry in listed:
diff --git a/jedi/inference/imports.py b/jedi/inference/imports.py
index cd2acbd6..6de851f0 100644
--- a/jedi/inference/imports.py
+++ b/jedi/inference/imports.py
@@ -13,7 +13,7 @@ import os
 from parso.python import tree
 from parso.tree import search_ancestor
 
-from jedi._compatibility import ImplicitNSInfo, force_unicode, FileNotFoundError
+from jedi._compatibility import ImplicitNSInfo, force_unicode
 from jedi import debug
 from jedi import settings
 from jedi.file_io import FolderIO
diff --git a/jedi/inference/references.py b/jedi/inference/references.py
index 4a1321ed..963a16d3 100644
--- a/jedi/inference/references.py
+++ b/jedi/inference/references.py
@@ -3,7 +3,6 @@ import re
 
 from parso import python_bytes_to_unicode
 
-from jedi._compatibility import FileNotFoundError
 from jedi.debug import dbg
 from jedi.file_io import KnownContentFileIO
 from jedi.inference.imports import SubModuleName, load_module_from_path
diff --git a/jedi/plugins/pytest.py b/jedi/plugins/pytest.py
index f9b04284..671b18ed 100644
--- a/jedi/plugins/pytest.py
+++ b/jedi/plugins/pytest.py
@@ -1,5 +1,4 @@
 from parso.python.tree import search_ancestor
-from jedi._compatibility import FileNotFoundError
 from jedi.inference.cache import inference_state_method_cache
 from jedi.inference.imports import load_module_from_path
 from jedi.inference.filters import ParserTreeFilter