diff --git a/flake-modules/nvim.nix b/flake-modules/nvim.nix
index 95280ef..a143ff1 100644
--- a/flake-modules/nvim.nix
+++ b/flake-modules/nvim.nix
@@ -1,24 +1,22 @@
 { inputs, ... }:
-let
-  standalone = ../nvim/standalone.nix;
-in
 {
   flake.overlays.nixvim = inputs.nixvim.overlays.default;
 
   perSystem =
     { pkgs, system, ... }:
-    {
-      # Check standalone nvim build
-      checks.nvim = inputs.nixvim.lib.${system}.check.mkTestDerivationFromNixvimModule {
+    let
+      nixvimLib = inputs.nixvim.lib.${system};
+      nixvim = inputs.nixvim.legacyPackages.${system};
+      module = {
         inherit pkgs;
         module = ../nvim/standalone.nix;
       };
+    in
+    {
+      # Check standalone nvim build
+      checks.nvim = nixvimLib.check.mkTestDerivationFromNixvimModule module;
 
       # Nvim standalone module
-      packages.nvim = inputs.nixvim.legacyPackages.${system}.makeNixvimWithModule {
-        inherit pkgs;
-        module = standalone;
-      };
-
+      packages.nvim = nixvim.makeNixvimWithModule module;
     };
 }
diff --git a/nvim/plugins.nix b/nvim/plugins.nix
index f36360b..b8c7e47 100644
--- a/nvim/plugins.nix
+++ b/nvim/plugins.nix
@@ -5,7 +5,7 @@
   ...
 }:
 let
-  inherit (helpers) mkRaw;
+  inherit (helpers) mkRaw enableExceptInTests;
 in
 {
   config.plugins = {
@@ -160,7 +160,7 @@ in
       };
     };
     gitsigns.enable = true;
-    image.enable = true;
+    image.enable = enableExceptInTests;
     jupytext = {
       enable = true;
       settings.custom_language_formatting.python = {