diff --git a/cmd/bent/bent.go b/cmd/bent/bent.go
index 67e3529..fb411c1 100644
--- a/cmd/bent/bent.go
+++ b/cmd/bent/bent.go
@@ -710,7 +710,6 @@
 						if config.Disabled {
 							continue
 						}
-						config.say("toolchain: " + config.Name + "\n")
 						s := todo.Configurations[ci].compileOne(&todo.Benchmarks[bi], dirs.wd, yyy)
 						if s != "" {
 							getAndBuildFailures = append(getAndBuildFailures, s)
@@ -737,7 +736,6 @@
 						if config.Disabled {
 							continue
 						}
-						config.say("toolchain: " + config.Name + "\n")
 						s := config.compileOne(&todo.Benchmarks[bi], dirs.wd, yyy)
 						if s != "" {
 							getAndBuildFailures = append(getAndBuildFailures, s)
@@ -763,7 +761,6 @@
 					if bench.Disabled || config.Disabled {
 						continue
 					}
-					config.say("toolchain: " + config.Name + "\n")
 					s := config.compileOne(bench, dirs.wd, yyy)
 					if s != "" {
 						getAndBuildFailures = append(getAndBuildFailures, s)
@@ -790,7 +787,6 @@
 				if bench.Disabled || config.Disabled {
 					continue
 				}
-				config.say("toolchain: " + config.Name + "\n")
 				s := config.compileOne(bench, dirs.wd, p.k)
 				if s != "" {
 					getAndBuildFailures = append(getAndBuildFailures, s)
diff --git a/cmd/bent/configuration.go b/cmd/bent/configuration.go
index c975347..bd192be 100644
--- a/cmd/bent/configuration.go
+++ b/cmd/bent/configuration.go
@@ -113,6 +113,12 @@
 			continue
 		}
 
+		s := fmt.Sprintf("toolchain: %s\n", config.Name)
+		if verbose > 0 {
+			fmt.Print(s)
+		}
+		f.Write([]byte(s))
+
 		if !strings.ContainsAny(cmd, "/") {
 			cmd = path.Join(cwd, cmd)
 		}
@@ -242,12 +248,15 @@
 	// Report and record build stats to testbin
 
 	buf := new(bytes.Buffer)
-	var s string
+	var goarchVal string
 	if configGoArch != runtime.GOARCH && configGoArch != "" {
-		s = fmt.Sprintf("goarch: %s-%s\n", runtime.GOARCH, configGoArch)
+		goarchVal = fmt.Sprintf("%s-%s", runtime.GOARCH, configGoArch)
 	} else {
-		s = fmt.Sprintf("goarch: %s\n", runtime.GOARCH)
+		goarchVal = runtime.GOARCH
 	}
+	var s string
+	s += fmt.Sprintf("goarch: %s\n", goarchVal)
+	s += fmt.Sprintf("toolchain: %s\n", config.Name)
 	if verbose > 0 {
 		fmt.Print(s)
 	}
