diff --git a/pkgs/development/python-modules/python-heatclient/default.nix b/pkgs/development/python-modules/python-heatclient/default.nix
index a8b2d36097e3..38daad08bdb0 100644
--- a/pkgs/development/python-modules/python-heatclient/default.nix
+++ b/pkgs/development/python-modules/python-heatclient/default.nix
@@ -1,49 +1,51 @@
 { lib
-, buildPythonApplication
-, fetchPypi
-, pbr
 , babel
+, buildPythonApplication
 , cliff
+, fetchPypi
 , iso8601
+, keystoneauth1
 , osc-lib
-, prettytable
 , oslo-i18n
 , oslo-serialization
 , oslo-utils
-, keystoneauth1
+, pbr
+, prettytable
 , python-swiftclient
+, pythonOlder
 , pyyaml
 , requests
-, six
+, requests-mock
 , stestr
 , testscenarios
-, requests-mock
 }:
 
 buildPythonApplication rec {
   pname = "python-heatclient";
   version = "3.0.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-5OLysKbM2GbjMT8lshWDLMtqOrHq2DhhWvbw1oNBNZs=";
+    hash = "sha256-5OLysKbM2GbjMT8lshWDLMtqOrHq2DhhWvbw1oNBNZs=";
   };
 
   propagatedBuildInputs = [
-    pbr
     babel
     cliff
     iso8601
+    keystoneauth1
     osc-lib
-    prettytable
     oslo-i18n
     oslo-serialization
     oslo-utils
-    keystoneauth1
+    pbr
+    prettytable
     python-swiftclient
     pyyaml
     requests
-    six
   ];
 
   checkInputs = [
@@ -55,13 +57,16 @@ buildPythonApplication rec {
   checkPhase = ''
     stestr run -e <(echo "
       heatclient.tests.unit.test_common_http.HttpClientTest.test_get_system_ca_file
+      heatclient.tests.unit.test_deployment_utils.TempURLSignalTest.test_create_temp_url
     ")
   '';
 
-  pythonImportsCheck = [ "heatclient" ];
+  pythonImportsCheck = [
+    "heatclient"
+  ];
 
   meta = with lib; {
-    description = "A client library for Heat built on the Heat orchestration API";
+    description = "Library for Heat built on the Heat orchestration API";
     homepage = "https://github.com/openstack/python-heatclient";
     license = licenses.asl20;
     maintainers = teams.openstack.members;