diff --git a/modules/programs/firefox/mkFirefoxModule.nix b/modules/programs/firefox/mkFirefoxModule.nix
index 341c8ba12..58817f990 100644
--- a/modules/programs/firefox/mkFirefoxModule.nix
+++ b/modules/programs/firefox/mkFirefoxModule.nix
@@ -16,8 +16,7 @@ let
 
   supportedPlatforms = flatten (attrVals (attrNames platforms) lib.platforms);
 
-  isWrapped = versionAtLeast config.home.stateVersion "19.09"
-    && wrappedPackageName != null;
+  isWrapped = wrappedPackageName != null;
 
   defaultPackageName =
     if isWrapped then wrappedPackageName else unwrappedPackageName;
@@ -192,10 +191,8 @@ in {
         }
       '';
       description = ''
-        The ${appName} package to use. If state version ≥ 19.09 then
-        this should be a wrapped ${appName} package. For earlier state
-        versions it should be an unwrapped ${appName} package.
-        Set to `null` to disable installing ${appName}.
+        The ${appName} package to use. This should be a wrapped ${appName}
+        package. Set to `null` to disable installing ${appName}.
       '';
     };
 
diff --git a/tests/default.nix b/tests/default.nix
index 04d7b1c52..76d72a4d4 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -304,6 +304,10 @@ in import nmtSrc {
     ./modules/programs/emacs
     ./modules/programs/fastfetch
     ./modules/programs/feh
+    ./modules/programs/firefox
+    ./modules/programs/firefox/firefox.nix
+    ./modules/programs/firefox/floorp.nix
+    ./modules/programs/firefox/librewolf.nix
     ./modules/programs/fish
     ./modules/programs/gallery-dl
     ./modules/programs/gh
@@ -451,10 +455,6 @@ in import nmtSrc {
     ./modules/programs/cavalier
     ./modules/programs/distrobox
     ./modules/programs/eww
-    ./modules/programs/firefox
-    ./modules/programs/firefox/firefox.nix
-    ./modules/programs/firefox/floorp.nix
-    ./modules/programs/firefox/librewolf.nix
     ./modules/programs/foot
     ./modules/programs/freetube
     ./modules/programs/fuzzel
diff --git a/tests/modules/programs/firefox/common.nix b/tests/modules/programs/firefox/common.nix
index f086702d1..f7b63103d 100644
--- a/tests/modules/programs/firefox/common.nix
+++ b/tests/modules/programs/firefox/common.nix
@@ -16,6 +16,5 @@ builtins.mapAttrs (test: module: import module [ "programs" name ]) {
   "${name}-profiles-overwrite" = ./profiles/overwrite;
   "${name}-profiles-search" = ./profiles/search;
   "${name}-profiles-settings" = ./profiles/settings;
-  "${name}-state-version-19_09" = ./state-version-19_09.nix;
   "${name}-profiles-shared-path" = ./profiles/shared-path.nix;
 }
diff --git a/tests/modules/programs/firefox/profiles/bookmarks/default.nix b/tests/modules/programs/firefox/profiles/bookmarks/default.nix
index 635b760e1..3a140ae08 100644
--- a/tests/modules/programs/firefox/profiles/bookmarks/default.nix
+++ b/tests/modules/programs/firefox/profiles/bookmarks/default.nix
@@ -66,9 +66,15 @@ in {
       };
     };
   } // {
-    nmt.script = ''
+    nmt.script = let
+      isDarwin = pkgs.stdenv.hostPlatform.isDarwin;
+      profilePath = if isDarwin then
+        "Library/Application Support/Firefox/Profiles"
+      else
+        ".mozilla/firefox";
+    in ''
       bookmarksUserJs=$(normalizeStorePaths \
-        home-files/${cfg.configPath}/bookmarks/user.js)
+        "home-files/${profilePath}/bookmarks/user.js")
 
       assertFileContent \
         $bookmarksUserJs \
@@ -76,7 +82,9 @@ in {
 
       bookmarksFile="$(sed -n \
         '/browser.bookmarks.file/ {s|^.*\(/nix/store[^"]*\).*|\1|;p}' \
-        $TESTED/home-files/${cfg.configPath}/bookmarks/user.js)"
+        $TESTED/home-files/'${profilePath}'/bookmarks/user.js)"""
+
+      echo "bookmarksFile: $bookmarksFile"
 
       assertFileContent \
         $bookmarksFile \
diff --git a/tests/modules/programs/firefox/profiles/containers/default.nix b/tests/modules/programs/firefox/profiles/containers/default.nix
index e0e917773..8a09f35d8 100644
--- a/tests/modules/programs/firefox/profiles/containers/default.nix
+++ b/tests/modules/programs/firefox/profiles/containers/default.nix
@@ -1,11 +1,6 @@
 modulePath:
-{ config, lib, ... }:
-let
-
-  cfg = lib.getAttrFromPath modulePath config;
-
-  firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
-
+{ config, lib, pkgs, ... }:
+let firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
 in {
   imports = [ firefoxMockOverlay ];
 
@@ -20,9 +15,15 @@ in {
       };
     };
   } // {
-    nmt.script = ''
+    nmt.script = let
+      isDarwin = pkgs.stdenv.hostPlatform.isDarwin;
+      profilePath = if isDarwin then
+        "Library/Application Support/Firefox/Profiles"
+      else
+        ".mozilla/firefox";
+    in ''
       assertFileContent \
-        home-files/${cfg.configPath}/containers/containers.json \
+        "home-files/${profilePath}/containers/containers.json" \
         ${./expected-containers.json}
     '';
   });
diff --git a/tests/modules/programs/firefox/profiles/extensions/default.nix b/tests/modules/programs/firefox/profiles/extensions/default.nix
index 77fbe33b0..fba17c01a 100644
--- a/tests/modules/programs/firefox/profiles/extensions/default.nix
+++ b/tests/modules/programs/firefox/profiles/extensions/default.nix
@@ -1,10 +1,7 @@
 modulePath:
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
-let
-  cfg = lib.getAttrFromPath modulePath config;
-
-  firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
+let firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
 in {
   imports = [ firefoxMockOverlay ];
 
@@ -27,9 +24,15 @@ in {
       };
     };
   } // {
-    nmt.script = ''
+    nmt.script = let
+      isDarwin = pkgs.stdenv.hostPlatform.isDarwin;
+      profilePath = if isDarwin then
+        "Library/Application Support/Firefox/Profiles"
+      else
+        ".mozilla/firefox";
+    in ''
       assertFileContent \
-        home-files/${cfg.configPath}/extensions/browser-extension-data/uBlock0@raymondhill.net/storage.js \
+        "home-files/${profilePath}/extensions/browser-extension-data/uBlock0@raymondhill.net/storage.js" \
         ${./expected-storage.js}
     '';
   });
diff --git a/tests/modules/programs/firefox/profiles/overwrite/default.nix b/tests/modules/programs/firefox/profiles/overwrite/default.nix
index 02ec789d6..84ad9b66c 100644
--- a/tests/modules/programs/firefox/profiles/overwrite/default.nix
+++ b/tests/modules/programs/firefox/profiles/overwrite/default.nix
@@ -1,5 +1,5 @@
 modulePath:
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 let
 
@@ -26,15 +26,17 @@ in {
       };
     };
   } // {
-    nmt.script = ''
-      assertFileRegex \
-        home-path/bin/${cfg.wrappedPackageName} \
-        MOZ_APP_LAUNCHER
-
-      assertDirectoryExists home-files/${cfg.configPath}/basic
+    nmt.script = let
+      isDarwin = pkgs.stdenv.hostPlatform.isDarwin;
+      profilePath = if isDarwin then
+        "Library/Application Support/Firefox/Profiles"
+      else
+        ".mozilla/firefox";
+    in ''
+      assertDirectoryExists "home-files/${profilePath}/basic"
 
       assertFileContent \
-        home-files/${cfg.configPath}/test/user.js \
+        "home-files/${profilePath}/test/user.js" \
         ${./expected-user.js}
     '';
   });
diff --git a/tests/modules/programs/firefox/profiles/search/default.nix b/tests/modules/programs/firefox/profiles/search/default.nix
index 76baf1230..ccd19992b 100644
--- a/tests/modules/programs/firefox/profiles/search/default.nix
+++ b/tests/modules/programs/firefox/profiles/search/default.nix
@@ -196,6 +196,11 @@ in {
     };
   } // {
     nmt.script = let
+      isDarwin = pkgs.stdenv.hostPlatform.isDarwin;
+      profilePath = if isDarwin then
+        "Library/Application Support/Firefox/Profiles"
+      else
+        ".mozilla/firefox";
 
       noHashQuery = ''
         'def walk(f):
@@ -228,11 +233,11 @@ in {
       }
 
       assertFirefoxSearchContent \
-        home-files/${cfg.configPath}/search/search.json.mozlz4 \
+        "home-files/${profilePath}/search/search.json.mozlz4" \
         ${withName ./expected-search.json}
 
       assertFirefoxSearchContent \
-        home-files/${cfg.configPath}/searchWithoutDefault/search.json.mozlz4 \
+        "home-files/${profilePath}/searchWithoutDefault/search.json.mozlz4" \
         ${withName ./expected-search-without-default.json}
 
       assertFirefoxSearchContent \
diff --git a/tests/modules/programs/firefox/profiles/settings/default.nix b/tests/modules/programs/firefox/profiles/settings/default.nix
index 9c27a3515..5291e2e22 100644
--- a/tests/modules/programs/firefox/profiles/settings/default.nix
+++ b/tests/modules/programs/firefox/profiles/settings/default.nix
@@ -1,5 +1,5 @@
 modulePath:
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 let
 
@@ -26,15 +26,17 @@ in {
       };
     };
   } // {
-    nmt.script = ''
-      assertFileRegex \
-        home-path/bin/${cfg.wrappedPackageName} \
-        MOZ_APP_LAUNCHER
-
-      assertDirectoryExists home-files/${cfg.configPath}/basic
+    nmt.script = let
+      isDarwin = pkgs.stdenv.hostPlatform.isDarwin;
+      profilePath = if isDarwin then
+        "Library/Application Support/Firefox/Profiles"
+      else
+        ".mozilla/firefox";
+    in ''
+      assertDirectoryExists "home-files/${profilePath}/basic"
 
       assertFileContent \
-        home-files/${cfg.configPath}/test/user.js \
+        "home-files/${profilePath}/test/user.js" \
         ${./expected-user.js}
     '';
   });
diff --git a/tests/modules/programs/firefox/state-version-19_09.nix b/tests/modules/programs/firefox/state-version-19_09.nix
deleted file mode 100644
index b12a4f6fc..000000000
--- a/tests/modules/programs/firefox/state-version-19_09.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-modulePath:
-{ config, lib, ... }:
-let
-  cfg = lib.getAttrFromPath modulePath config;
-
-  firefoxMockOverlay = import ./setup-firefox-mock-overlay.nix modulePath;
-in {
-  imports = [ firefoxMockOverlay ];
-
-  config = lib.mkIf config.test.enableBig ({
-    home.stateVersion = "19.09";
-  } // lib.setAttrByPath modulePath { enable = true; } // {
-    nmt.script = ''
-      assertFileRegex \
-        home-path/bin/${cfg.wrappedPackageName} \
-        MOZ_APP_LAUNCHER
-    '';
-  });
-}