diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix
index cf794ff891e6..106d4755dd99 100644
--- a/pkgs/development/python-modules/python-manilaclient/default.nix
+++ b/pkgs/development/python-modules/python-manilaclient/default.nix
@@ -1,34 +1,33 @@
 {
   lib,
   buildPythonPackage,
+  callPackage,
+  debtcollector,
   fetchPypi,
-  pbr,
+  keystoneauth1,
   openstackdocstheme,
+  osc-lib,
   oslo-config,
   oslo-log,
   oslo-serialization,
   oslo-utils,
+  pbr,
   prettytable,
   requests,
   setuptools,
   sphinxHook,
   sphinxcontrib-programoutput,
-  babel,
-  osc-lib,
-  python-keystoneclient,
-  debtcollector,
-  callPackage,
 }:
 
 buildPythonPackage rec {
   pname = "python-manilaclient";
-  version = "5.7.1";
+  version = "6.0.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "python_manilaclient";
     inherit version;
-    hash = "sha256-BdFUVnvSX7yitHSlP/GzD2jzvF8vh9B4QVVQrqYwW9Q=";
+    hash = "sha256-EQwsbwZzFXE+KKDH2SxlC6G8oFvdXo2bK4bJKJZfrVw=";
   };
 
   build-system = [
@@ -41,17 +40,16 @@ buildPythonPackage rec {
   sphinxBuilders = [ "man" ];
 
   dependencies = [
-    pbr
+    debtcollector
+    keystoneauth1
+    osc-lib
     oslo-config
     oslo-log
     oslo-serialization
     oslo-utils
+    pbr
     prettytable
     requests
-    babel
-    osc-lib
-    python-keystoneclient
-    debtcollector
   ];
 
   # Checks moved to 'passthru.tests' to workaround infinite recursion
diff --git a/pkgs/development/python-modules/python-manilaclient/tests.nix b/pkgs/development/python-modules/python-manilaclient/tests.nix
index 6af755e27495..47c17f976b8c 100644
--- a/pkgs/development/python-modules/python-manilaclient/tests.nix
+++ b/pkgs/development/python-modules/python-manilaclient/tests.nix
@@ -1,11 +1,13 @@
 {
   buildPythonPackage,
-  python-manilaclient,
-  stestr,
   ddt,
-  tempest,
-  mock,
+  fixtures,
+  python-manilaclient,
   python-openstackclient,
+  requests-mock,
+  stestr,
+  tempest,
+  testtools,
 }:
 
 buildPythonPackage {
@@ -17,12 +19,14 @@ buildPythonPackage {
   dontInstall = true;
 
   nativeCheckInputs = [
-    python-manilaclient
-    stestr
     ddt
-    tempest
-    mock
+    fixtures
+    python-manilaclient
     python-openstackclient
+    requests-mock
+    stestr
+    tempest
+    testtools
   ];
 
   checkPhase = ''