diff --git a/share/completions/airmon-ng.fish b/share/completions/airmon-ng.fish
index 0027872eb..3ad0923f2 100644
--- a/share/completions/airmon-ng.fish
+++ b/share/completions/airmon-ng.fish
@@ -3,4 +3,4 @@
 set -l commands "start stop check"
 complete -c airmon-ng -x -n "not __fish_seen_subcommand_from $commands" -a "$commands"
 complete -c airmon-ng -x -n "__fish_seen_subcommand_from $commands; and not __fish_seen_subcommand_from (__fish_print_interfaces)" -a "(__fish_print_interfaces)"
-complete -c airmon-ng -f
\ No newline at end of file
+complete -c airmon-ng -f
diff --git a/share/completions/blender.fish b/share/completions/blender.fish
index 1073bd66c..295c1a690 100644
--- a/share/completions/blender.fish
+++ b/share/completions/blender.fish
@@ -78,13 +78,13 @@ complete -c blender -n 'not __blender_player' -o x -l use-extension -a '0\tfalse
 # Animation Playback Options:
 complete -c blender -n 'not __blender_player' -o a -d 'Run as animation player'
 
-complete -c blender -n '__blender_player' -o p -x -d 'Specify position and size'
-complete -c blender -n '__blender_player' -o m -d 'Read from disk (do not buffer)'
-complete -c blender -n '__blender_player' -o f -x -d 'Specify FPS to start with'
-complete -c blender -n '__blender_player' -o j -x -d 'Specify frame step'
-complete -c blender -n '__blender_player' -o s -x -d 'Specify start frame'
-complete -c blender -n '__blender_player' -o e -x -d 'Specify end frame'
-complete -c blender -n '__blender_player' -o c -x -d 'Memory in MB for cache'
+complete -c blender -n __blender_player -o p -x -d 'Specify position and size'
+complete -c blender -n __blender_player -o m -d 'Read from disk (do not buffer)'
+complete -c blender -n __blender_player -o f -x -d 'Specify FPS to start with'
+complete -c blender -n __blender_player -o j -x -d 'Specify frame step'
+complete -c blender -n __blender_player -o s -x -d 'Specify start frame'
+complete -c blender -n __blender_player -o e -x -d 'Specify end frame'
+complete -c blender -n __blender_player -o c -x -d 'Memory in MB for cache'
 
 # Window Options:
 complete -c blender -n 'not __blender_player' -o w -l window-border -d 'Show window borders'
diff --git a/share/completions/calendar.fish b/share/completions/calendar.fish
index 04534c60c..c47be3ef7 100644
--- a/share/completions/calendar.fish
+++ b/share/completions/calendar.fish
@@ -4,7 +4,7 @@ complete -c calendar -s A -s l -d "Today + N days forward"
 complete -c calendar -s a -d "Process all users' calendars and mail the results"
 complete -c calendar -s B -d "Today - N days backward"
 complete -c calendar -s b -d "Cyrillic date calculation mode"
-complete -c calendar -s e -d  "Today + N days forward, if today is Friday"
+complete -c calendar -s e -d "Today + N days forward, if today is Friday"
 complete -c calendar -s f -rF -d "Path to default calendar file"
 complete -c calendar -s t -x -d "Today is [[[cc]yy]mm]dd]"
 complete -c calendar -s w -d "Print day of the week name"
diff --git a/share/completions/rename.fish b/share/completions/rename.fish
index 6c0bae65d..2db1f62ce 100644
--- a/share/completions/rename.fish
+++ b/share/completions/rename.fish
@@ -33,7 +33,7 @@ else if string match -q "*File::Rename*" $rename_version[1]
     complete -c rename -s u -l unicode -d 'Treat filenames as Unicode strings'
     complete -c rename -s e -x -d 'Perl expression'
     complete -c rename -s E -x -d 'Perl statement'
-else if test "$version_status" = "2"
+else if test "$version_status" = 2
     # `brew install rename`
     # http://plasmasturm.org/code/rename
     complete -c rename -s h -l help -d 'See a synopsis'
diff --git a/tests/pexpects/fkr.py b/tests/pexpects/fkr.py
index d37a0fb83..83a50b297 100644
--- a/tests/pexpects/fkr.py
+++ b/tests/pexpects/fkr.py
@@ -41,9 +41,9 @@ expect_str("char: \\c@\r\nbind -k nul 'do something'\r\n")
 # Ensure we only name the sequence if we match all of it.
 # Otherwise we end up calling escape+backspace "backspace"!
 send("\x1b\x7f")
-expect_str('char: \\e\r\n')
-expect_str('char: \\x7F')
-expect_str('''(aka "del")\r\nbind \\e\\x7F 'do something'\r\n''')
+expect_str("char: \\e\r\n")
+expect_str("char: \\x7F")
+expect_str("""(aka "del")\r\nbind \\e\\x7F 'do something'\r\n""")
 
 # Does it keep running if handed control sequences in the wrong order?
 send("\x03")
diff --git a/tests/pexpects/history.py b/tests/pexpects/history.py
index 5d01a7445..a0f2b2ba7 100644
--- a/tests/pexpects/history.py
+++ b/tests/pexpects/history.py
@@ -111,7 +111,7 @@ expect_re("history delete -p 'echo hello'\r\n")
 expect_re("\[1\] echo hello AGAIN\r\n")
 expect_re("\[2\] echo hello again\r\n\r\n")
 expect_re(
-    'Enter nothing to cancel the delete, or\r\nEnter one or more of the entry IDs or ranges like \'5..12\', separated by a space.\r\nFor example \'7 10..15 35 788..812\'.\r\nEnter \'all\' to delete all the matching entries.\r\n'
+    "Enter nothing to cancel the delete, or\r\nEnter one or more of the entry IDs or ranges like '5..12', separated by a space.\r\nFor example '7 10..15 35 788..812'.\r\nEnter 'all' to delete all the matching entries.\r\n"
 )
 expect_re("Delete which entries\? ")
 sendline("1")