diff --git a/internal/testenv/testenv.go b/internal/testenv/testenv.go
index 65b7953df37..2f7d2a014e4 100644
--- a/internal/testenv/testenv.go
+++ b/internal/testenv/testenv.go
@@ -10,12 +10,13 @@ import (
 	"bytes"
 	"fmt"
 	"go/build"
-	exec "golang.org/x/sys/execabs"
 	"io/ioutil"
 	"os"
 	"runtime"
 	"strings"
 	"sync"
+
+	exec "golang.org/x/sys/execabs"
 )
 
 // Testing is an abstraction of a *testing.T.
@@ -247,8 +248,9 @@ func NeedsGoBuild(t Testing) {
 // It should be called from within a TestMain function.
 func ExitIfSmallMachine() {
 	switch os.Getenv("GO_BUILDER_NAME") {
-	case "linux-arm":
-		fmt.Fprintln(os.Stderr, "skipping test: linux-arm builder lacks sufficient memory (https://golang.org/issue/32834)")
+	case "linux-arm-scaleway":
+		// "linux-arm" was renamed to "linux-arm-scaleway" in CL 303230.
+		fmt.Fprintln(os.Stderr, "skipping test: linux-arm-scaleway builder lacks sufficient memory (https://golang.org/issue/32834)")
 		os.Exit(0)
 	case "plan9-arm":
 		fmt.Fprintln(os.Stderr, "skipping test: plan9-arm builder lacks sufficient memory (https://golang.org/issue/38772)")