diff --git a/maintainers/flake-module.nix b/maintainers/flake-module.nix
index 1d4e85c8c..1a134b91a 100644
--- a/maintainers/flake-module.nix
+++ b/maintainers/flake-module.nix
@@ -12,6 +12,8 @@
       hooks = {
         clang-format = {
           enable = true;
+          # https://github.com/cachix/git-hooks.nix/pull/532
+          package = pkgs.llvmPackages_latest.clang-tools;
           excludes = [
             # We don't want to format test data
             # ''tests/(?!nixos/).*\.nix''
diff --git a/src/libstore-test-support/tests/libstore.hh b/src/libstore-test-support/tests/libstore.hh
index 84be52c23..699ba957e 100644
--- a/src/libstore-test-support/tests/libstore.hh
+++ b/src/libstore-test-support/tests/libstore.hh
@@ -19,12 +19,12 @@ public:
 protected:
     LibStoreTest()
         : store(openStore({
-            .variant =
-                StoreReference::Specified{
-                    .scheme = "dummy",
-                },
-            .params = {},
-        }))
+              .variant =
+                  StoreReference::Specified{
+                      .scheme = "dummy",
+                  },
+              .params = {},
+          }))
     {
     }
 
diff --git a/tests/nixos/default.nix b/tests/nixos/default.nix
index c5f4a23aa..ff1220f35 100644
--- a/tests/nixos/default.nix
+++ b/tests/nixos/default.nix
@@ -23,6 +23,9 @@ let
         nix.checkAllErrors = false;
         # TODO: decide which packaging stage to use. `nix-cli` is efficient, but not the same as the user-facing `everything.nix` package (`default`). Perhaps a good compromise is `everything.nix` + `noTests` defined above?
         nix.package = nixpkgsFor.${system}.native.nixComponents.nix-cli;
+
+        # Evaluate VMs faster
+        documentation.enable = false;
       };
       _module.args.nixpkgs = nixpkgs;
       _module.args.system = system;