diff --git a/pkgs/development/python-modules/approval-utilities/default.nix b/pkgs/development/python-modules/approval-utilities/default.nix
index 4d5da8a1c5c3..f68c6e73e8f4 100644
--- a/pkgs/development/python-modules/approval-utilities/default.nix
+++ b/pkgs/development/python-modules/approval-utilities/default.nix
@@ -11,9 +11,10 @@ buildPythonPackage {
   inherit (approvaltests) version src;
   pyproject = true;
 
-  postPatch = approvaltests.postPatch or "" + ''
-    mv setup.approval_utilities.py setup.py
-  '';
+  postPatch = ''
+    mv setup/setup.approval_utilities.py setup.py
+  ''
+  + approvaltests.postPatch or "";
 
   build-system = [ setuptools ];
 
diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix
index dac819f912b2..7d737d062646 100644
--- a/pkgs/development/python-modules/approvaltests/default.nix
+++ b/pkgs/development/python-modules/approvaltests/default.nix
@@ -20,21 +20,25 @@
 
 buildPythonPackage rec {
   pname = "approvaltests";
-  version = "15.3.2";
+  version = "16.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "approvals";
     repo = "ApprovalTests.Python";
     tag = "v${version}";
-    hash = "sha256-cOaL8u5q9kx+yLB0e/ALnGYYGF5v50wsIIF1UUTPe1Y=";
+    hash = "sha256-9zBpq4/jAH441eeMMV2WS767Rz+1qCX/QIfbToUHnAQ=";
   };
 
   postPatch = ''
+    test -f setup.py || mv setup/setup.py .
+    touch setup/__init__.py
+    substituteInPlace setup.py \
+      --replace-fail "from setup_utils" "from setup.setup_utils"
+
     echo 'version_number = "${version}"' > version.py
-    mv .github approvaltests approval_utilities tests setup
-    cd setup
-    rm setup.cfg
+
+    patchShebangs internal_documentation/scripts
   '';
 
   build-system = [ setuptools ];