diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 87de437ac9fc..f29d10608d4c 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1246,7 +1246,6 @@ in
   nfs4 = handleTest ./nfs { version = 4; };
   nghttpx = runTest ./nghttpx.nix;
   nginx = import ./nginx { inherit lib runTest; };
-  nginx-http3 = import ./nginx-http3.nix { inherit pkgs runTest; };
   nifi = runTestOn [ "x86_64-linux" ] ./web-apps/nifi.nix;
   nimdow = runTest ./nimdow.nix;
   nipap = runTest ./web-apps/nipap.nix;
diff --git a/nixos/tests/angie.nix b/nixos/tests/angie.nix
index d67ca4e51953..7668a4beee6c 100644
--- a/nixos/tests/angie.nix
+++ b/nixos/tests/angie.nix
@@ -5,6 +5,6 @@ let
 in
 recurseIntoAttrs (
   mapAttrs (const (callTest (builtins.getAttr "angie") "angie")) {
-    inherit (tests) basic;
+    inherit (tests) basic http3;
   }
 )
diff --git a/nixos/tests/nginx-http3.nix b/nixos/tests/nginx-http3.nix
deleted file mode 100644
index 02283a3c5601..000000000000
--- a/nixos/tests/nginx-http3.nix
+++ /dev/null
@@ -1,119 +0,0 @@
-{ pkgs, runTest }:
-let
-  hosts = ''
-    192.168.2.101 acme.test
-  '';
-
-in
-builtins.listToAttrs (
-  map
-    (nginxPackage: {
-      name = pkgs.lib.getName nginxPackage;
-      value = runTest {
-        name = "nginx-http3-${pkgs.lib.getName nginxPackage}";
-        meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];
-
-        nodes = {
-          server =
-            { lib, pkgs, ... }:
-            {
-              networking = {
-                interfaces.eth1 = {
-                  ipv4.addresses = [
-                    {
-                      address = "192.168.2.101";
-                      prefixLength = 24;
-                    }
-                  ];
-                };
-                extraHosts = hosts;
-                firewall.allowedTCPPorts = [ 443 ];
-                firewall.allowedUDPPorts = [ 443 ];
-              };
-
-              security.pki.certificates = [
-                (builtins.readFile ./common/acme/server/ca.cert.pem)
-              ];
-
-              services.nginx = {
-                enable = true;
-                package = nginxPackage;
-
-                virtualHosts."acme.test" = {
-                  onlySSL = true;
-                  sslCertificate = ./common/acme/server/acme.test.cert.pem;
-                  sslCertificateKey = ./common/acme/server/acme.test.key.pem;
-                  http2 = true;
-                  http3 = true;
-                  http3_hq = false;
-                  quic = true;
-                  reuseport = true;
-                  root = lib.mkForce (
-                    pkgs.runCommandLocal "testdir" { } ''
-                      mkdir "$out"
-                      cat > "$out/index.html" <<EOF
-                      <html><body>Hello World!</body></html>
-                      EOF
-                      cat > "$out/example.txt" <<EOF
-                      Check http3 protocol.
-                      EOF
-                    ''
-                  );
-                };
-              };
-            };
-
-          client =
-            { pkgs, ... }:
-            {
-              environment.systemPackages = [ pkgs.curl ];
-              networking = {
-                interfaces.eth1 = {
-                  ipv4.addresses = [
-                    {
-                      address = "192.168.2.201";
-                      prefixLength = 24;
-                    }
-                  ];
-                };
-                extraHosts = hosts;
-              };
-
-              security.pki.certificates = [
-                (builtins.readFile ./common/acme/server/ca.cert.pem)
-              ];
-            };
-        };
-
-        testScript = ''
-          start_all()
-
-          server.wait_for_unit("nginx")
-          server.wait_for_open_port(443)
-
-          # Check http connections
-          client.succeed("curl --verbose --http3-only https://acme.test | grep 'Hello World!'")
-
-          # Check downloadings
-          client.succeed("curl --verbose --http3-only https://acme.test/example.txt --output /tmp/example.txt")
-          client.succeed("cat /tmp/example.txt | grep 'Check http3 protocol.'")
-
-          # Check header reading
-          client.succeed("curl --verbose --http3-only --head https://acme.test | grep 'content-type'")
-          client.succeed("curl --verbose --http3-only --head https://acme.test | grep 'HTTP/3 200'")
-          client.succeed("curl --verbose --http3-only --head https://acme.test/error | grep 'HTTP/3 404'")
-
-          # Check change User-Agent
-          client.succeed("curl --verbose --http3-only --user-agent 'Curl test 3.0' https://acme.test")
-          server.succeed("cat /var/log/nginx/access.log | grep 'Curl test 3.0'")
-
-          server.shutdown()
-          client.shutdown()
-        '';
-      };
-    })
-    [
-      pkgs.angie
-      pkgs.nginx
-    ]
-)
diff --git a/nixos/tests/nginx/default.nix b/nixos/tests/nginx/default.nix
index 23667eab1ac5..50efc31ba408 100644
--- a/nixos/tests/nginx/default.nix
+++ b/nixos/tests/nginx/default.nix
@@ -18,6 +18,7 @@ let
     etag = ./etag.nix;
     etag-compression = ./etag-compression.nix;
     globalredirect = ./globalredirect.nix;
+    http3 = ./http3.nix;
     dynamic-modules = ./dynamic-modules.nix;
     grpc-error-pages = ./grpc-error-pages.nix;
     lua = ./lua.nix;
diff --git a/nixos/tests/nginx/http3.nix b/nixos/tests/nginx/http3.nix
new file mode 100644
index 000000000000..19d1672ec7a6
--- /dev/null
+++ b/nixos/tests/nginx/http3.nix
@@ -0,0 +1,114 @@
+{
+  name ? "default",
+  mkPackage ? builtins.getAttr "nginx",
+  lib,
+  ...
+}:
+let
+  hosts = ''
+    192.168.2.101 acme.test
+  '';
+
+in
+{
+  name = "nginx-http3-${name}";
+  meta.maintainers = with lib.maintainers; [ izorkin ];
+
+  nodes = {
+    server =
+      { lib, pkgs, ... }:
+      {
+        networking = {
+          interfaces.eth1 = {
+            ipv4.addresses = [
+              {
+                address = "192.168.2.101";
+                prefixLength = 24;
+              }
+            ];
+          };
+          extraHosts = hosts;
+          firewall.allowedTCPPorts = [ 443 ];
+          firewall.allowedUDPPorts = [ 443 ];
+        };
+
+        security.pki.certificates = [
+          (builtins.readFile ../common/acme/server/ca.cert.pem)
+        ];
+
+        services.nginx = {
+          enable = true;
+          package = mkPackage pkgs;
+
+          virtualHosts."acme.test" = {
+            onlySSL = true;
+            sslCertificate = ../common/acme/server/acme.test.cert.pem;
+            sslCertificateKey = ../common/acme/server/acme.test.key.pem;
+            http2 = true;
+            http3 = true;
+            http3_hq = false;
+            quic = true;
+            reuseport = true;
+            root = lib.mkForce (
+              pkgs.runCommandLocal "testdir" { } ''
+                mkdir "$out"
+                cat > "$out/index.html" <<EOF
+                <html><body>Hello World!</body></html>
+                EOF
+                cat > "$out/example.txt" <<EOF
+                Check http3 protocol.
+                EOF
+              ''
+            );
+          };
+        };
+      };
+
+    client =
+      { pkgs, ... }:
+      {
+        environment.systemPackages = [ pkgs.curl ];
+        networking = {
+          interfaces.eth1 = {
+            ipv4.addresses = [
+              {
+                address = "192.168.2.201";
+                prefixLength = 24;
+              }
+            ];
+          };
+          extraHosts = hosts;
+        };
+
+        security.pki.certificates = [
+          (builtins.readFile ../common/acme/server/ca.cert.pem)
+        ];
+      };
+  };
+
+  testScript = ''
+    start_all()
+
+    server.wait_for_unit("nginx")
+    server.wait_for_open_port(443)
+
+    # Check http connections
+    client.succeed("curl --verbose --http3-only https://acme.test | grep 'Hello World!'")
+
+    # Check downloadings
+    client.succeed("curl --verbose --http3-only https://acme.test/example.txt --output /tmp/example.txt")
+    client.succeed("cat /tmp/example.txt | grep 'Check http3 protocol.'")
+
+    # Check header reading
+    client.succeed("curl --verbose --http3-only --head https://acme.test | grep 'content-type'")
+    client.succeed("curl --verbose --http3-only --head https://acme.test | grep 'HTTP/3 200'")
+    client.succeed("curl --verbose --http3-only --head https://acme.test/error | grep 'HTTP/3 404'")
+
+    # Check change User-Agent
+    client.succeed("curl --verbose --http3-only --user-agent 'Curl test 3.0' https://acme.test")
+    server.succeed("cat /var/log/nginx/access.log | grep 'Curl test 3.0'")
+
+    server.shutdown()
+    client.shutdown()
+  '';
+}
diff --git a/nixos/tests/openresty.nix b/nixos/tests/openresty.nix
index ccf8337035f7..8aa6e7b87377 100644
--- a/nixos/tests/openresty.nix
+++ b/nixos/tests/openresty.nix
@@ -5,6 +5,6 @@ let
 in
 recurseIntoAttrs (
   mapAttrs (const (callTest (builtins.getAttr "openresty") "openresty")) {
-    inherit (tests) basic;
+    inherit (tests) basic http3;
   }
 )
diff --git a/pkgs/servers/http/angie/default.nix b/pkgs/servers/http/angie/default.nix
index 5066137fc59f..8320f918c8d1 100644
--- a/pkgs/servers/http/angie/default.nix
+++ b/pkgs/servers/http/angie/default.nix
@@ -33,7 +33,6 @@ callPackage ../nginx/generic.nix args rec {
 
   passthru.tests = nixosTests.angie // {
     angie-api = nixosTests.angie-api;
-    angie-http3 = nixosTests.nginx-http3.angie;
   };
 
   meta = {
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index f0d9989aa8ad..70a837492cd8 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -323,6 +323,7 @@ mkDerivation {
           etag
           etag-compression
           dynamic-modules
+          http3
           globalredirect
           grpc-error-pages
           lua
@@ -338,9 +339,6 @@ mkDerivation {
           tmpdir
           unix-socket
           ;
-        inherit (nixosTests)
-          nginx-http3
-          ;
         acme-integration = nixosTests.acme.nginx;
         acme-integration-without-reload = nixosTests.acme.nginx-without-reload;
       };