diff --git a/modules/all-modules.nix b/modules/all-modules.nix
index 1e4df4e3..982e4f31 100644
--- a/modules/all-modules.nix
+++ b/modules/all-modules.nix
@@ -30,7 +30,6 @@
    ./outputs/vmroot.nix
    ./ppp
    ./ramdisk.nix
-   ./squashfs.nix
    ./ssh
    ./users.nix
    ./vlan
diff --git a/modules/outputs.nix b/modules/outputs.nix
index 2cf4d8b4..e0204eca 100644
--- a/modules/outputs.nix
+++ b/modules/outputs.nix
@@ -11,7 +11,7 @@ let
 in
 {
   imports = [
-    ./squashfs.nix
+    ./outputs/squashfs.nix
     ./outputs/vmroot.nix
     ./outputs/extlinux.nix
   ];
diff --git a/modules/squashfs.nix b/modules/outputs/squashfs.nix
similarity index 100%
rename from modules/squashfs.nix
rename to modules/outputs/squashfs.nix
diff --git a/tests/jffs2/configuration.nix b/tests/jffs2/configuration.nix
index 11d1f3e5..010aa15d 100644
--- a/tests/jffs2/configuration.nix
+++ b/tests/jffs2/configuration.nix
@@ -4,7 +4,7 @@ let
 in {
   imports = [
     ../../vanilla-configuration.nix
-    ../../modules/squashfs.nix
+    ../../modules/outputs/squashfs.nix
     ../../modules/outputs/jffs2.nix
   ];
   config.rootfsType = "jffs2";