diff --git a/tests/default.nix b/tests/default.nix
index 1c143716..28ce4f64 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -189,7 +189,7 @@ in import nmtSrc {
     ./modules/programs/bemenu
     ./modules/programs/borgmatic
     ./modules/programs/boxxy
-    ./modules/programs/firefox/firefox.nix
+    ./modules/programs/firefox
     ./modules/programs/foot
     ./modules/programs/freetube
     ./modules/programs/fuzzel
diff --git a/tests/modules/programs/firefox/default.nix b/tests/modules/programs/firefox/default.nix
new file mode 100644
index 00000000..2307570d
--- /dev/null
+++ b/tests/modules/programs/firefox/default.nix
@@ -0,0 +1,16 @@
+let name = "firefox";
+
+in builtins.mapAttrs (test: module: import module [ "programs" name ]) {
+  "${name}-deprecated-native-messenger" = ./deprecated-native-messenger.nix;
+  "${name}-policies" = ./policies.nix;
+  "${name}-profile-bookmarks" = ./profiles/bookmarks;
+  "${name}-profile-containers" = ./profiles/containers;
+  "${name}-profile-containers-duplicate-ids" =
+    ./profiles/containers/duplicate-ids.nix;
+  "${name}-profile-containers-id-out-of-range" =
+    ./profiles/containers/id-out-of-range.nix;
+  "${name}-profile-duplicate-ids" = ./profiles/duplicate-ids.nix;
+  "${name}-profile-search" = ./profiles/search;
+  "${name}-profile-settings" = ./profiles/settings;
+  "${name}-state-version-19_09" = ./state-version-19_09.nix;
+}
diff --git a/tests/modules/programs/firefox/firefox.nix b/tests/modules/programs/firefox/firefox.nix
deleted file mode 100644
index 6598d6ec..00000000
--- a/tests/modules/programs/firefox/firefox.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-let name = "firefox";
-
-in builtins.mapAttrs (test: module: import module [ "programs" name ]) {
-  "${name}-profile-settings" = ./profile-settings.nix;
-  "${name}-state-version-19_09" = ./state-version-19_09.nix;
-  "${name}-deprecated-native-messenger" = ./deprecated-native-messenger.nix;
-  "${name}-duplicate-profile-ids" = ./duplicate-profile-ids.nix;
-  "${name}-duplicate-container-ids" = ./duplicate-container-ids.nix;
-  "${name}-container-id-out-of-range" = ./container-id-out-of-range.nix;
-  "${name}-policies" = ./policies.nix;
-}
diff --git a/tests/modules/programs/firefox/profile-settings.nix b/tests/modules/programs/firefox/profile-settings.nix
deleted file mode 100644
index d7776eb4..00000000
--- a/tests/modules/programs/firefox/profile-settings.nix
+++ /dev/null
@@ -1,215 +0,0 @@
-modulePath:
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  cfg = getAttrFromPath modulePath config;
-
-  firefoxMockOverlay = import ./setup-firefox-mock-overlay.nix modulePath;
-
-in {
-  imports = [ firefoxMockOverlay ];
-
-  config = mkIf config.test.enableBig (setAttrByPath modulePath {
-    enable = true;
-    profiles.basic.isDefault = true;
-
-    profiles.test = {
-      id = 1;
-      settings = {
-        "general.smoothScroll" = false;
-        "browser.newtabpage.pinned" = [{
-          title = "NixOS";
-          url = "https://nixos.org";
-        }];
-      };
-    };
-
-    profiles.bookmarks = {
-      id = 2;
-      settings = { "general.smoothScroll" = false; };
-      bookmarks = [
-        {
-          toolbar = true;
-          bookmarks = [{
-            name = "Home Manager";
-            url = "https://wiki.nixos.org/wiki/Home_Manager";
-          }];
-        }
-        {
-          name = "wikipedia";
-          tags = [ "wiki" ];
-          keyword = "wiki";
-          url = "https://en.wikipedia.org/wiki/Special:Search?search=%s&go=Go";
-        }
-        {
-          name = "kernel.org";
-          url = "https://www.kernel.org";
-        }
-        {
-          name = "Nix sites";
-          bookmarks = [
-            {
-              name = "homepage";
-              url = "https://nixos.org/";
-            }
-            {
-              name = "wiki";
-              tags = [ "wiki" "nix" ];
-              url = "https://wiki.nixos.org/";
-            }
-            {
-              name = "Nix sites";
-              bookmarks = [
-                {
-                  name = "homepage";
-                  url = "https://nixos.org/";
-                }
-                {
-                  name = "wiki";
-                  url = "https://wiki.nixos.org/";
-                }
-              ];
-            }
-          ];
-        }
-      ];
-    };
-
-    profiles.search = {
-      id = 3;
-      search = {
-        force = true;
-        default = "Google";
-        privateDefault = "DuckDuckGo";
-        order = [ "Nix Packages" "NixOS Wiki" ];
-        engines = {
-          "Nix Packages" = {
-            urls = [{
-              template = "https://search.nixos.org/packages";
-              params = [
-                {
-                  name = "type";
-                  value = "packages";
-                }
-                {
-                  name = "query";
-                  value = "{searchTerms}";
-                }
-              ];
-            }];
-
-            icon =
-              "/run/current-system/sw/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-
-            definedAliases = [ "@np" ];
-          };
-
-          "NixOS Wiki" = {
-            urls = [{
-              template =
-                "https://wiki.nixos.org/index.php?search={searchTerms}";
-            }];
-            iconUpdateURL = "https://wiki.nixos.org/favicon.png";
-            updateInterval = 24 * 60 * 60 * 1000;
-            definedAliases = [ "@nw" ];
-          };
-
-          "Bing".metaData.hidden = true;
-          "Google".metaData.alias = "@g";
-        };
-      };
-    };
-
-    profiles.searchWithoutDefault = {
-      id = 4;
-      search = {
-        force = true;
-        order = [ "Google" "Nix Packages" ];
-        engines = {
-          "Nix Packages" = {
-            urls = [{
-              template = "https://search.nixos.org/packages";
-              params = [
-                {
-                  name = "type";
-                  value = "packages";
-                }
-                {
-                  name = "query";
-                  value = "{searchTerms}";
-                }
-              ];
-            }];
-
-            definedAliases = [ "@np" ];
-          };
-        };
-      };
-    };
-
-    profiles.containers = {
-      id = 5;
-      containers = {
-        "shopping" = {
-          id = 6;
-          icon = "circle";
-          color = "yellow";
-        };
-      };
-    };
-  } // {
-
-    nmt.script = ''
-      assertFileRegex \
-        home-path/bin/${cfg.wrappedPackageName} \
-        MOZ_APP_LAUNCHER
-
-      assertDirectoryExists home-files/${cfg.configPath}/basic
-
-      assertFileContent \
-        home-files/${cfg.configPath}/test/user.js \
-        ${./profile-settings-expected-user.js}
-
-      assertFileContent \
-        home-files/${cfg.configPath}/containers/containers.json \
-        ${./profile-settings-expected-containers.json}
-
-      bookmarksUserJs=$(normalizeStorePaths \
-        home-files/${cfg.configPath}/bookmarks/user.js)
-
-      assertFileContent \
-        $bookmarksUserJs \
-        ${./profile-settings-expected-bookmarks-user.js}
-
-      bookmarksFile="$(sed -n \
-        '/browser.bookmarks.file/ {s|^.*\(/nix/store[^"]*\).*|\1|;p}' \
-        $TESTED/home-files/${cfg.configPath}/bookmarks/user.js)"
-
-      assertFileContent \
-        $bookmarksFile \
-        ${./profile-settings-expected-bookmarks.html}
-
-      function assertFirefoxSearchContent() {
-        compressedSearch=$(normalizeStorePaths "$1")
-
-        decompressedSearch=$(dirname $compressedSearch)/search.json
-        ${pkgs.mozlz4a}/bin/mozlz4a -d "$compressedSearch" >(${pkgs.jq}/bin/jq . > "$decompressedSearch")
-
-        assertFileContent \
-          $decompressedSearch \
-          "$2"
-      }
-
-      assertFirefoxSearchContent \
-        home-files/${cfg.configPath}/search/search.json.mozlz4 \
-        ${./profile-settings-expected-search.json}
-
-      assertFirefoxSearchContent \
-        home-files/${cfg.configPath}/searchWithoutDefault/search.json.mozlz4 \
-        ${./profile-settings-expected-search-without-default.json}
-    '';
-  });
-}
diff --git a/tests/modules/programs/firefox/profiles/bookmarks/default.nix b/tests/modules/programs/firefox/profiles/bookmarks/default.nix
new file mode 100644
index 00000000..7bf508ab
--- /dev/null
+++ b/tests/modules/programs/firefox/profiles/bookmarks/default.nix
@@ -0,0 +1,84 @@
+modulePath:
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = getAttrFromPath modulePath config;
+
+  firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
+
+in {
+  imports = [ firefoxMockOverlay ];
+
+  config = mkIf config.test.enableBig (setAttrByPath modulePath {
+    enable = true;
+    profiles.bookmarks = {
+      settings = { "general.smoothScroll" = false; };
+      bookmarks = [
+        {
+          toolbar = true;
+          bookmarks = [{
+            name = "Home Manager";
+            url = "https://wiki.nixos.org/wiki/Home_Manager";
+          }];
+        }
+        {
+          name = "wikipedia";
+          tags = [ "wiki" ];
+          keyword = "wiki";
+          url = "https://en.wikipedia.org/wiki/Special:Search?search=%s&go=Go";
+        }
+        {
+          name = "kernel.org";
+          url = "https://www.kernel.org";
+        }
+        {
+          name = "Nix sites";
+          bookmarks = [
+            {
+              name = "homepage";
+              url = "https://nixos.org/";
+            }
+            {
+              name = "wiki";
+              tags = [ "wiki" "nix" ];
+              url = "https://wiki.nixos.org/";
+            }
+            {
+              name = "Nix sites";
+              bookmarks = [
+                {
+                  name = "homepage";
+                  url = "https://nixos.org/";
+                }
+                {
+                  name = "wiki";
+                  url = "https://wiki.nixos.org/";
+                }
+              ];
+            }
+          ];
+        }
+      ];
+    };
+  } // {
+    nmt.script = ''
+      bookmarksUserJs=$(normalizeStorePaths \
+        home-files/${cfg.configPath}/bookmarks/user.js)
+
+      assertFileContent \
+        $bookmarksUserJs \
+        ${./expected-bookmarks-user.js}
+
+      bookmarksFile="$(sed -n \
+        '/browser.bookmarks.file/ {s|^.*\(/nix/store[^"]*\).*|\1|;p}' \
+        $TESTED/home-files/${cfg.configPath}/bookmarks/user.js)"
+
+      assertFileContent \
+        $bookmarksFile \
+        ${./expected-bookmarks.html}
+    '';
+  });
+}
diff --git a/tests/modules/programs/firefox/profile-settings-expected-bookmarks-user.js b/tests/modules/programs/firefox/profiles/bookmarks/expected-bookmarks-user.js
similarity index 100%
rename from tests/modules/programs/firefox/profile-settings-expected-bookmarks-user.js
rename to tests/modules/programs/firefox/profiles/bookmarks/expected-bookmarks-user.js
diff --git a/tests/modules/programs/firefox/profile-settings-expected-bookmarks.html b/tests/modules/programs/firefox/profiles/bookmarks/expected-bookmarks.html
similarity index 100%
rename from tests/modules/programs/firefox/profile-settings-expected-bookmarks.html
rename to tests/modules/programs/firefox/profiles/bookmarks/expected-bookmarks.html
diff --git a/tests/modules/programs/firefox/profiles/containers/default.nix b/tests/modules/programs/firefox/profiles/containers/default.nix
new file mode 100644
index 00000000..6a0d9e93
--- /dev/null
+++ b/tests/modules/programs/firefox/profiles/containers/default.nix
@@ -0,0 +1,32 @@
+modulePath:
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = getAttrFromPath modulePath config;
+
+  firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
+
+in {
+  imports = [ firefoxMockOverlay ];
+
+  config = mkIf config.test.enableBig (setAttrByPath modulePath {
+    enable = true;
+    profiles.containers = {
+      containers = {
+        "shopping" = {
+          icon = "circle";
+          color = "yellow";
+        };
+      };
+    };
+  } // {
+    nmt.script = ''
+      assertFileContent \
+        home-files/${cfg.configPath}/containers/containers.json \
+        ${./expected-containers.json}
+    '';
+  });
+}
diff --git a/tests/modules/programs/firefox/duplicate-container-ids.nix b/tests/modules/programs/firefox/profiles/containers/duplicate-ids.nix
similarity index 90%
rename from tests/modules/programs/firefox/duplicate-container-ids.nix
rename to tests/modules/programs/firefox/profiles/containers/duplicate-ids.nix
index 2ad99b4b..a6052216 100644
--- a/tests/modules/programs/firefox/duplicate-container-ids.nix
+++ b/tests/modules/programs/firefox/profiles/containers/duplicate-ids.nix
@@ -7,7 +7,7 @@ let
 
   cfg = getAttrFromPath modulePath config;
 
-  firefoxMockOverlay = import ./setup-firefox-mock-overlay.nix modulePath;
+  firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
 
 in {
   imports = [ firefoxMockOverlay ];
diff --git a/tests/modules/programs/firefox/profile-settings-expected-containers.json b/tests/modules/programs/firefox/profiles/containers/expected-containers.json
similarity index 66%
rename from tests/modules/programs/firefox/profile-settings-expected-containers.json
rename to tests/modules/programs/firefox/profiles/containers/expected-containers.json
index 8eea5555..d957b0c5 100644
--- a/tests/modules/programs/firefox/profile-settings-expected-containers.json
+++ b/tests/modules/programs/firefox/profiles/containers/expected-containers.json
@@ -1 +1 @@
-{"identities":[{"color":"yellow","icon":"circle","name":"shopping","public":true,"userContextId":6},{"accessKey":"","color":"","icon":"","name":"userContextIdInternal.thumbnail","public":false,"userContextId":4294967294},{"accessKey":"","color":"","icon":"","name":"userContextIdInternal.webextStorageLocal","public":false,"userContextId":4294967295}],"lastUserContextId":6,"version":4}
+{"identities":[{"color":"yellow","icon":"circle","name":"shopping","public":true,"userContextId":0},{"accessKey":"","color":"","icon":"","name":"userContextIdInternal.thumbnail","public":false,"userContextId":4294967294},{"accessKey":"","color":"","icon":"","name":"userContextIdInternal.webextStorageLocal","public":false,"userContextId":4294967295}],"lastUserContextId":0,"version":4}
diff --git a/tests/modules/programs/firefox/container-id-out-of-range.nix b/tests/modules/programs/firefox/profiles/containers/id-out-of-range.nix
similarity index 86%
rename from tests/modules/programs/firefox/container-id-out-of-range.nix
rename to tests/modules/programs/firefox/profiles/containers/id-out-of-range.nix
index 2ea08e88..f3966672 100644
--- a/tests/modules/programs/firefox/container-id-out-of-range.nix
+++ b/tests/modules/programs/firefox/profiles/containers/id-out-of-range.nix
@@ -5,7 +5,7 @@ with lib;
 
 let
 
-  firefoxMockOverlay = import ./setup-firefox-mock-overlay.nix modulePath;
+  firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
 
 in {
   imports = [ firefoxMockOverlay ];
diff --git a/tests/modules/programs/firefox/duplicate-profile-ids.nix b/tests/modules/programs/firefox/profiles/duplicate-ids.nix
similarity index 87%
rename from tests/modules/programs/firefox/duplicate-profile-ids.nix
rename to tests/modules/programs/firefox/profiles/duplicate-ids.nix
index ad946af1..dc5557b4 100644
--- a/tests/modules/programs/firefox/duplicate-profile-ids.nix
+++ b/tests/modules/programs/firefox/profiles/duplicate-ids.nix
@@ -7,7 +7,7 @@ let
 
   cfg = getAttrFromPath modulePath config;
 
-  firefoxMockOverlay = import ./setup-firefox-mock-overlay.nix modulePath;
+  firefoxMockOverlay = import ../setup-firefox-mock-overlay.nix modulePath;
 
 in {
   imports = [ firefoxMockOverlay ];
diff --git a/tests/modules/programs/firefox/profiles/search/default.nix b/tests/modules/programs/firefox/profiles/search/default.nix
new file mode 100644
index 00000000..8a4c98e9
--- /dev/null
+++ b/tests/modules/programs/firefox/profiles/search/default.nix
@@ -0,0 +1,112 @@
+modulePath:
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = getAttrFromPath modulePath config;
+
+  firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
+
+in {
+  imports = [ firefoxMockOverlay ];
+
+  config = mkIf config.test.enableBig (setAttrByPath modulePath {
+    enable = true;
+    profiles = {
+      search = {
+        id = 0;
+        search = {
+          force = true;
+          default = "Google";
+          privateDefault = "DuckDuckGo";
+          order = [ "Nix Packages" "NixOS Wiki" ];
+          engines = {
+            "Nix Packages" = {
+              urls = [{
+                template = "https://search.nixos.org/packages";
+                params = [
+                  {
+                    name = "type";
+                    value = "packages";
+                  }
+                  {
+                    name = "query";
+                    value = "{searchTerms}";
+                  }
+                ];
+              }];
+
+              icon =
+                "/run/current-system/sw/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+
+              definedAliases = [ "@np" ];
+            };
+
+            "NixOS Wiki" = {
+              urls = [{
+                template =
+                  "https://wiki.nixos.org/index.php?search={searchTerms}";
+              }];
+              iconUpdateURL = "https://wiki.nixos.org/favicon.png";
+              updateInterval = 24 * 60 * 60 * 1000;
+              definedAliases = [ "@nw" ];
+            };
+
+            "Bing".metaData.hidden = true;
+            "Google".metaData.alias = "@g";
+          };
+        };
+      };
+
+      searchWithoutDefault = {
+        id = 1;
+        search = {
+          force = true;
+          order = [ "Google" "Nix Packages" ];
+          engines = {
+            "Nix Packages" = {
+              urls = [{
+                template = "https://search.nixos.org/packages";
+                params = [
+                  {
+                    name = "type";
+                    value = "packages";
+                  }
+                  {
+                    name = "query";
+                    value = "{searchTerms}";
+                  }
+                ];
+              }];
+
+              definedAliases = [ "@np" ];
+            };
+          };
+        };
+      };
+    };
+  } // {
+    nmt.script = ''
+      function assertFirefoxSearchContent() {
+        compressedSearch=$(normalizeStorePaths "$1")
+
+        decompressedSearch=$(dirname $compressedSearch)/search.json
+        ${pkgs.mozlz4a}/bin/mozlz4a -d "$compressedSearch" >(${pkgs.jq}/bin/jq . > "$decompressedSearch")
+
+        assertFileContent \
+          $decompressedSearch \
+          "$2"
+      }
+
+      assertFirefoxSearchContent \
+        home-files/${cfg.configPath}/search/search.json.mozlz4 \
+        ${./expected-search.json}
+
+      assertFirefoxSearchContent \
+        home-files/${cfg.configPath}/searchWithoutDefault/search.json.mozlz4 \
+        ${./expected-search-without-default.json}
+    '';
+  });
+}
diff --git a/tests/modules/programs/firefox/profile-settings-expected-search-without-default.json b/tests/modules/programs/firefox/profiles/search/expected-search-without-default.json
similarity index 100%
rename from tests/modules/programs/firefox/profile-settings-expected-search-without-default.json
rename to tests/modules/programs/firefox/profiles/search/expected-search-without-default.json
diff --git a/tests/modules/programs/firefox/profile-settings-expected-search.json b/tests/modules/programs/firefox/profiles/search/expected-search.json
similarity index 100%
rename from tests/modules/programs/firefox/profile-settings-expected-search.json
rename to tests/modules/programs/firefox/profiles/search/expected-search.json
diff --git a/tests/modules/programs/firefox/profiles/settings/default.nix b/tests/modules/programs/firefox/profiles/settings/default.nix
new file mode 100644
index 00000000..39d329ec
--- /dev/null
+++ b/tests/modules/programs/firefox/profiles/settings/default.nix
@@ -0,0 +1,43 @@
+modulePath:
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = getAttrFromPath modulePath config;
+
+  firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
+
+in {
+  imports = [ firefoxMockOverlay ];
+
+  config = mkIf config.test.enableBig (setAttrByPath modulePath {
+    enable = true;
+    profiles = {
+      basic.isDefault = true;
+      test = {
+        id = 1;
+        settings = {
+          "general.smoothScroll" = false;
+          "browser.newtabpage.pinned" = [{
+            title = "NixOS";
+            url = "https://nixos.org";
+          }];
+        };
+      };
+    };
+  } // {
+    nmt.script = ''
+      assertFileRegex \
+        home-path/bin/${cfg.wrappedPackageName} \
+        MOZ_APP_LAUNCHER
+
+      assertDirectoryExists home-files/${cfg.configPath}/basic
+
+      assertFileContent \
+        home-files/${cfg.configPath}/test/user.js \
+        ${./expected-user.js}
+    '';
+  });
+}
diff --git a/tests/modules/programs/firefox/profile-settings-expected-user.js b/tests/modules/programs/firefox/profiles/settings/expected-user.js
similarity index 100%
rename from tests/modules/programs/firefox/profile-settings-expected-user.js
rename to tests/modules/programs/firefox/profiles/settings/expected-user.js