diff --git a/server/core/config/raw/step_test.go b/server/core/config/raw/step_test.go
index e244c4da5..b6f4ed087 100644
--- a/server/core/config/raw/step_test.go
+++ b/server/core/config/raw/step_test.go
@@ -467,7 +467,7 @@ func TestStep_Validate(t *testing.T) {
 					},
 				},
 			},
-			expErr: "\"run\" step \"shellArgs\" option must be a string or a list of strings, found [42 42]\n",
+			expErr: "\"run\" step \"shellArgs\" option must be a string or a list of strings, found [42 42]",
 		},
 		{
 			description: "run step with shellArgs contain not strings",
@@ -481,7 +481,7 @@ func TestStep_Validate(t *testing.T) {
 					},
 				},
 			},
-			expErr: "\"run\" step \"shellArgs\" option must contain only strings, found 42\n",
+			expErr: "\"run\" step \"shellArgs\" option must contain only strings, found 42",
 		},
 		{
 			// For atlantis.yaml v2, this wouldn't parse, but now there should
diff --git a/server/core/runtime/multienv_step_runner_test.go b/server/core/runtime/multienv_step_runner_test.go
index b39096a2b..4001c9b57 100644
--- a/server/core/runtime/multienv_step_runner_test.go
+++ b/server/core/runtime/multienv_step_runner_test.go
@@ -45,7 +45,7 @@ func TestMultiEnvStepRunner_Run(t *testing.T) {
 		{
 			Command: `echo 'TF_VAR_REPODEFINEDVARIABLE_NO_VALUE'`,
 			Output:  valid.PostProcessRunOutputShow,
-			ExpErr:  "Invalid environment variable definition: TF_VAR_REPODEFINEDVARIABLE_NO_VALUE",
+			ExpErr:  "invalid environment variable definition: TF_VAR_REPODEFINEDVARIABLE_NO_VALUE",
 			ExpEnv:  map[string]string{},
 		},
 		{
diff --git a/server/events/vcs/github_client_test.go b/server/events/vcs/github_client_test.go
index a3dd1dad5..158182fc3 100644
--- a/server/events/vcs/github_client_test.go
+++ b/server/events/vcs/github_client_test.go
@@ -1060,7 +1060,7 @@ func TestGithubClient_MergePullCorrectMethod(t *testing.T) {
 			allowSquash:       true,
 			mergeMethodOption: "merge",
 			expMethod:         "",
-			expErr:            "Merge method 'merge' is not allowed by the repository Pull Request settings",
+			expErr:            "merge method 'merge' is not allowed by the repository Pull Request settings",
 		},
 		"merge with rebase: overridden by command: rebase not allowed": {
 			allowMerge:        true,
@@ -1068,7 +1068,7 @@ func TestGithubClient_MergePullCorrectMethod(t *testing.T) {
 			allowSquash:       true,
 			mergeMethodOption: "rebase",
 			expMethod:         "",
-			expErr:            "Merge method 'rebase' is not allowed by the repository Pull Request settings",
+			expErr:            "merge method 'rebase' is not allowed by the repository Pull Request settings",
 		},
 		"merge with squash: overridden by command: squash not allowed": {
 			allowMerge:        true,
@@ -1076,7 +1076,7 @@ func TestGithubClient_MergePullCorrectMethod(t *testing.T) {
 			allowSquash:       false,
 			mergeMethodOption: "squash",
 			expMethod:         "",
-			expErr:            "Merge method 'squash' is not allowed by the repository Pull Request settings",
+			expErr:            "merge method 'squash' is not allowed by the repository Pull Request settings",
 		},
 		"merge with unknown: overridden by command: unknown doesn't exist": {
 			allowMerge:        true,
@@ -1084,7 +1084,7 @@ func TestGithubClient_MergePullCorrectMethod(t *testing.T) {
 			allowSquash:       true,
 			mergeMethodOption: "unknown",
 			expMethod:         "",
-			expErr:            "Merge method 'unknown' is unknown. Specify one of the valid values: 'merge, rebase, squash'",
+			expErr:            "merge method 'unknown' is unknown. Specify one of the valid values: 'merge, rebase, squash'",
 		},
 	}