diff --git a/pkgs/development/python-modules/databricks-cli/default.nix b/pkgs/development/python-modules/databricks-cli/default.nix
index 190dac7fdc79..a4923a0d9a47 100644
--- a/pkgs/development/python-modules/databricks-cli/default.nix
+++ b/pkgs/development/python-modules/databricks-cli/default.nix
@@ -1,42 +1,65 @@
-{ lib, buildPythonPackage, fetchPypi
+{ lib
+, buildPythonPackage
 , click
-, oauthlib
-, requests
-, tabulate
-, six
 , configparser
-, pytest
+, decorator
+, fetchFromGitHub
+, mock
+, oauthlib
+, pyjwt
+, pytestCheckHook
+, pythonOlder
+, requests
+, requests-mock
+, six
+, tabulate
 }:
 
 buildPythonPackage rec {
   pname = "databricks-cli";
-  version = "0.17.3";
+  version = "0.17.4";
+  format = "setuptools";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-LwDz5w6FmAnwWViF7Hb8c7pgrQzM1pVk999dlbbJAGY=";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "databricks";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    hash = "sha256-srrNxiOGrU1u5shssRssr8Hwdy20U4coOAjYsT7eTSA=";
   };
 
-  checkInputs = [
-    pytest
-  ];
-
-  checkPhase = "pytest tests";
-  # tests folder is missing in PyPI
-  doCheck = false;
-
   propagatedBuildInputs = [
     click
-    oauthlib
-    requests
-    tabulate
-    six
     configparser
+    oauthlib
+    pyjwt
+    requests
+    requests-mock
+    six
+    tabulate
+  ];
+
+  checkInputs = [
+    decorator
+    mock
+    pytestCheckHook
+  ];
+
+  disabledTestPaths = [
+    # Disabled due to option parsing which we don't have
+    "integration/dbfs/test_integration.py"
+    "integration/workspace/test_integration.py"
+  ];
+
+  pythonImportsCheck = [
+    "databricks_cli"
   ];
 
   meta = with lib; {
+    description = "Command line interface for Databricks";
     homepage = "https://github.com/databricks/databricks-cli";
-    description = "A command line interface for Databricks";
+    changelog = "https://github.com/databricks/databricks-cli/releases/tag/${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ tbenst ];
   };