diff --git a/completions/imagemagick b/completions/imagemagick
index df605de1..160d7c24 100644
--- a/completions/imagemagick
+++ b/completions/imagemagick
@@ -52,9 +52,9 @@ _ImageMagick()
             return 0
             ;;
         -format)
-            COMPREPLY=( $( compgen -W "$( convert -list format | \
-                awk '/ [r-][w-][+-] / {print $1}' | \
-                tr -d '*' | tr [:upper:] [:lower:] )" -- "$cur" ) )
+            COMPREPLY=( $( compgen -W "$( convert -list format | awk \
+                '/ [r-][w-][+-] / { sub("[*]$","",$1); print tolower($1) }' )" \
+                -- "$cur" ) )
             return 0
             ;;
         -gravity)
diff --git a/test/lib/completions/convert.exp b/test/lib/completions/convert.exp
index 07032040..b3a2e565 100644
--- a/test/lib/completions/convert.exp
+++ b/test/lib/completions/convert.exp
@@ -12,8 +12,10 @@ setup
 
 
 assert_complete_any "convert "
+sync_after_int
 
 
+assert_complete_any "convert -format "
 sync_after_int