diff --git a/checks/flake-module.nix b/checks/flake-module.nix
index 68fbb8824..7f394db87 100644
--- a/checks/flake-module.nix
+++ b/checks/flake-module.nix
@@ -58,7 +58,6 @@ in
               syncthing = import ./syncthing nixosTestArgs;
               deltachat = import ./deltachat nixosTestArgs;
               ergochat = import ./ergochat nixosTestArgs;
-              garage = import ./garage nixosTestArgs;
               heisenbridge = import ./heisenbridge nixosTestArgs;
               mycelium = import ./mycelium nixosTestArgs;
               localsend = import ./localsend nixosTestArgs;
diff --git a/clanServices/garage/flake-module.nix b/clanServices/garage/flake-module.nix
index 6f02bfcf4..515018419 100644
--- a/clanServices/garage/flake-module.nix
+++ b/clanServices/garage/flake-module.nix
@@ -1,6 +1,18 @@
-{ lib, ... }:
+{ lib, self, ... }:
 {
   clan.modules = {
     garage = lib.modules.importApply ./default.nix { };
   };
+
+  perSystem =
+    { pkgs, ... }:
+    {
+      checks = lib.optionalAttrs (pkgs.stdenv.isLinux) {
+        garage = import ./tests/vm/default.nix {
+          inherit pkgs;
+          clan-core = self;
+          nixosLib = import (self.inputs.nixpkgs + "/nixos/lib") { };
+        };
+      };
+    };
 }
diff --git a/checks/garage/default.nix b/clanServices/garage/tests/vm/default.nix
similarity index 96%
rename from checks/garage/default.nix
rename to clanServices/garage/tests/vm/default.nix
index 300beafb6..91a299ca5 100644
--- a/checks/garage/default.nix
+++ b/clanServices/garage/tests/vm/default.nix
@@ -17,7 +17,7 @@ nixosLib.runTest (
 
     clan = {
       directory = ./.;
-      modules."@clan/garage" = ../../clanServices/garage/default.nix;
+      modules."@clan/garage" = ../../default.nix;
       inventory = {
         machines.server = { };
 
diff --git a/checks/garage/sops/machines/server/key.json b/clanServices/garage/tests/vm/sops/machines/server/key.json
similarity index 100%
rename from checks/garage/sops/machines/server/key.json
rename to clanServices/garage/tests/vm/sops/machines/server/key.json
diff --git a/checks/garage/sops/secrets/server-age.key/secret b/clanServices/garage/tests/vm/sops/secrets/server-age.key/secret
similarity index 100%
rename from checks/garage/sops/secrets/server-age.key/secret
rename to clanServices/garage/tests/vm/sops/secrets/server-age.key/secret
diff --git a/checks/garage/sops/secrets/server-age.key/users/admin b/clanServices/garage/tests/vm/sops/secrets/server-age.key/users/admin
similarity index 100%
rename from checks/garage/sops/secrets/server-age.key/users/admin
rename to clanServices/garage/tests/vm/sops/secrets/server-age.key/users/admin
diff --git a/checks/garage/sops/users/admin/key.json b/clanServices/garage/tests/vm/sops/users/admin/key.json
similarity index 100%
rename from checks/garage/sops/users/admin/key.json
rename to clanServices/garage/tests/vm/sops/users/admin/key.json
diff --git a/checks/garage/vars/per-machine/server/garage/admin_token/machines/server b/clanServices/garage/tests/vm/vars/per-machine/server/garage/admin_token/machines/server
similarity index 100%
rename from checks/garage/vars/per-machine/server/garage/admin_token/machines/server
rename to clanServices/garage/tests/vm/vars/per-machine/server/garage/admin_token/machines/server
diff --git a/checks/garage/vars/per-machine/server/garage/admin_token/secret b/clanServices/garage/tests/vm/vars/per-machine/server/garage/admin_token/secret
similarity index 100%
rename from checks/garage/vars/per-machine/server/garage/admin_token/secret
rename to clanServices/garage/tests/vm/vars/per-machine/server/garage/admin_token/secret
diff --git a/checks/garage/vars/per-machine/server/garage/admin_token/users/admin b/clanServices/garage/tests/vm/vars/per-machine/server/garage/admin_token/users/admin
similarity index 100%
rename from checks/garage/vars/per-machine/server/garage/admin_token/users/admin
rename to clanServices/garage/tests/vm/vars/per-machine/server/garage/admin_token/users/admin
diff --git a/checks/garage/vars/per-machine/server/garage/metrics_token/machines/server b/clanServices/garage/tests/vm/vars/per-machine/server/garage/metrics_token/machines/server
similarity index 100%
rename from checks/garage/vars/per-machine/server/garage/metrics_token/machines/server
rename to clanServices/garage/tests/vm/vars/per-machine/server/garage/metrics_token/machines/server
diff --git a/checks/garage/vars/per-machine/server/garage/metrics_token/secret b/clanServices/garage/tests/vm/vars/per-machine/server/garage/metrics_token/secret
similarity index 100%
rename from checks/garage/vars/per-machine/server/garage/metrics_token/secret
rename to clanServices/garage/tests/vm/vars/per-machine/server/garage/metrics_token/secret
diff --git a/checks/garage/vars/per-machine/server/garage/metrics_token/users/admin b/clanServices/garage/tests/vm/vars/per-machine/server/garage/metrics_token/users/admin
similarity index 100%
rename from checks/garage/vars/per-machine/server/garage/metrics_token/users/admin
rename to clanServices/garage/tests/vm/vars/per-machine/server/garage/metrics_token/users/admin
diff --git a/checks/garage/vars/shared/garage-shared/rpc_secret/machines/server b/clanServices/garage/tests/vm/vars/shared/garage-shared/rpc_secret/machines/server
similarity index 100%
rename from checks/garage/vars/shared/garage-shared/rpc_secret/machines/server
rename to clanServices/garage/tests/vm/vars/shared/garage-shared/rpc_secret/machines/server
diff --git a/checks/garage/vars/shared/garage-shared/rpc_secret/secret b/clanServices/garage/tests/vm/vars/shared/garage-shared/rpc_secret/secret
similarity index 100%
rename from checks/garage/vars/shared/garage-shared/rpc_secret/secret
rename to clanServices/garage/tests/vm/vars/shared/garage-shared/rpc_secret/secret
diff --git a/checks/garage/vars/shared/garage-shared/rpc_secret/users/admin b/clanServices/garage/tests/vm/vars/shared/garage-shared/rpc_secret/users/admin
similarity index 100%
rename from checks/garage/vars/shared/garage-shared/rpc_secret/users/admin
rename to clanServices/garage/tests/vm/vars/shared/garage-shared/rpc_secret/users/admin