diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/by-name/ip/iperf2/package.nix
similarity index 93%
rename from pkgs/tools/networking/iperf/2.nix
rename to pkgs/by-name/ip/iperf2/package.nix
index adf7d57d5249..15e393afa8b2 100644
--- a/pkgs/tools/networking/iperf/2.nix
+++ b/pkgs/by-name/ip/iperf2/package.nix
@@ -8,6 +8,9 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "iperf";
   version = "2.2.1";
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   src = fetchurl {
     url = "mirror://sourceforge/iperf2/files/iperf-${finalAttrs.version}.tar.gz";
     hash = "sha256-dUqwp+KAM9vqgTCO9CS8ffTW4v4xtgzFNrYbUf772Ps=";
diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/by-name/ip/iperf3/package.nix
similarity index 81%
rename from pkgs/tools/networking/iperf/3.nix
rename to pkgs/by-name/ip/iperf3/package.nix
index a88acec2192f..eabc0312af4c 100644
--- a/pkgs/tools/networking/iperf/3.nix
+++ b/pkgs/by-name/ip/iperf3/package.nix
@@ -7,12 +7,15 @@
   lksctp-tools,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "iperf";
   version = "3.21";
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   src = fetchurl {
-    url = "https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz";
+    url = "https://downloads.es.net/pub/iperf/iperf-${finalAttrs.version}.tar.gz";
     hash = "sha256-ZW5EBevWIBId587KPq9DqI956huFfQQaagsTFIAazdg=";
   };
 
@@ -30,7 +33,7 @@ stdenv.mkDerivation rec {
     (fetchpatch {
       url = "https://git.alpinelinux.org/aports/plain/main/iperf3/remove-pg-flags.patch?id=7f979fc51ae31d5c695d8481ba84a4afc5080efb";
       name = "remove-pg-flags.patch";
-      sha256 = "0z3zsmf7ln08rg1mmzl8s8jm5gp8x62f5cxiqcmi8dcs2nsxwgbi";
+      hash = "sha256-cT3etRWaNRQrw7Gz4oTp6L5SJdKI/lrDywhYelzVf3w=";
     })
   ];
 
@@ -47,4 +50,4 @@ stdenv.mkDerivation rec {
     mainProgram = "iperf3";
     maintainers = with lib.maintainers; [ fpletz ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6af7a2024028..6ba3eba8821e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2408,8 +2408,6 @@ with pkgs;
 
   iocsearcher = with python3Packages; toPythonApplication iocsearcher;
 
-  iperf2 = callPackage ../tools/networking/iperf/2.nix { };
-  iperf3 = callPackage ../tools/networking/iperf/3.nix { };
   iperf = iperf3;
 
   i-pi = with python3Packages; toPythonApplication i-pi;