diff --git a/checks/flake-module.nix b/checks/flake-module.nix
index da26ba1f5..55a18e751 100644
--- a/checks/flake-module.nix
+++ b/checks/flake-module.nix
@@ -54,7 +54,6 @@ in
               borgbackup = import ./borgbackup nixosTestArgs;
               data-mesher = import ./data-mesher nixosTestArgs;
               syncthing = import ./syncthing nixosTestArgs;
-              ergochat = import ./ergochat 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/ergochat/flake-module.nix b/clanServices/ergochat/flake-module.nix
index 3d74faf19..c0dde306a 100644
--- a/clanServices/ergochat/flake-module.nix
+++ b/clanServices/ergochat/flake-module.nix
@@ -1,6 +1,17 @@
-{ lib, ... }:
+{ lib, self, ... }:
 {
   clan.modules = {
     ergochat = lib.modules.importApply ./default.nix { };
   };
+  perSystem =
+    { pkgs, ... }:
+    {
+      checks = lib.optionalAttrs (pkgs.stdenv.isLinux) {
+        ergochat = import ./tests/vm/default.nix {
+          inherit pkgs;
+          clan-core = self;
+          nixosLib = import (self.inputs.nixpkgs + "/nixos/lib") { };
+        };
+      };
+    };
 }
diff --git a/checks/ergochat/default.nix b/clanServices/ergochat/tests/vm/default.nix
similarity index 92%
rename from checks/ergochat/default.nix
rename to clanServices/ergochat/tests/vm/default.nix
index b9a06359f..f474bd40e 100644
--- a/checks/ergochat/default.nix
+++ b/clanServices/ergochat/tests/vm/default.nix
@@ -16,7 +16,7 @@ nixosLib.runTest (
 
     clan = {
       directory = ./.;
-      modules."@clan/ergochat" = ../../clanServices/ergochat/default.nix;
+      modules."@clan/ergochat" = ../../default.nix;
       inventory = {
         machines.server = { };
 
diff --git a/checks/ergochat/sops/users/admin/key.json b/clanServices/ergochat/tests/vm/sops/users/admin/key.json
similarity index 100%
rename from checks/ergochat/sops/users/admin/key.json
rename to clanServices/ergochat/tests/vm/sops/users/admin/key.json