diff --git a/src/completions/bash.rs b/src/completions/bash.rs
index 983b250bc4c..f563922d8e9 100644
--- a/src/completions/bash.rs
+++ b/src/completions/bash.rs
@@ -81,10 +81,11 @@ complete -F _{name} -o bashdefault -o default {name}
             subcmds = format!(
                 "{}
             {name})
-                cmd+=\"__{name}\"
+                cmd+=\"__{fn_name}\"
                 ;;",
                 subcmds,
-                name = sc.replace("-", "__")
+                name = sc,
+                fn_name = sc.replace("-", "__")
             );
         }
 
diff --git a/tests/completions.rs b/tests/completions.rs
index 456944d35da..31e0532f267 100644
--- a/tests/completions.rs
+++ b/tests/completions.rs
@@ -525,7 +525,7 @@ static BASH_SPECIAL_CMDS: &'static str = r#"_my_app() {
             help)
                 cmd+="__help"
                 ;;
-            some__cmd__with__hypens)
+            some-cmd-with-hypens)
                 cmd+="__some__cmd__with__hypens"
                 ;;
             some_cmd)