diff --git a/Makefile b/Makefile
index 1384bb6bb..236f55248 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,7 @@ endif
 
 test:
 	@echo "Testing..."
-	$Q go test -mod=vendor $(if $V,-v) -i $(allpackages) # install -race libs to speed up next run
+	$Q go test -mod=vendor $(if $V,-v) $(allpackages) # install -race libs to speed up next run
 ifndef CI
 	@echo "Testing Outside CI..."
 	$Q GODEBUG=cgocheck=2 go test -mod=vendor $(allpackages)
diff --git a/vendor/github.com/sirupsen/logrus/terminal_check_js.go b/vendor/github.com/sirupsen/logrus/terminal_check_js.go
index 0c209750a..c3c78b639 100644
--- a/vendor/github.com/sirupsen/logrus/terminal_check_js.go
+++ b/vendor/github.com/sirupsen/logrus/terminal_check_js.go
@@ -1,4 +1,8 @@
+<<<<<<< HEAD:vendor/github.com/sirupsen/logrus/terminal_check_js.go
 // +build js
+=======
+// +build appengine gopherjs
+>>>>>>> Makefile: remove -i from go test command fixed in golang/go#27285:vendor/github.com/sirupsen/logrus/terminal_check_appengine.go
 
 package logrus
 
diff --git a/vendor/github.com/sirupsen/logrus/terminal_check_windows.go b/vendor/github.com/sirupsen/logrus/terminal_check_windows.go
index 3b9d2864c..44eaf5f7c 100644
--- a/vendor/github.com/sirupsen/logrus/terminal_check_windows.go
+++ b/vendor/github.com/sirupsen/logrus/terminal_check_windows.go
@@ -1,19 +1,32 @@
+<<<<<<< HEAD:vendor/github.com/sirupsen/logrus/terminal_check_windows.go
 // +build !appengine,!js,windows
+=======
+// +build !appengine,!gopherjs
+>>>>>>> Makefile: remove -i from go test command fixed in golang/go#27285:vendor/github.com/sirupsen/logrus/terminal_check_notappengine.go
 
 package logrus
 
 import (
 	"io"
 	"os"
+<<<<<<< HEAD:vendor/github.com/sirupsen/logrus/terminal_check_windows.go
 	"syscall"
+=======
+
+	"golang.org/x/crypto/ssh/terminal"
+>>>>>>> Makefile: remove -i from go test command fixed in golang/go#27285:vendor/github.com/sirupsen/logrus/terminal_check_notappengine.go
 )
 
 func checkIfTerminal(w io.Writer) bool {
 	switch v := w.(type) {
 	case *os.File:
+<<<<<<< HEAD:vendor/github.com/sirupsen/logrus/terminal_check_windows.go
 		var mode uint32
 		err := syscall.GetConsoleMode(syscall.Handle(v.Fd()), &mode)
 		return err == nil
+=======
+		return terminal.IsTerminal(int(v.Fd()))
+>>>>>>> Makefile: remove -i from go test command fixed in golang/go#27285:vendor/github.com/sirupsen/logrus/terminal_check_notappengine.go
 	default:
 		return false
 	}