diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix
index ae34740c87af..855f2d028a9a 100644
--- a/pkgs/development/python-modules/pbr/default.nix
+++ b/pkgs/development/python-modules/pbr/default.nix
@@ -5,17 +5,16 @@
   distutils,
   fetchPypi,
   setuptools,
-  six,
 }:
 
 buildPythonPackage rec {
   pname = "pbr";
-  version = "6.1.1";
+  version = "7.0.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-k+pyzmmJ6y7tmdD3VyFHT2mtiBKK/e9aw3freXxL92s=";
+    hash = "sha256-z0EnKYcj2vvOOv0Td1zPOIW+XTyENXUbhn+aahC3Gjk=";
   };
 
   build-system = [ setuptools ];
@@ -23,7 +22,6 @@ buildPythonPackage rec {
   dependencies = [
     distutils # for distutils.command in pbr/packaging.py
     setuptools # for pkg_resources
-    six
   ];
 
   # check in passthru.tests.pytest to escape infinite recursion with fixtures
diff --git a/pkgs/development/python-modules/pbr/tests.nix b/pkgs/development/python-modules/pbr/tests.nix
index c464983fa31a..99b5c7cc3e18 100644
--- a/pkgs/development/python-modules/pbr/tests.nix
+++ b/pkgs/development/python-modules/pbr/tests.nix
@@ -43,12 +43,12 @@ buildPythonPackage {
   checkPhase = ''
     stestr run -e <(echo "
     pbr.tests.test_core.TestCore.test_console_script_develop
-    pbr.tests.test_core.TestCore.test_console_script_install
-    pbr.tests.test_wsgi.TestWsgiScripts.test_with_argument
-    pbr.tests.test_wsgi.TestWsgiScripts.test_wsgi_script_run
+    pbr.tests.functional.test_console_scripts.TestConsoleScripts.test_console_script_install
+    pbr.tests.functional.test_wsgi_scripts.TestWsgiScripts.test_with_argument
+    pbr.tests.functional.test_wsgi_scripts.TestWsgiScripts.test_wsgi_script_run
     # Tests are failing because of fixture timeouts
-    pbr.tests.test_packaging.TestPEP517Support.test_pep_517_support
-    pbr.tests.test_packaging.TestRequirementParsing.test_requirement_parsing
+    pbr.tests.functional.test_pep517.TestPEP517Support.test_pep_517_support
+    pbr.tests.functional.test_requirements.TestRequirementParsing.test_requirement_parsing
     ")
   '';
 }