diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 0bfac008bfd6..53ca0437d8bc 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -388,7 +388,7 @@ in
   cryptpad = runTest ./cryptpad.nix;
   cups-pdf = runTest ./cups-pdf.nix;
   curl-impersonate = runTest ./curl-impersonate.nix;
-  custom-ca = handleTest ./custom-ca.nix { };
+  custom-ca = import ./custom-ca.nix { inherit pkgs runTest; };
   croc = runTest ./croc.nix;
   cross-seed = runTest ./cross-seed.nix;
   cyrus-imap = runTest ./cyrus-imap.nix;
diff --git a/nixos/tests/custom-ca.nix b/nixos/tests/custom-ca.nix
index e6aa31b5845a..2606c21da0dd 100644
--- a/nixos/tests/custom-ca.nix
+++ b/nixos/tests/custom-ca.nix
@@ -3,13 +3,7 @@
 # The test checks that certificates issued by a custom
 # trusted CA are accepted but those from an unknown CA are rejected.
 
-{
-  system ? builtins.currentSystem,
-  config ? { },
-  pkgs ? import ../.. { inherit system config; },
-}:
-
-with import ../lib/testing-python.nix { inherit system pkgs; };
+{ runTest, pkgs }:
 
 let
   inherit (pkgs) lib;
@@ -104,7 +98,7 @@ let
     };
   };
 
-  curlTest = makeTest {
+  curlTest = runTest {
     name = "custom-ca-curl";
     meta.maintainers = with lib.maintainers; [ rnhmjoj ];
     nodes.machine = { ... }: webserverConfig;
@@ -121,7 +115,7 @@ let
 
   mkBrowserTest =
     browser: testParams:
-    makeTest {
+    runTest {
       name = "custom-ca-${browser}";
       meta.maintainers = with lib.maintainers; [ rnhmjoj ];
 
@@ -199,7 +193,7 @@ in
 {
   curl = curlTest;
 }
-// pkgs.lib.mapAttrs mkBrowserTest {
+// lib.mapAttrs mkBrowserTest {
   firefox = {
     error = "Security Risk";
   };