diff --git a/clanServices/deltachat/flake-module.nix b/clanServices/deltachat/flake-module.nix
index 0fad43bfd..c81973e0c 100644
--- a/clanServices/deltachat/flake-module.nix
+++ b/clanServices/deltachat/flake-module.nix
@@ -1,17 +1,18 @@
-{ lib, self, ... }:
+{ lib, ... }:
+let
+  module = lib.modules.importApply ./default.nix { };
+in
 {
   clan.modules = {
-    deltachat = lib.modules.importApply ./default.nix { };
+    deltachat = module;
   };
   perSystem =
-    { pkgs, ... }:
+    { ... }:
     {
-      checks = lib.optionalAttrs (pkgs.stdenv.isLinux) {
-        deltachat = import ./tests/vm/default.nix {
-          inherit pkgs;
-          clan-core = self;
-          nixosLib = import (self.inputs.nixpkgs + "/nixos/lib") { };
-        };
+      clan.nixosTests.deltachat = {
+        imports = [ ./tests/vm/default.nix ];
+
+        clan.modules."@clan/deltachat" = module;
       };
     };
 }
diff --git a/clanServices/deltachat/tests/vm/default.nix b/clanServices/deltachat/tests/vm/default.nix
index 7b25c41f4..b8f9604e7 100644
--- a/clanServices/deltachat/tests/vm/default.nix
+++ b/clanServices/deltachat/tests/vm/default.nix
@@ -1,50 +1,39 @@
 {
+  module,
   pkgs,
-  nixosLib,
-  clan-core,
   ...
 }:
-nixosLib.runTest (
-  { ... }:
-  {
-    imports = [
-      clan-core.modules.nixosVmTest.clanTest
-    ];
+{
+  name = "deltachat";
 
-    hostPkgs = pkgs;
+  clan = {
+    directory = ./.;
+    inventory = {
+      machines.server = { };
 
-    name = "deltachat";
-
-    clan = {
-      directory = ./.;
-      modules."@clan/deltachat" = ../../default.nix;
-      inventory = {
-        machines.server = { };
-
-        instances = {
-          deltachat-test = {
-            module.name = "@clan/deltachat";
-            roles.default.machines."server".settings = { };
-          };
+      instances = {
+        deltachat-test = {
+          module.name = "@clan/deltachat";
+          roles.default.machines."server".settings = { };
         };
       };
     };
+  };
 
-    nodes = {
-      server = { };
-    };
+  nodes = {
+    server = { };
+  };
 
-    testScript = ''
-      start_all()
+  testScript = ''
+    start_all()
 
-      server.wait_for_unit("maddy")
+    server.wait_for_unit("maddy")
 
-      # imap
-      server.succeed("${pkgs.netcat}/bin/nc -z -v ::1 143")
-      # smtp submission
-      server.succeed("${pkgs.netcat}/bin/nc -z -v ::1 587")
-      # smtp
-      server.succeed("${pkgs.netcat}/bin/nc -z -v ::1 25")
-    '';
-  }
-)
+    # imap
+    server.succeed("${pkgs.netcat}/bin/nc -z -v ::1 143")
+    # smtp submission
+    server.succeed("${pkgs.netcat}/bin/nc -z -v ::1 587")
+    # smtp
+    server.succeed("${pkgs.netcat}/bin/nc -z -v ::1 25")
+  '';
+}