diff --git a/iop/iop.completion b/iop/iop.completion
index b05398f62..24b99b405 100644
--- a/iop/iop.completion
+++ b/iop/iop.completion
@@ -32,11 +32,11 @@ _iop()
     cur="${COMP_WORDS[COMP_CWORD]}"
     prev="${COMP_WORDS[COMP_CWORD-1]}"
 
-    iopcmds="bootstrap cfe_upgrade cfe_upgrade_latest extract_core \
+    iopcmds="bootstrap extract_core \
              feeds_update genconfig \
-             generate_tarballs install_key \
-             scp_changes setup_host ssh_install_key status \
-             ssh_upgrade smoketest"
+             install_key \
+             setup_host ssh_install_key status \
+             ssh_upgrade"
 
     if [ $COMP_CWORD -eq 1 ] ; then