diff --git a/clap_complete/tests/bash.rs b/clap_complete/tests/bash.rs
index ac781912..7b6a40ab 100644
--- a/clap_complete/tests/bash.rs
+++ b/clap_complete/tests/bash.rs
@@ -5,7 +5,7 @@ fn basic() {
     let name = "my-app";
     let cmd = common::basic_command(name);
     common::assert_matches_path(
-        "tests/snapshots/basic.bash.log",
+        "tests/snapshots/basic.bash",
         clap_complete::shells::Bash,
         cmd,
         name,
@@ -17,7 +17,7 @@ fn feature_sample() {
     let name = "my-app";
     let cmd = common::feature_sample_command(name);
     common::assert_matches_path(
-        "tests/snapshots/feature_sample.bash.log",
+        "tests/snapshots/feature_sample.bash",
         clap_complete::shells::Bash,
         cmd,
         name,
@@ -29,7 +29,7 @@ fn special_commands() {
     let name = "my-app";
     let cmd = common::special_commands_command(name);
     common::assert_matches_path(
-        "tests/snapshots/special_commands.bash.log",
+        "tests/snapshots/special_commands.bash",
         clap_complete::shells::Bash,
         cmd,
         name,
@@ -41,7 +41,7 @@ fn quoting() {
     let name = "my-app";
     let cmd = common::quoting_command(name);
     common::assert_matches_path(
-        "tests/snapshots/quoting.bash.log",
+        "tests/snapshots/quoting.bash",
         clap_complete::shells::Bash,
         cmd,
         name,
@@ -53,7 +53,7 @@ fn aliases() {
     let name = "my-app";
     let cmd = common::aliases_command(name);
     common::assert_matches_path(
-        "tests/snapshots/aliases.bash.log",
+        "tests/snapshots/aliases.bash",
         clap_complete::shells::Bash,
         cmd,
         name,
@@ -65,7 +65,7 @@ fn sub_subcommands() {
     let name = "my-app";
     let cmd = common::sub_subcommands_command(name);
     common::assert_matches_path(
-        "tests/snapshots/sub_subcommands.bash.log",
+        "tests/snapshots/sub_subcommands.bash",
         clap_complete::shells::Bash,
         cmd,
         name,
@@ -77,7 +77,7 @@ fn value_hint() {
     let name = "my-app";
     let cmd = common::value_hint_command(name);
     common::assert_matches_path(
-        "tests/snapshots/value_hint.bash.log",
+        "tests/snapshots/value_hint.bash",
         clap_complete::shells::Bash,
         cmd,
         name,
diff --git a/clap_complete/tests/elvish.rs b/clap_complete/tests/elvish.rs
index 1f97c4ce..76beb983 100644
--- a/clap_complete/tests/elvish.rs
+++ b/clap_complete/tests/elvish.rs
@@ -5,7 +5,7 @@ fn basic() {
     let name = "my-app";
     let cmd = common::basic_command(name);
     common::assert_matches_path(
-        "tests/snapshots/basic.elvish.log",
+        "tests/snapshots/basic.elvish",
         clap_complete::shells::Elvish,
         cmd,
         name,
@@ -17,7 +17,7 @@ fn feature_sample() {
     let name = "my-app";
     let cmd = common::feature_sample_command(name);
     common::assert_matches_path(
-        "tests/snapshots/feature_sample.elvish.log",
+        "tests/snapshots/feature_sample.elvish",
         clap_complete::shells::Elvish,
         cmd,
         name,
@@ -29,7 +29,7 @@ fn special_commands() {
     let name = "my-app";
     let cmd = common::special_commands_command(name);
     common::assert_matches_path(
-        "tests/snapshots/special_commands.elvish.log",
+        "tests/snapshots/special_commands.elvish",
         clap_complete::shells::Elvish,
         cmd,
         name,
@@ -41,7 +41,7 @@ fn quoting() {
     let name = "my-app";
     let cmd = common::quoting_command(name);
     common::assert_matches_path(
-        "tests/snapshots/quoting.elvish.log",
+        "tests/snapshots/quoting.elvish",
         clap_complete::shells::Elvish,
         cmd,
         name,
@@ -53,7 +53,7 @@ fn aliases() {
     let name = "my-app";
     let cmd = common::aliases_command(name);
     common::assert_matches_path(
-        "tests/snapshots/aliases.elvish.log",
+        "tests/snapshots/aliases.elvish",
         clap_complete::shells::Elvish,
         cmd,
         name,
@@ -65,7 +65,7 @@ fn sub_subcommands() {
     let name = "my-app";
     let cmd = common::sub_subcommands_command(name);
     common::assert_matches_path(
-        "tests/snapshots/sub_subcommands.elvish.log",
+        "tests/snapshots/sub_subcommands.elvish",
         clap_complete::shells::Elvish,
         cmd,
         name,
@@ -77,7 +77,7 @@ fn value_hint() {
     let name = "my-app";
     let cmd = common::value_hint_command(name);
     common::assert_matches_path(
-        "tests/snapshots/value_hint.elvish.log",
+        "tests/snapshots/value_hint.elvish",
         clap_complete::shells::Elvish,
         cmd,
         name,
diff --git a/clap_complete/tests/fish.rs b/clap_complete/tests/fish.rs
index 194e7d37..92c1c4a4 100644
--- a/clap_complete/tests/fish.rs
+++ b/clap_complete/tests/fish.rs
@@ -5,7 +5,7 @@ fn basic() {
     let name = "my-app";
     let cmd = common::basic_command(name);
     common::assert_matches_path(
-        "tests/snapshots/basic.fish.log",
+        "tests/snapshots/basic.fish",
         clap_complete::shells::Fish,
         cmd,
         name,
@@ -17,7 +17,7 @@ fn feature_sample() {
     let name = "my-app";
     let cmd = common::feature_sample_command(name);
     common::assert_matches_path(
-        "tests/snapshots/feature_sample.fish.log",
+        "tests/snapshots/feature_sample.fish",
         clap_complete::shells::Fish,
         cmd,
         name,
@@ -29,7 +29,7 @@ fn special_commands() {
     let name = "my-app";
     let cmd = common::special_commands_command(name);
     common::assert_matches_path(
-        "tests/snapshots/special_commands.fish.log",
+        "tests/snapshots/special_commands.fish",
         clap_complete::shells::Fish,
         cmd,
         name,
@@ -41,7 +41,7 @@ fn quoting() {
     let name = "my-app";
     let cmd = common::quoting_command(name);
     common::assert_matches_path(
-        "tests/snapshots/quoting.fish.log",
+        "tests/snapshots/quoting.fish",
         clap_complete::shells::Fish,
         cmd,
         name,
@@ -53,7 +53,7 @@ fn aliases() {
     let name = "my-app";
     let cmd = common::aliases_command(name);
     common::assert_matches_path(
-        "tests/snapshots/aliases.fish.log",
+        "tests/snapshots/aliases.fish",
         clap_complete::shells::Fish,
         cmd,
         name,
@@ -65,7 +65,7 @@ fn sub_subcommands() {
     let name = "my-app";
     let cmd = common::sub_subcommands_command(name);
     common::assert_matches_path(
-        "tests/snapshots/sub_subcommands.fish.log",
+        "tests/snapshots/sub_subcommands.fish",
         clap_complete::shells::Fish,
         cmd,
         name,
@@ -77,7 +77,7 @@ fn value_hint() {
     let name = "my-app";
     let cmd = common::value_hint_command(name);
     common::assert_matches_path(
-        "tests/snapshots/value_hint.fish.log",
+        "tests/snapshots/value_hint.fish",
         clap_complete::shells::Fish,
         cmd,
         name,
diff --git a/clap_complete/tests/powershell.rs b/clap_complete/tests/powershell.rs
index 07e110b0..fa6657d3 100644
--- a/clap_complete/tests/powershell.rs
+++ b/clap_complete/tests/powershell.rs
@@ -5,7 +5,7 @@ fn basic() {
     let name = "my-app";
     let cmd = common::basic_command(name);
     common::assert_matches_path(
-        "tests/snapshots/basic.powershell.log",
+        "tests/snapshots/basic.ps1",
         clap_complete::shells::PowerShell,
         cmd,
         name,
@@ -17,7 +17,7 @@ fn feature_sample() {
     let name = "my-app";
     let cmd = common::feature_sample_command(name);
     common::assert_matches_path(
-        "tests/snapshots/feature_sample.powershell.log",
+        "tests/snapshots/feature_sample.ps1",
         clap_complete::shells::PowerShell,
         cmd,
         name,
@@ -29,7 +29,7 @@ fn special_commands() {
     let name = "my-app";
     let cmd = common::special_commands_command(name);
     common::assert_matches_path(
-        "tests/snapshots/special_commands.powershell.log",
+        "tests/snapshots/special_commands.ps1",
         clap_complete::shells::PowerShell,
         cmd,
         name,
@@ -41,7 +41,7 @@ fn quoting() {
     let name = "my-app";
     let cmd = common::quoting_command(name);
     common::assert_matches_path(
-        "tests/snapshots/quoting.powershell.log",
+        "tests/snapshots/quoting.ps1",
         clap_complete::shells::PowerShell,
         cmd,
         name,
@@ -53,7 +53,7 @@ fn aliases() {
     let name = "my-app";
     let cmd = common::aliases_command(name);
     common::assert_matches_path(
-        "tests/snapshots/aliases.powershell.log",
+        "tests/snapshots/aliases.ps1",
         clap_complete::shells::PowerShell,
         cmd,
         name,
@@ -65,7 +65,7 @@ fn sub_subcommands() {
     let name = "my-app";
     let cmd = common::sub_subcommands_command(name);
     common::assert_matches_path(
-        "tests/snapshots/sub_subcommands.powershell.log",
+        "tests/snapshots/sub_subcommands.ps1",
         clap_complete::shells::PowerShell,
         cmd,
         name,
@@ -77,7 +77,7 @@ fn value_hint() {
     let name = "my-app";
     let cmd = common::value_hint_command(name);
     common::assert_matches_path(
-        "tests/snapshots/value_hint.powershell.log",
+        "tests/snapshots/value_hint.ps1",
         clap_complete::shells::PowerShell,
         cmd,
         name,
diff --git a/clap_complete/tests/snapshots/aliases.bash.log b/clap_complete/tests/snapshots/aliases.bash
similarity index 100%
rename from clap_complete/tests/snapshots/aliases.bash.log
rename to clap_complete/tests/snapshots/aliases.bash
diff --git a/clap_complete/tests/snapshots/aliases.elvish.log b/clap_complete/tests/snapshots/aliases.elvish
similarity index 100%
rename from clap_complete/tests/snapshots/aliases.elvish.log
rename to clap_complete/tests/snapshots/aliases.elvish
diff --git a/clap_complete/tests/snapshots/aliases.fish.log b/clap_complete/tests/snapshots/aliases.fish
similarity index 100%
rename from clap_complete/tests/snapshots/aliases.fish.log
rename to clap_complete/tests/snapshots/aliases.fish
diff --git a/clap_complete/tests/snapshots/aliases.powershell.log b/clap_complete/tests/snapshots/aliases.ps1
similarity index 100%
rename from clap_complete/tests/snapshots/aliases.powershell.log
rename to clap_complete/tests/snapshots/aliases.ps1
diff --git a/clap_complete/tests/snapshots/aliases.zsh.log b/clap_complete/tests/snapshots/aliases.zsh
similarity index 100%
rename from clap_complete/tests/snapshots/aliases.zsh.log
rename to clap_complete/tests/snapshots/aliases.zsh
diff --git a/clap_complete/tests/snapshots/basic.bash.log b/clap_complete/tests/snapshots/basic.bash
similarity index 100%
rename from clap_complete/tests/snapshots/basic.bash.log
rename to clap_complete/tests/snapshots/basic.bash
diff --git a/clap_complete/tests/snapshots/basic.elvish.log b/clap_complete/tests/snapshots/basic.elvish
similarity index 100%
rename from clap_complete/tests/snapshots/basic.elvish.log
rename to clap_complete/tests/snapshots/basic.elvish
diff --git a/clap_complete/tests/snapshots/basic.fish.log b/clap_complete/tests/snapshots/basic.fish
similarity index 100%
rename from clap_complete/tests/snapshots/basic.fish.log
rename to clap_complete/tests/snapshots/basic.fish
diff --git a/clap_complete/tests/snapshots/basic.powershell.log b/clap_complete/tests/snapshots/basic.ps1
similarity index 100%
rename from clap_complete/tests/snapshots/basic.powershell.log
rename to clap_complete/tests/snapshots/basic.ps1
diff --git a/clap_complete/tests/snapshots/basic.zsh.log b/clap_complete/tests/snapshots/basic.zsh
similarity index 100%
rename from clap_complete/tests/snapshots/basic.zsh.log
rename to clap_complete/tests/snapshots/basic.zsh
diff --git a/clap_complete/tests/snapshots/feature_sample.bash.log b/clap_complete/tests/snapshots/feature_sample.bash
similarity index 100%
rename from clap_complete/tests/snapshots/feature_sample.bash.log
rename to clap_complete/tests/snapshots/feature_sample.bash
diff --git a/clap_complete/tests/snapshots/feature_sample.elvish.log b/clap_complete/tests/snapshots/feature_sample.elvish
similarity index 100%
rename from clap_complete/tests/snapshots/feature_sample.elvish.log
rename to clap_complete/tests/snapshots/feature_sample.elvish
diff --git a/clap_complete/tests/snapshots/feature_sample.fish.log b/clap_complete/tests/snapshots/feature_sample.fish
similarity index 100%
rename from clap_complete/tests/snapshots/feature_sample.fish.log
rename to clap_complete/tests/snapshots/feature_sample.fish
diff --git a/clap_complete/tests/snapshots/feature_sample.powershell.log b/clap_complete/tests/snapshots/feature_sample.ps1
similarity index 100%
rename from clap_complete/tests/snapshots/feature_sample.powershell.log
rename to clap_complete/tests/snapshots/feature_sample.ps1
diff --git a/clap_complete/tests/snapshots/feature_sample.zsh.log b/clap_complete/tests/snapshots/feature_sample.zsh
similarity index 100%
rename from clap_complete/tests/snapshots/feature_sample.zsh.log
rename to clap_complete/tests/snapshots/feature_sample.zsh
diff --git a/clap_complete/tests/snapshots/quoting.bash.log b/clap_complete/tests/snapshots/quoting.bash
similarity index 100%
rename from clap_complete/tests/snapshots/quoting.bash.log
rename to clap_complete/tests/snapshots/quoting.bash
diff --git a/clap_complete/tests/snapshots/quoting.elvish.log b/clap_complete/tests/snapshots/quoting.elvish
similarity index 100%
rename from clap_complete/tests/snapshots/quoting.elvish.log
rename to clap_complete/tests/snapshots/quoting.elvish
diff --git a/clap_complete/tests/snapshots/quoting.fish.log b/clap_complete/tests/snapshots/quoting.fish
similarity index 100%
rename from clap_complete/tests/snapshots/quoting.fish.log
rename to clap_complete/tests/snapshots/quoting.fish
diff --git a/clap_complete/tests/snapshots/quoting.powershell.log b/clap_complete/tests/snapshots/quoting.ps1
similarity index 100%
rename from clap_complete/tests/snapshots/quoting.powershell.log
rename to clap_complete/tests/snapshots/quoting.ps1
diff --git a/clap_complete/tests/snapshots/quoting.zsh.log b/clap_complete/tests/snapshots/quoting.zsh
similarity index 100%
rename from clap_complete/tests/snapshots/quoting.zsh.log
rename to clap_complete/tests/snapshots/quoting.zsh
diff --git a/clap_complete/tests/snapshots/special_commands.bash.log b/clap_complete/tests/snapshots/special_commands.bash
similarity index 100%
rename from clap_complete/tests/snapshots/special_commands.bash.log
rename to clap_complete/tests/snapshots/special_commands.bash
diff --git a/clap_complete/tests/snapshots/special_commands.elvish.log b/clap_complete/tests/snapshots/special_commands.elvish
similarity index 100%
rename from clap_complete/tests/snapshots/special_commands.elvish.log
rename to clap_complete/tests/snapshots/special_commands.elvish
diff --git a/clap_complete/tests/snapshots/special_commands.fish.log b/clap_complete/tests/snapshots/special_commands.fish
similarity index 100%
rename from clap_complete/tests/snapshots/special_commands.fish.log
rename to clap_complete/tests/snapshots/special_commands.fish
diff --git a/clap_complete/tests/snapshots/special_commands.powershell.log b/clap_complete/tests/snapshots/special_commands.ps1
similarity index 100%
rename from clap_complete/tests/snapshots/special_commands.powershell.log
rename to clap_complete/tests/snapshots/special_commands.ps1
diff --git a/clap_complete/tests/snapshots/special_commands.zsh.log b/clap_complete/tests/snapshots/special_commands.zsh
similarity index 100%
rename from clap_complete/tests/snapshots/special_commands.zsh.log
rename to clap_complete/tests/snapshots/special_commands.zsh
diff --git a/clap_complete/tests/snapshots/sub_subcommands.bash.log b/clap_complete/tests/snapshots/sub_subcommands.bash
similarity index 100%
rename from clap_complete/tests/snapshots/sub_subcommands.bash.log
rename to clap_complete/tests/snapshots/sub_subcommands.bash
diff --git a/clap_complete/tests/snapshots/sub_subcommands.elvish.log b/clap_complete/tests/snapshots/sub_subcommands.elvish
similarity index 100%
rename from clap_complete/tests/snapshots/sub_subcommands.elvish.log
rename to clap_complete/tests/snapshots/sub_subcommands.elvish
diff --git a/clap_complete/tests/snapshots/sub_subcommands.fish.log b/clap_complete/tests/snapshots/sub_subcommands.fish
similarity index 100%
rename from clap_complete/tests/snapshots/sub_subcommands.fish.log
rename to clap_complete/tests/snapshots/sub_subcommands.fish
diff --git a/clap_complete/tests/snapshots/sub_subcommands.powershell.log b/clap_complete/tests/snapshots/sub_subcommands.ps1
similarity index 100%
rename from clap_complete/tests/snapshots/sub_subcommands.powershell.log
rename to clap_complete/tests/snapshots/sub_subcommands.ps1
diff --git a/clap_complete/tests/snapshots/sub_subcommands.zsh.log b/clap_complete/tests/snapshots/sub_subcommands.zsh
similarity index 100%
rename from clap_complete/tests/snapshots/sub_subcommands.zsh.log
rename to clap_complete/tests/snapshots/sub_subcommands.zsh
diff --git a/clap_complete/tests/snapshots/value_hint.bash.log b/clap_complete/tests/snapshots/value_hint.bash
similarity index 100%
rename from clap_complete/tests/snapshots/value_hint.bash.log
rename to clap_complete/tests/snapshots/value_hint.bash
diff --git a/clap_complete/tests/snapshots/value_hint.elvish.log b/clap_complete/tests/snapshots/value_hint.elvish
similarity index 100%
rename from clap_complete/tests/snapshots/value_hint.elvish.log
rename to clap_complete/tests/snapshots/value_hint.elvish
diff --git a/clap_complete/tests/snapshots/value_hint.fish.log b/clap_complete/tests/snapshots/value_hint.fish
similarity index 100%
rename from clap_complete/tests/snapshots/value_hint.fish.log
rename to clap_complete/tests/snapshots/value_hint.fish
diff --git a/clap_complete/tests/snapshots/value_hint.powershell.log b/clap_complete/tests/snapshots/value_hint.ps1
similarity index 100%
rename from clap_complete/tests/snapshots/value_hint.powershell.log
rename to clap_complete/tests/snapshots/value_hint.ps1
diff --git a/clap_complete/tests/snapshots/value_hint.zsh.log b/clap_complete/tests/snapshots/value_hint.zsh
similarity index 100%
rename from clap_complete/tests/snapshots/value_hint.zsh.log
rename to clap_complete/tests/snapshots/value_hint.zsh
diff --git a/clap_complete/tests/zsh.rs b/clap_complete/tests/zsh.rs
index e29a31c4..df6a2778 100644
--- a/clap_complete/tests/zsh.rs
+++ b/clap_complete/tests/zsh.rs
@@ -5,7 +5,7 @@ fn basic() {
     let name = "my-app";
     let cmd = common::basic_command(name);
     common::assert_matches_path(
-        "tests/snapshots/basic.zsh.log",
+        "tests/snapshots/basic.zsh",
         clap_complete::shells::Zsh,
         cmd,
         name,
@@ -17,7 +17,7 @@ fn feature_sample() {
     let name = "my-app";
     let cmd = common::feature_sample_command(name);
     common::assert_matches_path(
-        "tests/snapshots/feature_sample.zsh.log",
+        "tests/snapshots/feature_sample.zsh",
         clap_complete::shells::Zsh,
         cmd,
         name,
@@ -29,7 +29,7 @@ fn special_commands() {
     let name = "my-app";
     let cmd = common::special_commands_command(name);
     common::assert_matches_path(
-        "tests/snapshots/special_commands.zsh.log",
+        "tests/snapshots/special_commands.zsh",
         clap_complete::shells::Zsh,
         cmd,
         name,
@@ -41,7 +41,7 @@ fn quoting() {
     let name = "my-app";
     let cmd = common::quoting_command(name);
     common::assert_matches_path(
-        "tests/snapshots/quoting.zsh.log",
+        "tests/snapshots/quoting.zsh",
         clap_complete::shells::Zsh,
         cmd,
         name,
@@ -53,7 +53,7 @@ fn aliases() {
     let name = "my-app";
     let cmd = common::aliases_command(name);
     common::assert_matches_path(
-        "tests/snapshots/aliases.zsh.log",
+        "tests/snapshots/aliases.zsh",
         clap_complete::shells::Zsh,
         cmd,
         name,
@@ -65,7 +65,7 @@ fn sub_subcommands() {
     let name = "my-app";
     let cmd = common::sub_subcommands_command(name);
     common::assert_matches_path(
-        "tests/snapshots/sub_subcommands.zsh.log",
+        "tests/snapshots/sub_subcommands.zsh",
         clap_complete::shells::Zsh,
         cmd,
         name,
@@ -77,7 +77,7 @@ fn value_hint() {
     let name = "my-app";
     let cmd = common::value_hint_command(name);
     common::assert_matches_path(
-        "tests/snapshots/value_hint.zsh.log",
+        "tests/snapshots/value_hint.zsh",
         clap_complete::shells::Zsh,
         cmd,
         name,