diff --git a/pkgs/development/python-modules/bacpypes/default.nix b/pkgs/development/python-modules/bacpypes/default.nix
index 3bedc03329fc..9804dd20f576 100644
--- a/pkgs/development/python-modules/bacpypes/default.nix
+++ b/pkgs/development/python-modules/bacpypes/default.nix
@@ -1,10 +1,17 @@
-{ lib, buildPythonPackage, fetchFromGitHub
-, wheel, pytestCheckHook, pytest-runner, pythonAtLeast }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, wheel
+, pytestCheckHook
+, pythonOlder
+}:
 
 buildPythonPackage rec {
-  version = "0.18.6";
   pname = "bacpypes";
-  disabled = pythonAtLeast "3.9";
+  version = "0.18.6";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "JoelBender";
@@ -13,19 +20,33 @@ buildPythonPackage rec {
     hash = "sha256-BHCHI36nTqBj2dkHB/Y5qkC4uJCmzbHGzSFWKNsIdbc=";
   };
 
-  propagatedBuildInputs = [ wheel ];
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "'pytest-runner'," "" \
+      --replace "(3, 8): 'py34'," "(3, 8): 'py34', (3, 9): 'py34', (3, 10): 'py34', (3, 11): 'py34', (3, 12): 'py34',"
+  '';
+
+  propagatedBuildInputs = [
+    wheel
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
-  # Using pytes instead of setuptools check hook allows disabling specific tests
-  nativeCheckInputs = [ pytestCheckHook pytest-runner ];
-  dontUseSetuptoolsCheck = true;
   disabledTests = [
     # Test fails with a an error: AssertionError: assert 30 == 31
     "test_recurring_task_5"
   ];
 
+  pythonImportsCheck = [
+    "bacpypes"
+  ];
+
   meta = with lib; {
+    description = "Module for the BACnet application layer and network layer";
     homepage = "https://github.com/JoelBender/bacpypes";
-    description = "BACpypes provides a BACnet application layer and network layer written in Python for daemons, scripting, and graphical interfaces.";
+    changelog = "https://github.com/JoelBender/bacpypes/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ bachp ];
   };