diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 48e763ef90ef..3a0ce587a510 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -255,7 +255,7 @@ in
     inherit runTest;
     package = pkgs.bird3;
   };
-  birdwatcher = handleTest ./birdwatcher.nix { };
+  birdwatcher = runTest ./birdwatcher.nix;
   bitbox-bridge = runTest ./bitbox-bridge.nix;
   bitcoind = runTest ./bitcoind.nix;
   bittorrent = runTest ./bittorrent.nix;
diff --git a/nixos/tests/birdwatcher.nix b/nixos/tests/birdwatcher.nix
index f82d0823b9df..69bb15eadcf7 100644
--- a/nixos/tests/birdwatcher.nix
+++ b/nixos/tests/birdwatcher.nix
@@ -1,21 +1,10 @@
 # This test does a basic functionality check for birdwatcher
 
 {
-  system ? builtins.currentSystem,
-  pkgs ? import ../.. {
-    inherit system;
-    config = { };
-  },
-}:
-
-let
-  inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
-  inherit (pkgs.lib) optionalString;
-in
-makeTest {
   name = "birdwatcher";
-  nodes = {
-    host1 = {
+  nodes.host1 =
+    { pkgs, ... }:
+    {
       environment.systemPackages = with pkgs; [ jq ];
       services.bird = {
         enable = true;
@@ -84,7 +73,6 @@ makeTest {
         '';
       };
     };
-  };
 
   testScript = ''
     start_all()