diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index 458e10d5c..260e35252 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -215,7 +215,7 @@ function __fish_config_interactive -d "Initializations that should be performed
 
 
 	# Notify vte-based terminals when $PWD changes (issue #906)
-	if begin set -q VTE_VERSION; and test $VTE_VERSION -ge 3405; end
+	if test "$VTE_VERSION" -ge 3405
 		function __update_vte_cwd --on-variable PWD --description 'Notify VTE of change to $PWD'
 			status --is-command-substitution; and return
 			printf '\033]7;file://%s\a' (pwd | __fish_urlencode)