diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix
deleted file mode 100644
index f2d796b21384..000000000000
--- a/pkgs/applications/networking/flent/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  lib,
-  buildPythonApplication,
-  fetchPypi,
-  procps,
-  python,
-  qt5,
-  xvfb-run,
-}:
-buildPythonApplication rec {
-  pname = "flent";
-  version = "2.1.1";
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-21gd6sPYCZll3Q2O7kucTRhXvc5byXeQr50+1bZVT3M=";
-  };
-
-  buildInputs = [python.pkgs.sphinx];
-  nativeBuildInputs = [qt5.wrapQtAppsHook];
-  propagatedBuildInputs = [
-    procps
-    python.pkgs.matplotlib
-    python.pkgs.pyqt5
-    python.pkgs.qtpy
-  ];
-  nativeCheckInputs = [
-    python.pkgs.mock
-    xvfb-run
-  ];
-
-  checkPhase = ''
-    # we want the gui tests to always run
-    sed -i 's|self.skip|pass; #&|' unittests/test_gui.py
-
-    cat >test-runner <<EOF
-    #!/bin/sh
-    ${python.pythonOnBuildForHost.interpreter} nix_run_setup test
-    EOF
-    chmod +x test-runner
-    wrapQtApp test-runner --prefix PYTHONPATH : $PYTHONPATH
-    xvfb-run -s '-screen 0 800x600x24' ./test-runner
-  '';
-
-  preFixup = ''
-    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
-  '';
-
-  meta = with lib; {
-    description = "FLExible Network Tester";
-    homepage = "https://flent.org";
-    license = licenses.gpl3;
-
-    maintainers = [maintainers.mmlb];
-  };
-}
diff --git a/pkgs/by-name/fl/flent/package.nix b/pkgs/by-name/fl/flent/package.nix
new file mode 100644
index 000000000000..5e78f6923f30
--- /dev/null
+++ b/pkgs/by-name/fl/flent/package.nix
@@ -0,0 +1,66 @@
+{
+  lib,
+  python3Packages,
+  fetchPypi,
+  procps,
+  qt5,
+  xvfb-run,
+}:
+python3Packages.buildPythonApplication rec {
+  pname = "flent";
+  version = "2.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-BPwh3oWIY1YEI+ecgi9AUiX4Ka/Y5dYikwmfvvNB+eg=";
+  };
+
+  build-system = [ python3Packages.sphinx ];
+
+  nativeBuildInputs = [ qt5.wrapQtAppsHook ];
+
+  dependencies = with python3Packages; [
+    matplotlib
+    pyqt5
+    qtpy
+  ];
+
+  nativeCheckInputs = [
+    python3Packages.mock
+    xvfb-run
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+
+    # we want the gui tests to always run
+    sed -i 's|self.skip|pass; #&|' unittests/test_gui.py
+
+    export XDG_RUNTIME_DIR=$(mktemp -d)
+    export HOME=$(mktemp -d)
+    cat >test-runner <<EOF
+    #!/bin/sh
+    ${python3Packages.python.interpreter} -m unittest discover
+    EOF
+    chmod +x test-runner
+    wrapQtApp test-runner --prefix PYTHONPATH : $PYTHONPATH
+    xvfb-run -s '-screen 0 800x600x24' ./test-runner
+
+    runHook postCheck
+  '';
+
+  preFixup = ''
+    makeWrapperArgs+=(
+      "''${qtWrapperArgs[@]}"
+      --prefix PATH : ${lib.makeBinPath [ procps ]}
+    )
+  '';
+
+  meta = {
+    description = "FLExible Network Tester";
+    homepage = "https://flent.org";
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ mmlb ];
+    mainProgram = "flent";
+  };
+}
diff --git a/pkgs/applications/networking/flent/http-getter.nix b/pkgs/by-name/ht/http-getter/package.nix
similarity index 81%
rename from pkgs/applications/networking/flent/http-getter.nix
rename to pkgs/by-name/ht/http-getter/package.nix
index 5ea07cfe4f9d..72fb7f5f52c1 100644
--- a/pkgs/applications/networking/flent/http-getter.nix
+++ b/pkgs/by-name/ht/http-getter/package.nix
@@ -1,4 +1,11 @@
-{ lib, stdenv, fetchFromGitHub, cmake, curl, pkg-config }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  curl,
+  pkg-config,
+}:
 
 stdenv.mkDerivation {
   pname = "http-getter";
@@ -11,7 +18,10 @@ stdenv.mkDerivation {
     sha256 = "0plyqqwfm9bysichda0w3akbdxf6279wd4mx8mda0c4mxd4xy9nl";
   };
 
-  nativeBuildInputs = [ cmake pkg-config ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
   buildInputs = [ curl ];
 
   meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d95364813784..370c16467fc2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7506,8 +7506,6 @@ with pkgs;
 
   flashrom = callPackage ../tools/misc/flashrom { };
 
-  flent = python3Packages.callPackage ../applications/networking/flent { };
-
   flexoptix-app = callPackage ../tools/misc/flexoptix-app { };
 
   flpsed = callPackage ../applications/editors/flpsed { };
@@ -8471,8 +8469,6 @@ with pkgs;
 
   http-prompt = callPackage ../tools/networking/http-prompt { };
 
-  http-getter = callPackage ../applications/networking/flent/http-getter.nix { };
-
   httpdump = callPackage ../tools/security/httpdump { };
 
   httpie = with python3Packages; toPythonApplication httpie;