--- gitlab-runner-v12.1.0/shells/bash_test.go	2019-07-19 12:13:32.000000000 +0000
+++ gitlab-runner-v12.1.0/shells/bash_test.go	2020-04-27 00:07:06.763360621 +0000
@@ -16,12 +16,12 @@ func TestBash_CommandShellEscapes(t *tes
 	writer := &BashWriter{useNewEscape: false}
 	writer.Command("foo", "x&(y)")
 
-	assert.Equal(t, `$'foo' "x&(y)"`+"\n", writer.String())
+	assert.Equal(t, `'foo' "x&(y)"`+"\n", writer.String())
 }
 
 func TestBash_IfCmdShellEscapesLegacy(t *testing.T) {
 	writer := &BashWriter{useNewEscape: false}
 	writer.IfCmd("foo", "x&(y)")
 
-	assert.Equal(t, `if $'foo' "x&(y)" >/dev/null 2>&1; then`+"\n", writer.String())
+	assert.Equal(t, `if 'foo' "x&(y)" >/dev/null 2>/dev/null; then`+"\n", writer.String())
 }
--- gitlab-runner-v12.1.0/common/build_test.go	2019-07-19 12:13:32.000000000 +0000
+++ gitlab-runner-v12.1.0/common/build_test.go	2020-04-27 00:23:35.173376249 +0000
@@ -1255,7 +1255,7 @@ func TestWaitForTerminal(t *testing.T) {
 			},
 			jobTimeout:             3600,
 			waitForTerminalTimeout: time.Hour,
-			expectedErr:            "terminal disconnected by system signal: interrupt",
+			expectedErr:            "terminal disconnected by system signal: Interrupt",
 		},
 		{
 			name: "Terminal Disconnect",