diff --git a/requirements.txt b/requirements.txt
index 33ae7a9d..a22f542b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,3 +9,5 @@ pypandoc
 pytest-benchmark
 pytest-docker-pexpect
 twine
+pathlib2
+importlib
diff --git a/thefuck/conf.py b/thefuck/conf.py
index 611ec84b..e3119320 100644
--- a/thefuck/conf.py
+++ b/thefuck/conf.py
@@ -4,18 +4,13 @@ from warnings import warn
 from six import text_type
 from . import const
 from .system import Path
+import importlib.util
 
-try:
-    import importlib.util
-
-    def load_source(name, pathname, _file=None):
-        module_spec = importlib.util.spec_from_file_location(name, pathname)
-        module = importlib.util.module_from_spec(module_spec)
-        module_spec.loader.exec_module(module)
-        return module
-except ImportError:
-    from imp import load_source
-
+def load_source(name, pathname, _file=None):
+    module_spec = importlib.util.spec_from_file_location(name, pathname)
+    module = importlib.util.module_from_spec(module_spec)
+    module_spec.loader.exec_module(module)
+    return module
 
 class Settings(dict):
     def __getattr__(self, item):
diff --git a/thefuck/system/unix.py b/thefuck/system/unix.py
index 9ae01cf4..c3385983 100644
--- a/thefuck/system/unix.py
+++ b/thefuck/system/unix.py
@@ -3,7 +3,7 @@ import sys
 import tty
 import termios
 import colorama
-from distutils.spawn import find_executable
+from shutil import which
 from .. import const
 
 init_output = colorama.init
@@ -38,7 +38,7 @@ def get_key():
 
 
 def open_command(arg):
-    if find_executable('xdg-open'):
+    if which('xdg-open'):
         return 'xdg-open ' + arg
     return 'open ' + arg