diff --git a/flake-modules/checks.nix b/flake-modules/checks.nix
index b6ffeff892..48b55865fc 100644
--- a/flake-modules/checks.nix
+++ b/flake-modules/checks.nix
@@ -27,7 +27,6 @@
         inherit pkgs;
         inherit (pkgs) lib;
       };
-      docs = config.packages.docs ? null;
     };
   };
 }
diff --git a/flake-modules/packages.nix b/flake-modules/packages.nix
index 23b9d1aa64..8d85505a54 100644
--- a/flake-modules/packages.nix
+++ b/flake-modules/packages.nix
@@ -22,5 +22,8 @@
     in
       docs
       // man-docs;
+
+    # Test that all packages build fine when running `nix flake check`.
+    checks = config.packages;
   };
 }