diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 84bd499cb..6dab4770f 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -102,6 +102,7 @@ Deprecations and removed features
   If this happens, you can use the ``reset`` command from ``ncurses`` to restore the terminal state.
 - ``fish_key_reader --verbose`` is now ignored, so it no longer shows raw byte values or timing information.
   Raw byte values should no longer be necessary because fish now decodes them to the new human-readable key names for builtin bind.
+- Instant propagation of universal variables now only works on Linux and macOS. On other platforms, changes to universal variables may only become visible on the next prompt.
 
 Scripting improvements
 ----------------------
diff --git a/tests/checks/tmux-prompt.fish b/tests/checks/tmux-prompt.fish
index 12802d46e..a7b442684 100644
--- a/tests/checks/tmux-prompt.fish
+++ b/tests/checks/tmux-prompt.fish
@@ -1,5 +1,6 @@
 #RUN: %fish %s
 #REQUIRES: command -v tmux
+#REQUIRES: uname | grep -v BSD
 
 set -g isolated_tmux_fish_extra_args -C '
     function fish_prompt