diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix
index 240289176..730afa792 100644
--- a/modules/programs/fish.nix
+++ b/modules/programs/fish.nix
@@ -441,7 +441,9 @@ in {
 
           # Source initialization code if it exists.
           if test -d $plugin_dir/conf.d
-            source $plugin_dir/conf.d/*.fish
+            for f in $plugin_dir/conf.d/*.fish
+              source $f
+            end
           end
 
           if test -f $plugin_dir/key_bindings.fish
diff --git a/tests/modules/programs/fish/plugins.nix b/tests/modules/programs/fish/plugins.nix
index 1d661ff0e..657c33f39 100644
--- a/tests/modules/programs/fish/plugins.nix
+++ b/tests/modules/programs/fish/plugins.nix
@@ -21,7 +21,9 @@ let
 
     # Source initialization code if it exists.
     if test -d $plugin_dir/conf.d
-      source $plugin_dir/conf.d/*.fish
+      for f in $plugin_dir/conf.d/*.fish
+        source $f
+      end
     end
 
     if test -f $plugin_dir/key_bindings.fish