diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index be077353de00..56653b64e5c7 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -360,11 +360,7 @@ in {
   freenet = handleTest ./freenet.nix {};
   freeswitch = handleTest ./freeswitch.nix {};
   freetube = discoverTests (import ./freetube.nix);
-  freshrss-extensions = handleTest ./freshrss-extensions.nix {};
-  freshrss-sqlite = handleTest ./freshrss-sqlite.nix {};
-  freshrss-pgsql = handleTest ./freshrss-pgsql.nix {};
-  freshrss-http-auth = handleTest ./freshrss-http-auth.nix {};
-  freshrss-none-auth = handleTest ./freshrss-none-auth.nix {};
+  freshrss = handleTest ./freshrss {};
   frigate = handleTest ./frigate.nix {};
   frp = handleTest ./frp.nix {};
   frr = handleTest ./frr.nix {};
diff --git a/nixos/tests/freshrss/default.nix b/nixos/tests/freshrss/default.nix
new file mode 100644
index 000000000000..67892596ba23
--- /dev/null
+++ b/nixos/tests/freshrss/default.nix
@@ -0,0 +1,9 @@
+{ system, pkgs, ... }:
+
+{
+  extensions = import ./extensions.nix { inherit system pkgs; };
+  http-auth = import ./http-auth.nix { inherit system pkgs; };
+  none-auth = import ./none-auth.nix { inherit system pkgs; };
+  pgsql = import ./pgsql.nix { inherit system pkgs; };
+  sqlite = import ./sqlite.nix { inherit system pkgs; };
+}
diff --git a/nixos/tests/freshrss-extensions.nix b/nixos/tests/freshrss/extensions.nix
similarity index 90%
rename from nixos/tests/freshrss-extensions.nix
rename to nixos/tests/freshrss/extensions.nix
index 3de954260fdc..7aba55a3f5e1 100644
--- a/nixos/tests/freshrss-extensions.nix
+++ b/nixos/tests/freshrss/extensions.nix
@@ -1,7 +1,7 @@
-import ./make-test-python.nix (
+import ../make-test-python.nix (
   { lib, pkgs, ... }:
   {
-    name = "freshrss";
+    name = "freshrss-extensions";
 
     nodes.machine =
       { pkgs, ... }:
diff --git a/nixos/tests/freshrss-http-auth.nix b/nixos/tests/freshrss/http-auth.nix
similarity index 90%
rename from nixos/tests/freshrss-http-auth.nix
rename to nixos/tests/freshrss/http-auth.nix
index 4fcacc22d308..84c308a7e48d 100644
--- a/nixos/tests/freshrss-http-auth.nix
+++ b/nixos/tests/freshrss/http-auth.nix
@@ -1,7 +1,7 @@
-import ./make-test-python.nix (
+import ../make-test-python.nix (
   { lib, pkgs, ... }:
   {
-    name = "freshrss";
+    name = "freshrss-http-auth";
     meta.maintainers = with lib.maintainers; [ mattchrist ];
 
     nodes.machine =
diff --git a/nixos/tests/freshrss-none-auth.nix b/nixos/tests/freshrss/none-auth.nix
similarity index 89%
rename from nixos/tests/freshrss-none-auth.nix
rename to nixos/tests/freshrss/none-auth.nix
index 0dc484dd535a..1a945ebb9b38 100644
--- a/nixos/tests/freshrss-none-auth.nix
+++ b/nixos/tests/freshrss/none-auth.nix
@@ -1,7 +1,7 @@
-import ./make-test-python.nix (
+import ../make-test-python.nix (
   { lib, pkgs, ... }:
   {
-    name = "freshrss";
+    name = "freshrss-none-auth";
     meta.maintainers = with lib.maintainers; [ mattchrist ];
 
     nodes.machine =
diff --git a/nixos/tests/freshrss-pgsql.nix b/nixos/tests/freshrss/pgsql.nix
similarity index 95%
rename from nixos/tests/freshrss-pgsql.nix
rename to nixos/tests/freshrss/pgsql.nix
index 678633dea1d6..feb3b3bf1314 100644
--- a/nixos/tests/freshrss-pgsql.nix
+++ b/nixos/tests/freshrss/pgsql.nix
@@ -1,7 +1,7 @@
-import ./make-test-python.nix (
+import ../make-test-python.nix (
   { lib, pkgs, ... }:
   {
-    name = "freshrss";
+    name = "freshrss-pgsql";
     meta.maintainers = with lib.maintainers; [
       etu
       stunkymonkey
diff --git a/nixos/tests/freshrss-sqlite.nix b/nixos/tests/freshrss/sqlite.nix
similarity index 91%
rename from nixos/tests/freshrss-sqlite.nix
rename to nixos/tests/freshrss/sqlite.nix
index c72ab93ca73d..5edc081e5d7c 100644
--- a/nixos/tests/freshrss-sqlite.nix
+++ b/nixos/tests/freshrss/sqlite.nix
@@ -1,7 +1,7 @@
-import ./make-test-python.nix (
+import ../make-test-python.nix (
   { lib, pkgs, ... }:
   {
-    name = "freshrss";
+    name = "freshrss-sqlite";
     meta.maintainers = with lib.maintainers; [
       etu
       stunkymonkey
diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix
index e963b22fa302..3f8b4aa2196c 100644
--- a/pkgs/servers/web-apps/freshrss/default.nix
+++ b/pkgs/servers/web-apps/freshrss/default.nix
@@ -41,7 +41,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   passthru.tests = {
-    inherit (nixosTests) freshrss-sqlite freshrss-pgsql freshrss-http-auth freshrss-none-auth freshrss-extensions;
+    inherit (nixosTests) freshrss;
   };
 
   meta = with lib; {