diff --git a/checks/flake-module.nix b/checks/flake-module.nix
index 377fc0633..da26ba1f5 100644
--- a/checks/flake-module.nix
+++ b/checks/flake-module.nix
@@ -55,7 +55,6 @@ in
               data-mesher = import ./data-mesher nixosTestArgs;
               syncthing = import ./syncthing nixosTestArgs;
               ergochat = import ./ergochat nixosTestArgs;
-              heisenbridge = import ./heisenbridge nixosTestArgs;
             }
             // lib.optionalAttrs (pkgs.stdenv.hostPlatform.system == "aarch64-linux") {
               # for some reason this hangs in an odd place in CI, but it works on my machine ...
diff --git a/clanServices/heisenbridge/flake-module.nix b/clanServices/heisenbridge/flake-module.nix
index b8ea77018..a262b7672 100644
--- a/clanServices/heisenbridge/flake-module.nix
+++ b/clanServices/heisenbridge/flake-module.nix
@@ -1,6 +1,17 @@
-{ lib, ... }:
+{ lib, self, ... }:
 {
   clan.modules = {
     heisenbridge = lib.modules.importApply ./default.nix { };
   };
+  perSystem =
+    { pkgs, ... }:
+    {
+      checks = lib.optionalAttrs (pkgs.stdenv.isLinux) {
+        heisenbridge = import ./tests/vm/default.nix {
+          inherit pkgs;
+          clan-core = self;
+          nixosLib = import (self.inputs.nixpkgs + "/nixos/lib") { };
+        };
+      };
+    };
 }
diff --git a/checks/heisenbridge/default.nix b/clanServices/heisenbridge/tests/vm/default.nix
similarity index 94%
rename from checks/heisenbridge/default.nix
rename to clanServices/heisenbridge/tests/vm/default.nix
index 5e55452b5..32046f93c 100644
--- a/checks/heisenbridge/default.nix
+++ b/clanServices/heisenbridge/tests/vm/default.nix
@@ -18,7 +18,7 @@ nixosLib.runTest (
 
     clan = {
       directory = ./.;
-      modules."@clan/heisenbridge" = ../../clanServices/heisenbridge/default.nix;
+      modules."@clan/heisenbridge" = ../../default.nix;
       inventory = {
         machines.server = { };
 
diff --git a/checks/heisenbridge/sops/users/admin/key.json b/clanServices/heisenbridge/tests/vm/sops/users/admin/key.json
similarity index 100%
rename from checks/heisenbridge/sops/users/admin/key.json
rename to clanServices/heisenbridge/tests/vm/sops/users/admin/key.json