diff --git a/pkgs/development/python-modules/allpairspy/default.nix b/pkgs/development/python-modules/allpairspy/default.nix
index b029296fd3a7..a59a0a9f702c 100644
--- a/pkgs/development/python-modules/allpairspy/default.nix
+++ b/pkgs/development/python-modules/allpairspy/default.nix
@@ -1,25 +1,34 @@
-{ lib, buildPythonPackage, fetchPypi, six, pytest }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, setuptools
+}:
 
 buildPythonPackage rec {
   pname = "allpairspy";
-  version = "2.5.0";
+  version = "2.5.1";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9358484c91abe74ba18daf9d6d6904c5be7cc8818397d05248c9d336023c28b1";
+    sha256 = "sha256-9p0xo7Vu7hGdHsYGPpxzLdRPu6NS73OMsi2WmfxACf4=";
   };
 
-  propagatedBuildInputs = [ six ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    setuptools
+  ];
 
-  nativeCheckInputs = [ pytest ];
-
-  checkPhase = ''
-    py.test
-  '';
+  pythonImportsCheck = [
+    "allpairspy"
+  ];
 
   meta = with lib; {
     description = "Pairwise test combinations generator";
     homepage = "https://github.com/thombashi/allpairspy";
+    changelog = "https://github.com/thombashi/allpairspy/releases/tag/v${version}";
     license = licenses.mit;
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix
index 768aaeb89cf6..613b47a8e601 100644
--- a/pkgs/development/python-modules/robomachine/default.nix
+++ b/pkgs/development/python-modules/robomachine/default.nix
@@ -1,27 +1,48 @@
-{ stdenv, lib, fetchPypi, buildPythonPackage, pyparsing, robotframework, allpairspy }:
+{ stdenv
+, lib
+, allpairspy
+, buildPythonPackage
+, fetchPypi
+, pyparsing
+, pythonRelaxDepsHook
+, robotframework
+, setuptools
+}:
 
 buildPythonPackage rec {
   pname = "RoboMachine";
   version = "0.10.0";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-XrxHaV9U7mZ2TvySHGm6qw1AsoukppzwPq4wufIjL+k=";
   };
 
-  propagatedBuildInputs = [ pyparsing robotframework allpairspy ];
+  nativeBuildInputs = [
+    pythonRelaxDepsHook
+    setuptools
+  ];
 
-  # Remove Windows .bat files
-  postInstall = ''
-    rm "$out/bin/"*.bat
-  '';
+  propagatedBuildInputs = [
+    pyparsing
+    robotframework
+    allpairspy
+  ];
 
-  postPatch = ''
-    substituteInPlace setup.py --replace "argparse" ""
-  '';
+  pythonRemoveDeps = [
+    "argparse"
+  ];
+
+  pythonRelaxDeps = [
+    "pyparsing"
+  ];
+
+  pythonImportsCheck = [
+    "robomachine"
+  ];
 
   meta = with lib; {
-    broken = true;
     description = "Test data generator for Robot Framework";
     homepage = "https://github.com/mkorpela/RoboMachine";
     license = licenses.asl20;