diff --git a/share/completions/adb.fish b/share/completions/adb.fish
index 7684d0ef2..559a3e3bc 100644
--- a/share/completions/adb.fish
+++ b/share/completions/adb.fish
@@ -24,7 +24,7 @@ function __fish_adb_run_command -d 'Runs adb with any -s parameters already give
     set -l cmd (commandline -poc)
     set -e cmd[1]
     for i in $cmd
-        if test $sopt_is_next
+        if test -n "$sopt_is_next"
             set sopt -s $i
             break
         else
diff --git a/share/tools/web_config/sample_prompts/robbyrussell.fish b/share/tools/web_config/sample_prompts/robbyrussell.fish
index 80a600004..65275ccd9 100644
--- a/share/tools/web_config/sample_prompts/robbyrussell.fish
+++ b/share/tools/web_config/sample_prompts/robbyrussell.fish
@@ -80,7 +80,8 @@ function fish_prompt
         set -l repo_branch $red(_repo_branch_name $repo_type)
         set repo_info "$blue $repo_type:($repo_branch$blue)"
 
-        if [ (_is_repo_dirty $repo_type) ]
+        set -l dirty (_is_repo_dirty $repo_type)
+        if test -n "$dirty"
             set -l dirty "$yellow ✗"
             set repo_info "$repo_info$dirty"
         end