diff --git a/tests/default.nix b/tests/default.nix
index 2b4a7861..543bd7fe 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -12,5 +12,6 @@ in
   modules = {
     home-manager = import ./modules/home-manager { inherit pkgs utils; };
     nixos = import ./modules/nixos { inherit pkgs utils; };
+    wrapper-manager = import ./modules/wrapper-manager { inherit pkgs; };
   };
 }
diff --git a/tests/modules/wrapper-manager/README.adoc b/tests/modules/wrapper-manager/README.adoc
new file mode 100644
index 00000000..40dc3ffe
--- /dev/null
+++ b/tests/modules/wrapper-manager/README.adoc
@@ -0,0 +1,6 @@
+= wrapper-manager-fds custom module tests
+:toc:
+
+The test infrastructure for my custom wrapper-manager modules.
+This should handle both the public and private modules.
+The main file you should be paying attention first and foremost is in link:./default.nix[./default.nix] where it sets up the entire test for all of them.
diff --git a/tests/modules/wrapper-manager/default.nix b/tests/modules/wrapper-manager/default.nix
new file mode 100644
index 00000000..ac11c9b0
--- /dev/null
+++ b/tests/modules/wrapper-manager/default.nix
@@ -0,0 +1,23 @@
+{ pkgs ? import <nixpkgs> { } }:
+
+let
+  inherit (pkgs) lib;
+  wrapperManager = import ../../../subprojects/wrapper-manager-fds { };
+  wrapperManagerEval = module: args: wrapperManager.lib.build (args // {
+    pkgs = args.pkgs or pkgs;
+    modules = args.extraModules or [ ] ++ [
+      module
+      ../../../modules/wrapper-manager
+      ../../../modules/wrapper-manager/_private
+    ];
+  });
+
+  runTests = path: args:
+    lib.mapAttrs (_: v: wrapperManagerEval v args) (import path);
+in
+{
+  neovim = runTests ./programs/neovim { };
+  bubblewrap = runTests ./sandboxing/bubblewrap { };
+  boxxy = runTests ./sandboxing/boxxy { };
+  zellij = runTests ./programs/zellij { };
+}
diff --git a/tests/modules/wrapper-manager/programs/neovim/basic.nix b/tests/modules/wrapper-manager/programs/neovim/basic.nix
new file mode 100644
index 00000000..c53b0772
--- /dev/null
+++ b/tests/modules/wrapper-manager/programs/neovim/basic.nix
@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }:
+
+{
+  programs.neovim = {
+    enable = true;
+  };
+
+  build.extraPassthru.tests = {
+    runWithNeovim = let
+      wrapper = config.build.toplevel;
+    in pkgs.runCommand ''
+      [ -x ${lib.getExe' wrapper "nvim"} ] && touch $out
+    '';
+  };
+}
diff --git a/tests/modules/wrapper-manager/programs/neovim/default.nix b/tests/modules/wrapper-manager/programs/neovim/default.nix
new file mode 100644
index 00000000..7fff7787
--- /dev/null
+++ b/tests/modules/wrapper-manager/programs/neovim/default.nix
@@ -0,0 +1,3 @@
+{
+  basic = ./basic.nix;
+}
diff --git a/tests/modules/wrapper-manager/programs/zellij/basic.nix b/tests/modules/wrapper-manager/programs/zellij/basic.nix
new file mode 100644
index 00000000..3a7a5b58
--- /dev/null
+++ b/tests/modules/wrapper-manager/programs/zellij/basic.nix
@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+
+{
+  programs.zellij.enable = true;
+  programs.zellij.configFile = ./config/config.kdl;
+
+  build.extraPassthru.tests = {
+    checkZellijConfigDir = let
+      wrapper = lib.getExe' config.build.toplevel "zellij";
+  in pkgs.runCommandLocal "zellij-check-config-dir" { } ''
+      [ $(${wrapper} setup --check | awk -F':' '/^\[LOOKING FOR CONFIG FILE FROM]/ { gsub(/"|\s/, "", $2); print $2; }') = ${./config/config.kdl} ] && touch $out
+    '';
+  };
+}
diff --git a/tests/modules/wrapper-manager/programs/zellij/config/config.kdl b/tests/modules/wrapper-manager/programs/zellij/config/config.kdl
new file mode 100644
index 00000000..0d49686e
--- /dev/null
+++ b/tests/modules/wrapper-manager/programs/zellij/config/config.kdl
@@ -0,0 +1,365 @@
+// If you'd like to override the default keybindings completely, be sure to change "keybinds" to "keybinds clear-defaults=true"
+keybinds {
+    normal {
+        // uncomment this and adjust key if using copy_on_select=false
+        // bind "Alt c" { Copy; }
+    }
+    locked {
+        bind "Ctrl g" { SwitchToMode "Normal"; }
+    }
+    resize {
+        bind "Ctrl n" { SwitchToMode "Normal"; }
+        bind "h" "Left" { Resize "Increase Left"; }
+        bind "j" "Down" { Resize "Increase Down"; }
+        bind "k" "Up" { Resize "Increase Up"; }
+        bind "l" "Right" { Resize "Increase Right"; }
+        bind "H" { Resize "Decrease Left"; }
+        bind "J" { Resize "Decrease Down"; }
+        bind "K" { Resize "Decrease Up"; }
+        bind "L" { Resize "Decrease Right"; }
+        bind "=" "+" { Resize "Increase"; }
+        bind "-" { Resize "Decrease"; }
+    }
+    pane {
+        bind "Ctrl p" { SwitchToMode "Normal"; }
+        bind "h" "Left" { MoveFocus "Left"; }
+        bind "l" "Right" { MoveFocus "Right"; }
+        bind "j" "Down" { MoveFocus "Down"; }
+        bind "k" "Up" { MoveFocus "Up"; }
+        bind "p" { SwitchFocus; }
+        bind "n" { NewPane; SwitchToMode "Normal"; }
+        bind "d" { NewPane "Down"; SwitchToMode "Normal"; }
+        bind "r" { NewPane "Right"; SwitchToMode "Normal"; }
+        bind "x" { CloseFocus; SwitchToMode "Normal"; }
+        bind "f" { ToggleFocusFullscreen; SwitchToMode "Normal"; }
+        bind "z" { TogglePaneFrames; SwitchToMode "Normal"; }
+        bind "w" { ToggleFloatingPanes; SwitchToMode "Normal"; }
+        bind "e" { TogglePaneEmbedOrFloating; SwitchToMode "Normal"; }
+        bind "c" { SwitchToMode "RenamePane"; PaneNameInput 0;}
+    }
+    move {
+        bind "Ctrl h" { SwitchToMode "Normal"; }
+        bind "n" "Tab" { MovePane; }
+        bind "p" { MovePaneBackwards; }
+        bind "h" "Left" { MovePane "Left"; }
+        bind "j" "Down" { MovePane "Down"; }
+        bind "k" "Up" { MovePane "Up"; }
+        bind "l" "Right" { MovePane "Right"; }
+    }
+    tab {
+        bind "Ctrl t" { SwitchToMode "Normal"; }
+        bind "r" { SwitchToMode "RenameTab"; TabNameInput 0; }
+        bind "h" "Left" "Up" "k" { GoToPreviousTab; }
+        bind "l" "Right" "Down" "j" { GoToNextTab; }
+        bind "n" { NewTab; SwitchToMode "Normal"; }
+        bind "x" { CloseTab; SwitchToMode "Normal"; }
+        bind "s" { ToggleActiveSyncTab; SwitchToMode "Normal"; }
+        bind "b" { BreakPane; SwitchToMode "Normal"; }
+        bind "]" { BreakPaneRight; SwitchToMode "Normal"; }
+        bind "[" { BreakPaneLeft; SwitchToMode "Normal"; }
+        bind "1" { GoToTab 1; SwitchToMode "Normal"; }
+        bind "2" { GoToTab 2; SwitchToMode "Normal"; }
+        bind "3" { GoToTab 3; SwitchToMode "Normal"; }
+        bind "4" { GoToTab 4; SwitchToMode "Normal"; }
+        bind "5" { GoToTab 5; SwitchToMode "Normal"; }
+        bind "6" { GoToTab 6; SwitchToMode "Normal"; }
+        bind "7" { GoToTab 7; SwitchToMode "Normal"; }
+        bind "8" { GoToTab 8; SwitchToMode "Normal"; }
+        bind "9" { GoToTab 9; SwitchToMode "Normal"; }
+        bind "Tab" { ToggleTab; }
+    }
+    scroll {
+        bind "Ctrl s" { SwitchToMode "Normal"; }
+        bind "e" { EditScrollback; SwitchToMode "Normal"; }
+        bind "s" { SwitchToMode "EnterSearch"; SearchInput 0; }
+        bind "Ctrl c" { ScrollToBottom; SwitchToMode "Normal"; }
+        bind "j" "Down" { ScrollDown; }
+        bind "k" "Up" { ScrollUp; }
+        bind "Ctrl f" "PageDown" "Right" "l" { PageScrollDown; }
+        bind "Ctrl b" "PageUp" "Left" "h" { PageScrollUp; }
+        bind "d" { HalfPageScrollDown; }
+        bind "u" { HalfPageScrollUp; }
+        // uncomment this and adjust key if using copy_on_select=false
+        // bind "Alt c" { Copy; }
+    }
+    search {
+        bind "Ctrl s" { SwitchToMode "Normal"; }
+        bind "Ctrl c" { ScrollToBottom; SwitchToMode "Normal"; }
+        bind "j" "Down" { ScrollDown; }
+        bind "k" "Up" { ScrollUp; }
+        bind "Ctrl f" "PageDown" "Right" "l" { PageScrollDown; }
+        bind "Ctrl b" "PageUp" "Left" "h" { PageScrollUp; }
+        bind "d" { HalfPageScrollDown; }
+        bind "u" { HalfPageScrollUp; }
+        bind "n" { Search "down"; }
+        bind "p" { Search "up"; }
+        bind "c" { SearchToggleOption "CaseSensitivity"; }
+        bind "w" { SearchToggleOption "Wrap"; }
+        bind "o" { SearchToggleOption "WholeWord"; }
+    }
+    entersearch {
+        bind "Ctrl c" "Esc" { SwitchToMode "Scroll"; }
+        bind "Enter" { SwitchToMode "Search"; }
+    }
+    renametab {
+        bind "Ctrl c" { SwitchToMode "Normal"; }
+        bind "Esc" { UndoRenameTab; SwitchToMode "Tab"; }
+    }
+    renamepane {
+        bind "Ctrl c" { SwitchToMode "Normal"; }
+        bind "Esc" { UndoRenamePane; SwitchToMode "Pane"; }
+    }
+    session {
+        bind "Ctrl o" { SwitchToMode "Normal"; }
+        bind "Ctrl s" { SwitchToMode "Scroll"; }
+        bind "d" { Detach; }
+        bind "w" {
+            LaunchOrFocusPlugin "session-manager" {
+                floating true
+                move_to_focused_tab true
+            };
+            SwitchToMode "Normal"
+        }
+    }
+    tmux {
+        bind "[" { SwitchToMode "Scroll"; }
+        bind "Ctrl b" { Write 2; SwitchToMode "Normal"; }
+        bind "\"" { NewPane "Down"; SwitchToMode "Normal"; }
+        bind "%" { NewPane "Right"; SwitchToMode "Normal"; }
+        bind "z" { ToggleFocusFullscreen; SwitchToMode "Normal"; }
+        bind "c" { NewTab; SwitchToMode "Normal"; }
+        bind "," { SwitchToMode "RenameTab"; }
+        bind "p" { GoToPreviousTab; SwitchToMode "Normal"; }
+        bind "n" { GoToNextTab; SwitchToMode "Normal"; }
+        bind "Left" { MoveFocus "Left"; SwitchToMode "Normal"; }
+        bind "Right" { MoveFocus "Right"; SwitchToMode "Normal"; }
+        bind "Down" { MoveFocus "Down"; SwitchToMode "Normal"; }
+        bind "Up" { MoveFocus "Up"; SwitchToMode "Normal"; }
+        bind "h" { MoveFocus "Left"; SwitchToMode "Normal"; }
+        bind "l" { MoveFocus "Right"; SwitchToMode "Normal"; }
+        bind "j" { MoveFocus "Down"; SwitchToMode "Normal"; }
+        bind "k" { MoveFocus "Up"; SwitchToMode "Normal"; }
+        bind "o" { FocusNextPane; }
+        bind "d" { Detach; }
+        bind "Space" { NextSwapLayout; }
+        bind "x" { CloseFocus; SwitchToMode "Normal"; }
+    }
+    shared_except "locked" {
+        bind "Ctrl g" { SwitchToMode "Locked"; }
+        bind "Ctrl q" { Quit; }
+        bind "Alt n" { NewPane; }
+        bind "Alt i" { MoveTab "Left"; }
+        bind "Alt o" { MoveTab "Right"; }
+        bind "Alt h" "Alt Left" { MoveFocusOrTab "Left"; }
+        bind "Alt l" "Alt Right" { MoveFocusOrTab "Right"; }
+        bind "Alt j" "Alt Down" { MoveFocus "Down"; }
+        bind "Alt k" "Alt Up" { MoveFocus "Up"; }
+        bind "Alt =" "Alt +" { Resize "Increase"; }
+        bind "Alt -" { Resize "Decrease"; }
+        bind "Alt [" { PreviousSwapLayout; }
+        bind "Alt ]" { NextSwapLayout; }
+    }
+    shared_except "normal" "locked" {
+        bind "Enter" "Esc" { SwitchToMode "Normal"; }
+    }
+    shared_except "pane" "locked" {
+        bind "Ctrl p" { SwitchToMode "Pane"; }
+    }
+    shared_except "resize" "locked" {
+        bind "Ctrl n" { SwitchToMode "Resize"; }
+    }
+    shared_except "scroll" "locked" {
+        bind "Ctrl s" { SwitchToMode "Scroll"; }
+    }
+    shared_except "session" "locked" {
+        bind "Ctrl o" { SwitchToMode "Session"; }
+    }
+    shared_except "tab" "locked" {
+        bind "Ctrl t" { SwitchToMode "Tab"; }
+    }
+    shared_except "move" "locked" {
+        bind "Ctrl h" { SwitchToMode "Move"; }
+    }
+    shared_except "tmux" "locked" {
+        bind "Ctrl b" { SwitchToMode "Tmux"; }
+    }
+}
+
+plugins {
+    tab-bar location="zellij:tab-bar"
+    status-bar location="zellij:status-bar"
+    strider location="zellij:strider"
+    compact-bar location="zellij:compact-bar"
+    session-manager location="zellij:session-manager"
+    welcome-screen location="zellij:session-manager" {
+        welcome_screen true
+    }
+    filepicker location="zellij:strider" {
+        cwd "/"
+    }
+}
+
+// Choose what to do when zellij receives SIGTERM, SIGINT, SIGQUIT or SIGHUP
+// eg. when terminal window with an active zellij session is closed
+// Options:
+//   - detach (Default)
+//   - quit
+//
+// on_force_close "quit"
+
+//  Send a request for a simplified ui (without arrow fonts) to plugins
+//  Options:
+//    - true
+//    - false (Default)
+//
+// simplified_ui true
+
+// Choose the path to the default shell that zellij will use for opening new panes
+// Default: $SHELL
+//
+// default_shell "fish"
+
+// Choose the path to override cwd that zellij will use for opening new panes
+//
+// default_cwd ""
+
+// Toggle between having pane frames around the panes
+// Options:
+//   - true (default)
+//   - false
+//
+// pane_frames true
+
+// Toggle between having Zellij lay out panes according to a predefined set of layouts whenever possible
+// Options:
+//   - true (default)
+//   - false
+//
+// auto_layout true
+
+// Whether sessions should be serialized to the cache folder (including their tabs/panes, cwds and running commands) so that they can later be resurrected
+// Options:
+//   - true (default)
+//   - false
+//
+// session_serialization false
+
+// Whether pane viewports are serialized along with the session, default is false
+// Options:
+//   - true
+//   - false (default)
+// serialize_pane_viewport true
+
+// Scrollback lines to serialize along with the pane viewport when serializing sessions, 0
+// defaults to the scrollback size. If this number is higher than the scrollback size, it will
+// also default to the scrollback size. This does nothing if `serialize_pane_viewport` is not true.
+//
+// scrollback_lines_to_serialize 10000
+
+// Define color themes for Zellij
+// For more examples, see: https://github.com/zellij-org/zellij/tree/main/example/themes
+// Once these themes are defined, one of them should to be selected in the "theme" section of this file
+//
+// themes {
+//     dracula {
+//         fg 248 248 242
+//         bg 40 42 54
+//         red 255 85 85
+//         green 80 250 123
+//         yellow 241 250 140
+//         blue 98 114 164
+//         magenta 255 121 198
+//         orange 255 184 108
+//         cyan 139 233 253
+//         black 0 0 0
+//         white 255 255 255
+//     }
+// }
+
+// Choose the theme that is specified in the themes section.
+// Default: default
+//
+// theme "default"
+
+// The name of the default layout to load on startup
+// Default: "default"
+//
+// default_layout "compact"
+
+// Choose the mode that zellij uses when starting up.
+// Default: normal
+//
+// default_mode "locked"
+
+// Toggle enabling the mouse mode.
+// On certain configurations, or terminals this could
+// potentially interfere with copying text.
+// Options:
+//   - true (default)
+//   - false
+//
+// mouse_mode false
+
+// Configure the scroll back buffer size
+// This is the number of lines zellij stores for each pane in the scroll back
+// buffer. Excess number of lines are discarded in a FIFO fashion.
+// Valid values: positive integers
+// Default value: 10000
+//
+// scroll_buffer_size 10000
+
+// Provide a command to execute when copying text. The text will be piped to
+// the stdin of the program to perform the copy. This can be used with
+// terminal emulators which do not support the OSC 52 ANSI control sequence
+// that will be used by default if this option is not set.
+// Examples:
+//
+// copy_command "xclip -selection clipboard" // x11
+// copy_command "wl-copy"                    // wayland
+// copy_command "pbcopy"                     // osx
+
+// Choose the destination for copied text
+// Allows using the primary selection buffer (on x11/wayland) instead of the system clipboard.
+// Does not apply when using copy_command.
+// Options:
+//   - system (default)
+//   - primary
+//
+// copy_clipboard "primary"
+
+// Enable or disable automatic copy (and clear) of selection when releasing mouse
+// Default: true
+//
+// copy_on_select false
+
+// Path to the default editor to use to edit pane scrollbuffer
+// Default: $EDITOR or $VISUAL
+//
+// scrollback_editor "/usr/bin/vim"
+
+// When attaching to an existing session with other users,
+// should the session be mirrored (true)
+// or should each user have their own cursor (false)
+// Default: false
+//
+// mirror_session true
+
+// The folder in which Zellij will look for layouts
+//
+// layout_dir "/path/to/my/layout_dir"
+
+// The folder in which Zellij will look for themes
+//
+// theme_dir "/path/to/my/theme_dir"
+
+// Enable or disable the rendering of styled and colored underlines (undercurl).
+// May need to be disabled for certain unsupported terminals
+// Default: true
+//
+// styled_underlines false
+
+// Enable or disable writing of session metadata to disk (if disabled, other sessions might not know
+// metadata info on this session)
+// Default: false
+//
+// disable_session_metadata true
diff --git a/tests/modules/wrapper-manager/programs/zellij/default.nix b/tests/modules/wrapper-manager/programs/zellij/default.nix
new file mode 100644
index 00000000..7fff7787
--- /dev/null
+++ b/tests/modules/wrapper-manager/programs/zellij/default.nix
@@ -0,0 +1,3 @@
+{
+  basic = ./basic.nix;
+}
diff --git a/tests/modules/wrapper-manager/sandboxing/boxxy/basic.nix b/tests/modules/wrapper-manager/sandboxing/boxxy/basic.nix
new file mode 100644
index 00000000..4b6a2181
--- /dev/null
+++ b/tests/modules/wrapper-manager/sandboxing/boxxy/basic.nix
@@ -0,0 +1,22 @@
+{ config, lib, pkgs, ... }:
+
+{
+  build.isBinary = false;
+  locale.enable = true;
+
+  wrappers.tmux = {
+    sandboxing.variant = "boxxy";
+    sandboxing.wraparound.arg0 = lib.getExe' pkgs.tmux "tmux";
+    sandboxing.boxxy.rules = {
+      "~/.config/tmux/tmux.conf".source = "~/.tmux.conf";
+    };
+  };
+
+  wrappers.zellij = {
+    sandboxing.variant = "boxxy";
+    sandboxing.wraparound.arg0 = lib.getExe' pkgs.zellij "zellij";
+    sandboxing.boxxy.rules = {
+      "$XDG_CONFIG_HOME/zellij/hello.kdl".source = "$XDG_CONFIG_HOME/zellij/config.kdl";
+    };
+  };
+}
diff --git a/tests/modules/wrapper-manager/sandboxing/boxxy/default.nix b/tests/modules/wrapper-manager/sandboxing/boxxy/default.nix
new file mode 100644
index 00000000..7fff7787
--- /dev/null
+++ b/tests/modules/wrapper-manager/sandboxing/boxxy/default.nix
@@ -0,0 +1,3 @@
+{
+  basic = ./basic.nix;
+}
diff --git a/tests/modules/wrapper-manager/sandboxing/bubblewrap/basic-app-with-dbus-filter.nix b/tests/modules/wrapper-manager/sandboxing/bubblewrap/basic-app-with-dbus-filter.nix
new file mode 100644
index 00000000..de24c2df
--- /dev/null
+++ b/tests/modules/wrapper-manager/sandboxing/bubblewrap/basic-app-with-dbus-filter.nix
@@ -0,0 +1,18 @@
+# Based from the examples from NixPak.
+{ config, lib, pkgs, ... }:
+
+{
+  build.isBinary = false;
+  wrappers.hello = {
+    sandboxing.variant = "bubblewrap";
+    sandboxing.wraparound.arg0 = lib.getExe' pkgs.hello "hello";
+    sandboxing.bubblewrap.dbus = {
+      enable = true;
+      filter.addresses = {
+        "org.freedesktop.systemd1".policies.level = "talk";
+        "org.gtk.vfs.*".policies.level = "talk";
+        "org.gtk.vfs".policies.level = "talk";
+      };
+    };
+  };
+}
diff --git a/tests/modules/wrapper-manager/sandboxing/bubblewrap/basic-zellij.nix b/tests/modules/wrapper-manager/sandboxing/bubblewrap/basic-zellij.nix
new file mode 100644
index 00000000..c952f98b
--- /dev/null
+++ b/tests/modules/wrapper-manager/sandboxing/bubblewrap/basic-zellij.nix
@@ -0,0 +1,18 @@
+{ config, lib, pkgs, ... }:
+
+{
+  locale.enable = true;
+  wrappers.zellij = {
+    sandboxing.variant = "bubblewrap";
+    sandboxing.wraparound.arg0 = lib.getExe' pkgs.zellij "zellij";
+  };
+  build.extraPassthru.tests = {
+    zellijWrapperCheck =
+      let
+        wrapper = config.build.toplevel;
+      in pkgs.runCommand { } ''
+          [ -x ${lib.getExe' wrapper "zellij"} ] && touch $out
+
+      '';
+  };
+}
diff --git a/tests/modules/wrapper-manager/sandboxing/bubblewrap/default.nix b/tests/modules/wrapper-manager/sandboxing/bubblewrap/default.nix
new file mode 100644
index 00000000..7a1f7db4
--- /dev/null
+++ b/tests/modules/wrapper-manager/sandboxing/bubblewrap/default.nix
@@ -0,0 +1,4 @@
+{
+  basic-zellij = ./basic-zellij.nix;
+  basic-app-with-dbus-filter = ./basic-app-with-dbus-filter.nix;
+}