diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix
index a9efd42dc9d2fe..d5f49fca5e2aad 100644
--- a/pkgs/development/python-modules/keystoneauth1/default.nix
+++ b/pkgs/development/python-modules/keystoneauth1/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchPypi,
   betamax,
+  fixtures,
   hacking,
   iso8601,
   lxml,
@@ -17,21 +18,21 @@
   requests-kerberos,
   requests-mock,
   setuptools,
-  six,
   stestr,
   stevedore,
   testresources,
   testtools,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "keystoneauth1";
-  version = "5.8.0";
+  version = "5.9.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-MVfCEuEhFk3mTWPl734dqtK9NkmmjeHpcbdodwGe8cQ=";
+    hash = "sha256-+wxm2ELVuWR1ImT/8gs7Src2ENZtm40g0Nz3lroJ3EM=";
   };
 
   postPatch = ''
@@ -43,29 +44,33 @@ buildPythonPackage rec {
   build-system = [ setuptools ];
 
   dependencies = [
-    betamax
     iso8601
-    lxml
-    oauthlib
     os-service-types
     pbr
     requests
-    requests-kerberos
-    six
     stevedore
-  ];
+    typing-extensions
+  ]
+  # TODO: remove this workaround and fix breakages
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
+
+  optional-dependencies = {
+    betamax = [ betamax fixtures pyyaml ];
+    kerberos = [ requests-kerberos ];
+    oauth1 = [ oauthlib ];
+    saml2 = [ lxml ];
+  };
 
   nativeCheckInputs = [
     hacking
     oslo-config
     oslo-utils
     pycodestyle
-    pyyaml
     requests-mock
     stestr
     testresources
     testtools
-  ];
+  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   # test_keystoneauth_betamax_fixture is incompatible with urllib3 2.0.0
   # https://bugs.launchpad.net/keystoneauth/+bug/2020112