diff --git a/neurodamus/__init__.py b/neurodamus/__init__.py
index d48c5aba..ea022fd1 100644
--- a/neurodamus/__init__.py
+++ b/neurodamus/__init__.py
@@ -9,9 +9,9 @@
     `node`, `cell_distributor`, etc; and still depends on several low-level HOC files at runtime.
 """
 from __future__ import absolute_import
-import pkg_resources
+import importlib.metadata
 try:
-    __version__ = pkg_resources.get_distribution(__name__).version
+    __version__ = importlib.metadata.version(__name__)
 except Exception:
     __version__ = 'devel'
 
diff --git a/tests/integration-e2e/test_cli_opts.py b/tests/integration-e2e/test_cli_opts.py
index a74866a2..1b89cdcd 100644
--- a/tests/integration-e2e/test_cli_opts.py
+++ b/tests/integration-e2e/test_cli_opts.py
@@ -35,7 +35,7 @@ def test_save_restore_cli():
             checkpoint_dir = test_folder_path / "output-save" / "checkpoint"
 
             command = ["neurodamus", test_folder_path / CONFIG_FILE_MINI,
-                        "--" + action, checkpoint_dir]
+                        "--" + action + "=" + str(checkpoint_dir)]
             # Save-Restore raises exception when using NEURON
             if simulator == "NEURON":
                 with pytest.raises(subprocess.CalledProcessError):