diff --git a/plugins/by-name/octo/default.nix b/plugins/by-name/octo/default.nix
index 08e330db..342f0919 100644
--- a/plugins/by-name/octo/default.nix
+++ b/plugins/by-name/octo/default.nix
@@ -12,8 +12,6 @@ helpers.neovim-plugin.mkNeovimPlugin {
 
   maintainers = [ helpers.maintainers.svl ];
 
-  extraPackages = [ pkgs.gh ];
-
   settingsOptions = {
     use_local_fs = helpers.defaultNullOpts.mkBool false ''
       Use local files on right side of reviews.
@@ -167,9 +165,17 @@ helpers.neovim-plugin.mkNeovimPlugin {
     };
   };
 
+  extraOptions = {
+    ghPackage = lib.mkPackageOption pkgs "GitHub CLI" {
+      default = "gh";
+      nullable = true;
+    };
+  };
+
   extraConfig =
     cfg:
     mkMerge [
+      { extraPackages = [ cfg.ghPackage ]; }
       (mkIf (cfg.settings.picker == null || cfg.settings.picker == "telescope") {
         plugins.telescope.enable = mkDefault true;
       })
diff --git a/tests/test-sources/plugins/by-name/octo/default.nix b/tests/test-sources/plugins/by-name/octo/default.nix
index f3846e42..d927511e 100644
--- a/tests/test-sources/plugins/by-name/octo/default.nix
+++ b/tests/test-sources/plugins/by-name/octo/default.nix
@@ -1,3 +1,4 @@
+{ pkgs, ... }:
 {
   empty = {
     # This test is flaky and fails non-deterministically
@@ -84,4 +85,13 @@
       };
     };
   };
+
+  no-packages = {
+    # Need to add gh executable to runtime path for plugin
+    test.runNvim = false;
+    plugins.octo = {
+      enable = true;
+      ghPackage = null;
+    };
+  };
 }