diff --git a/pkg/integration/tests/custom_commands/basic_cmd_from_config.go b/pkg/integration/tests/custom_commands/basic_command.go
similarity index 90%
rename from pkg/integration/tests/custom_commands/basic_cmd_from_config.go
rename to pkg/integration/tests/custom_commands/basic_command.go
index 71b99c2de..219974596 100644
--- a/pkg/integration/tests/custom_commands/basic_cmd_from_config.go
+++ b/pkg/integration/tests/custom_commands/basic_command.go
@@ -5,7 +5,7 @@ import (
 	. "github.com/jesseduffield/lazygit/pkg/integration/components"
 )
 
-var BasicCmdFromConfig = NewIntegrationTest(NewIntegrationTestArgs{
+var BasicCommand = NewIntegrationTest(NewIntegrationTestArgs{
 	Description:  "Using a custom command to create a new file",
 	ExtraCmdArgs: []string{},
 	Skip:         false,
diff --git a/pkg/integration/tests/custom_commands/basic_cmd_at_runtime.go b/pkg/integration/tests/shell_commands/basic_shell_command.go
similarity index 89%
rename from pkg/integration/tests/custom_commands/basic_cmd_at_runtime.go
rename to pkg/integration/tests/shell_commands/basic_shell_command.go
index 9e1d1a185..96b6ee251 100644
--- a/pkg/integration/tests/custom_commands/basic_cmd_at_runtime.go
+++ b/pkg/integration/tests/shell_commands/basic_shell_command.go
@@ -1,11 +1,11 @@
-package custom_commands
+package shell_commands
 
 import (
 	"github.com/jesseduffield/lazygit/pkg/config"
 	. "github.com/jesseduffield/lazygit/pkg/integration/components"
 )
 
-var BasicCmdAtRuntime = NewIntegrationTest(NewIntegrationTestArgs{
+var BasicShellCommand = NewIntegrationTest(NewIntegrationTestArgs{
 	Description:  "Using a custom command provided at runtime to create a new file",
 	ExtraCmdArgs: []string{},
 	Skip:         false,
diff --git a/pkg/integration/tests/custom_commands/complex_cmd_at_runtime.go b/pkg/integration/tests/shell_commands/complex_shell_command.go
similarity index 91%
rename from pkg/integration/tests/custom_commands/complex_cmd_at_runtime.go
rename to pkg/integration/tests/shell_commands/complex_shell_command.go
index de3c5f60f..8858f3ccb 100644
--- a/pkg/integration/tests/custom_commands/complex_cmd_at_runtime.go
+++ b/pkg/integration/tests/shell_commands/complex_shell_command.go
@@ -1,11 +1,11 @@
-package custom_commands
+package shell_commands
 
 import (
 	"github.com/jesseduffield/lazygit/pkg/config"
 	. "github.com/jesseduffield/lazygit/pkg/integration/components"
 )
 
-var ComplexCmdAtRuntime = NewIntegrationTest(NewIntegrationTestArgs{
+var ComplexShellCommand = NewIntegrationTest(NewIntegrationTestArgs{
 	Description:  "Using a custom command provided at runtime to create a new file, via a shell command. We invoke custom commands through a shell already. This test proves that we can run a shell within a shell, which requires complex escaping.",
 	ExtraCmdArgs: []string{},
 	Skip:         false,
diff --git a/pkg/integration/tests/custom_commands/delete_from_history.go b/pkg/integration/tests/shell_commands/delete_from_history.go
similarity index 97%
rename from pkg/integration/tests/custom_commands/delete_from_history.go
rename to pkg/integration/tests/shell_commands/delete_from_history.go
index e90e6c3c6..278d19da6 100644
--- a/pkg/integration/tests/custom_commands/delete_from_history.go
+++ b/pkg/integration/tests/shell_commands/delete_from_history.go
@@ -1,4 +1,4 @@
-package custom_commands
+package shell_commands
 
 import (
 	"github.com/jesseduffield/lazygit/pkg/config"
diff --git a/pkg/integration/tests/custom_commands/edit_history.go b/pkg/integration/tests/shell_commands/edit_history.go
similarity index 97%
rename from pkg/integration/tests/custom_commands/edit_history.go
rename to pkg/integration/tests/shell_commands/edit_history.go
index c6999b1f2..57ee12a02 100644
--- a/pkg/integration/tests/custom_commands/edit_history.go
+++ b/pkg/integration/tests/shell_commands/edit_history.go
@@ -1,4 +1,4 @@
-package custom_commands
+package shell_commands
 
 import (
 	"github.com/jesseduffield/lazygit/pkg/config"
diff --git a/pkg/integration/tests/custom_commands/history.go b/pkg/integration/tests/shell_commands/history.go
similarity index 98%
rename from pkg/integration/tests/custom_commands/history.go
rename to pkg/integration/tests/shell_commands/history.go
index 834892564..9519397ac 100644
--- a/pkg/integration/tests/custom_commands/history.go
+++ b/pkg/integration/tests/shell_commands/history.go
@@ -1,4 +1,4 @@
-package custom_commands
+package shell_commands
 
 import (
 	"github.com/jesseduffield/lazygit/pkg/config"
diff --git a/pkg/integration/tests/custom_commands/omit_from_history.go b/pkg/integration/tests/shell_commands/omit_from_history.go
similarity index 97%
rename from pkg/integration/tests/custom_commands/omit_from_history.go
rename to pkg/integration/tests/shell_commands/omit_from_history.go
index 8bb26461c..3a37d961c 100644
--- a/pkg/integration/tests/custom_commands/omit_from_history.go
+++ b/pkg/integration/tests/shell_commands/omit_from_history.go
@@ -1,4 +1,4 @@
-package custom_commands
+package shell_commands
 
 import (
 	"github.com/jesseduffield/lazygit/pkg/config"
diff --git a/pkg/integration/tests/test_list.go b/pkg/integration/tests/test_list.go
index 97c509d64..c1038ee2a 100644
--- a/pkg/integration/tests/test_list.go
+++ b/pkg/integration/tests/test_list.go
@@ -21,6 +21,7 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/misc"
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/patch_building"
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/reflog"
+	"github.com/jesseduffield/lazygit/pkg/integration/tests/shell_commands"
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/staging"
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/stash"
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/status"
@@ -115,20 +116,14 @@ var tests = []*components.IntegrationTest{
 	conflicts.ResolveMultipleFiles,
 	conflicts.UndoChooseHunk,
 	custom_commands.AccessCommitProperties,
-	custom_commands.BasicCmdAtRuntime,
-	custom_commands.BasicCmdFromConfig,
+	custom_commands.BasicCommand,
 	custom_commands.CheckForConflicts,
-	custom_commands.ComplexCmdAtRuntime,
-	custom_commands.DeleteFromHistory,
-	custom_commands.EditHistory,
 	custom_commands.FormPrompts,
 	custom_commands.GlobalContext,
-	custom_commands.History,
 	custom_commands.MenuFromCommand,
 	custom_commands.MenuFromCommandsOutput,
 	custom_commands.MultipleContexts,
 	custom_commands.MultiplePrompts,
-	custom_commands.OmitFromHistory,
 	custom_commands.ShowOutputInPanel,
 	custom_commands.SuggestionsCommand,
 	custom_commands.SuggestionsPreset,
@@ -267,6 +262,12 @@ var tests = []*components.IntegrationTest{
 	reflog.DoNotShowBranchMarkersInReflogSubcommits,
 	reflog.Patch,
 	reflog.Reset,
+	shell_commands.BasicShellCommand,
+	shell_commands.ComplexShellCommand,
+	shell_commands.DeleteFromHistory,
+	shell_commands.EditHistory,
+	shell_commands.History,
+	shell_commands.OmitFromHistory,
 	staging.DiffChangeScreenMode,
 	staging.DiffContextChange,
 	staging.DiscardAllChanges,