diff --git a/launchable/version.py b/launchable/version.py
index 61506020f..282e81042 100644
--- a/launchable/version.py
+++ b/launchable/version.py
@@ -1,7 +1,7 @@
-from pkg_resources import DistributionNotFound, get_distribution
+from importlib_metadata import PackageNotFoundError, version
 
 try:
-    __version__ = get_distribution("launchable").version
-except DistributionNotFound:
+    __version__ = version("launchable")
+except PackageNotFoundError:
     # package is not installed
     pass
diff --git a/setup.cfg b/setup.cfg
index fb438442e..d86cc5b35 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,6 +24,7 @@ install_requires =
     more_itertools>=7.1.0;python_version>='3.6'
     python-dateutil
     tabulate
+    importlib-metadata
 python_requires = >=3.6
 setup_requires =
     setuptools-scm
diff --git a/tests/commands/test_api_error.py b/tests/commands/test_api_error.py
index 97fdff4ee..7c8cd16fd 100644
--- a/tests/commands/test_api_error.py
+++ b/tests/commands/test_api_error.py
@@ -98,7 +98,7 @@ def test_record_commit(self):
             self.assertEqual(result.exception, None)
 
         server.shutdown()
-        thread.join()
+        thread.join(timeout=3)
 
     @responses.activate
     @mock.patch.dict(os.environ, {"LAUNCHABLE_TOKEN": CliTestCase.launchable_token})
@@ -134,7 +134,7 @@ def test_record_build(self):
             self.assert_tracking_count(tracking=tracking, count=3)
 
         success_server.shutdown()
-        thread.join()
+        thread.join(timeout=3)
 
         # case: exe.jar catches error
         error_server = HTTPServer(("", 0), ErrorCommitHandlerMock)
@@ -168,7 +168,7 @@ def test_record_build(self):
             self.assert_tracking_count(tracking=tracking, count=3)
 
         error_server.shutdown()
-        thread.join()
+        thread.join(timeout=3)
 
     @responses.activate
     @mock.patch.dict(os.environ, {"LAUNCHABLE_TOKEN": CliTestCase.launchable_token})