diff --git a/packages/@angular/cli/commands/completion.ts b/packages/@angular/cli/commands/completion.ts
index 1147c7e48f6b..201584f4e0de 100644
--- a/packages/@angular/cli/commands/completion.ts
+++ b/packages/@angular/cli/commands/completion.ts
@@ -78,7 +78,7 @@ const CompletionCommand = Command.extend({
     commandOptions.all = !commandOptions.bash && !commandOptions.zsh;
 
     const commandFiles = fs.readdirSync(__dirname)
-      .filter(file => file.match(/\.ts$/) && !file.match(/\.run.ts$/))
+      .filter(file => file.match(/\.(js|ts)$/) && !file.match(/\.d.ts$/))
       .map(file => path.parse(file).name)
       .filter(file => {
         return commandsToIgnore.indexOf(file) < 0;
diff --git a/tests/e2e/tests/misc/completion.ts b/tests/e2e/tests/misc/completion.ts
new file mode 100644
index 000000000000..00f35b353ba7
--- /dev/null
+++ b/tests/e2e/tests/misc/completion.ts
@@ -0,0 +1,6 @@
+import {ng} from '../../utils/process';
+
+
+export default function () {
+  return ng('completion');
+}