diff --git a/coordinator/statement_executor_test.go b/coordinator/statement_executor_test.go
index 640caafac5..a58fa4438d 100644
--- a/coordinator/statement_executor_test.go
+++ b/coordinator/statement_executor_test.go
@@ -198,11 +198,11 @@ func NewQueryExecutor() *QueryExecutor {
 
 	var out io.Writer = &e.LogOutput
 	if testing.Verbose() {
-		io.MultiWriter(out, os.Stderr)
+		out = io.MultiWriter(out, os.Stderr)
 	}
 	e.QueryExecutor.WithLogger(zap.New(
 		zap.NewTextEncoder(),
-		zap.Output(os.Stderr),
+		zap.Output(zap.AddSync(out)),
 	))
 
 	return e
diff --git a/influxql/query_executor_test.go b/influxql/query_executor_test.go
index 8e90ef8cc1..8b93f4c8f3 100644
--- a/influxql/query_executor_test.go
+++ b/influxql/query_executor_test.go
@@ -143,11 +143,6 @@ func TestQueryExecutor_Abort(t *testing.T) {
 }
 
 func TestQueryExecutor_ShowQueries(t *testing.T) {
-	_, err := influxql.ParseQuery(`SELECT count(value) FROM cpu`)
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	e := NewQueryExecutor()
 	e.StatementExecutor = &StatementExecutor{
 		ExecuteStatementFn: func(stmt influxql.Statement, ctx influxql.ExecutionContext) error {
diff --git a/tsdb/engine/tsm1/file_store.go b/tsdb/engine/tsm1/file_store.go
index a178df5f0b..73f4a36201 100644
--- a/tsdb/engine/tsm1/file_store.go
+++ b/tsdb/engine/tsm1/file_store.go
@@ -846,12 +846,15 @@ func ParseTSMFileName(name string) (int, int, error) {
 
 	generation, err := strconv.ParseUint(id[:idx], 10, 32)
 	if err != nil {
-		return 0, 0, err
+		return 0, 0, fmt.Errorf("file %s is named incorrectly", name)
 	}
 
 	sequence, err := strconv.ParseUint(id[idx+1:], 10, 32)
+	if err != nil {
+		return 0, 0, fmt.Errorf("file %s is named incorrectly", name)
+	}
 
-	return int(generation), int(sequence), err
+	return int(generation), int(sequence), nil
 }
 
 type KeyCursor struct {