diff --git a/pkg/infra/log/log.go b/pkg/infra/log/log.go
index c2157887d8e..21c11705e6a 100644
--- a/pkg/infra/log/log.go
+++ b/pkg/infra/log/log.go
@@ -7,6 +7,7 @@ package log
 import (
 	"fmt"
 	"io"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sort"
@@ -41,8 +42,10 @@ func init() {
 	loggersToClose = make([]DisposableHandler, 0)
 	loggersToReload = make([]ReloadableHandler, 0)
 
-	// Use console by default
-	format := getLogFormat("console")
+	// Use discard by default
+	format := func(w io.Writer) gokitlog.Logger {
+		return gokitlog.NewLogfmtLogger(gokitlog.NewSyncWriter(ioutil.Discard))
+	}
 	logger := level.NewFilter(format(os.Stderr), level.AllowInfo())
 	root = newManager(logger)
 }
diff --git a/pkg/tests/testinfra/testinfra.go b/pkg/tests/testinfra/testinfra.go
index b9732df06dd..ad7d5f3029a 100644
--- a/pkg/tests/testinfra/testinfra.go
+++ b/pkg/tests/testinfra/testinfra.go
@@ -177,8 +177,6 @@ func CreateGrafDir(t *testing.T, opts ...GrafanaOpts) (string, string) {
 
 	logSect, err := cfg.NewSection("log")
 	require.NoError(t, err)
-	_, err = logSect.NewKey("mode", "console")
-	require.NoError(t, err)
 	_, err = logSect.NewKey("level", "debug")
 	require.NoError(t, err)