diff --git a/dashboard/builders.go b/dashboard/builders.go
index 69bb42a..dfc0a30 100644
--- a/dashboard/builders.go
+++ b/dashboard/builders.go
@@ -75,9 +75,9 @@
 	"netbsd-arm":     "netbsd-arm-bsiegert",
 	"netbsd-arm64":   "netbsd-arm64-bsiegert",
 	"nocgo":          "linux-amd64-nocgo",
-	"openbsd":        "openbsd-amd64-64",
-	"openbsd-386":    "openbsd-386-64",
-	"openbsd-amd64":  "openbsd-amd64-64",
+	"openbsd":        "openbsd-amd64-68",
+	"openbsd-386":    "openbsd-386-68",
+	"openbsd-amd64":  "openbsd-amd64-68",
 	"openbsd-arm":    "openbsd-arm-jsing",
 	"openbsd-arm64":  "openbsd-arm64-jsing",
 	"openbsd-mips64": "openbsd-mips64-jsing",
@@ -2035,31 +2035,28 @@
 		numTryTestHelpers: 5,
 	})
 	addBuilder(BuildConfig{
-		Name:              "openbsd-amd64-64",
-		HostType:          "host-openbsd-amd64-64",
-		MinimumGoVersion:  types.MajorMinor{1, 11},
-		distTestAdjust:    noTestDirAndNoReboot,
-		tryBot:            defaultTrySet(),
-		numTestHelpers:    0,
-		numTryTestHelpers: 5,
+		Name:             "openbsd-amd64-64",
+		HostType:         "host-openbsd-amd64-64",
+		MinimumGoVersion: types.MajorMinor{1, 11},
+		distTestAdjust:   noTestDirAndNoReboot,
 	})
 	addBuilder(BuildConfig{
 		Name:           "openbsd-386-64",
 		HostType:       "host-openbsd-386-64",
-		tryBot:         explicitTrySet("sys"),
 		distTestAdjust: noTestDirAndNoReboot,
 	})
 	addBuilder(BuildConfig{
 		Name:           "openbsd-amd64-68",
 		HostType:       "host-openbsd-amd64-68",
+		tryBot:         defaultTrySet(),
 		distTestAdjust: noTestDirAndNoReboot,
-		KnownIssue:     35712,
 	})
 	addBuilder(BuildConfig{
-		Name:           "openbsd-386-68",
-		HostType:       "host-openbsd-386-68",
-		distTestAdjust: noTestDirAndNoReboot,
-		KnownIssue:     35712,
+		Name:              "openbsd-386-68",
+		HostType:          "host-openbsd-386-68",
+		tryBot:            explicitTrySet("sys"),
+		distTestAdjust:    noTestDirAndNoReboot,
+		numTryTestHelpers: 4,
 	})
 	addBuilder(BuildConfig{
 		Name:         "openbsd-arm-jsing",
diff --git a/dashboard/builders_test.go b/dashboard/builders_test.go
index 56bc13c..1f1ce92 100644
--- a/dashboard/builders_test.go
+++ b/dashboard/builders_test.go
@@ -108,7 +108,7 @@
 				"misc-compile-openbsd",
 				"misc-compile-plan9",
 				"misc-compile-ppc",
-				"openbsd-amd64-64",
+				"openbsd-amd64-68",
 				"windows-386-2008",
 				"windows-amd64-2016",
 			},
@@ -134,7 +134,7 @@
 				"misc-compile-openbsd",
 				"misc-compile-plan9",
 				"misc-compile-ppc",
-				"openbsd-amd64-64",
+				"openbsd-amd64-68",
 				"windows-386-2008",
 				"windows-amd64-2016",
 			},
@@ -160,7 +160,7 @@
 				"misc-compile-plan9",
 				"misc-compile-ppc",
 				"misc-compile-solaris",
-				"openbsd-amd64-64",
+				"openbsd-amd64-68",
 				"windows-386-2008",
 				"windows-amd64-2016",
 
@@ -190,7 +190,7 @@
 				"misc-compile-plan9",
 				"misc-compile-ppc",
 				"misc-compile-solaris",
-				"openbsd-amd64-64",
+				"openbsd-amd64-68",
 				"windows-386-2008",
 				"windows-amd64-2016",
 
@@ -220,8 +220,8 @@
 				"linux-amd64",
 				"linux-amd64-race",
 				"netbsd-amd64-9_0",
-				"openbsd-386-64",
-				"openbsd-amd64-64",
+				"openbsd-386-68",
+				"openbsd-amd64-68",
 				"windows-386-2008",
 				"windows-amd64-2016",
 			},
@@ -397,9 +397,12 @@
 		{b("linux-mips64le-mengzhuo", "net"), onlyPost},
 
 		// OpenBSD.
-		{b("openbsd-amd64-64@go1.16", "go"), both},
-		{b("openbsd-amd64-64@go1.15", "go"), both},
-		{b("openbsd-amd64-64@go1.14", "go"), both},
+		{b("openbsd-amd64-68@go1.16", "go"), both},
+		{b("openbsd-amd64-68@go1.15", "go"), both},
+		{b("openbsd-amd64-68@go1.14", "go"), both},
+		{b("openbsd-amd64-64@go1.16", "go"), onlyPost},
+		{b("openbsd-amd64-64@go1.15", "go"), onlyPost},
+		{b("openbsd-amd64-64@go1.14", "go"), onlyPost},
 		{b("openbsd-amd64-62@go1.16", "go"), none}, // golang.org/issue/42426.
 		{b("openbsd-amd64-62@go1.15", "go"), onlyPost},
 		{b("openbsd-amd64-62@go1.14", "go"), onlyPost},
@@ -523,8 +526,8 @@
 		{b("freebsd-amd64-11_1@go1.14", "exp"), none},
 		{b("freebsd-amd64-11_2", "exp"), none},
 		{b("freebsd-amd64-12_0", "exp"), none},
-		{b("openbsd-amd64-62", "exp"), none},
 		{b("openbsd-amd64-64", "exp"), none},
+		{b("openbsd-amd64-68", "exp"), none},
 		{b("js-wasm", "exp"), none},
 
 		// exp is experimental; it doesn't test against release branches.
@@ -539,7 +542,7 @@
 		{b("darwin-amd64-10_12", "build"), none},
 		{b("darwin-amd64-10_14", "build"), none},
 		{b("darwin-amd64-10_15", "build"), onlyPost},
-		{b("openbsd-amd64-64", "build"), none},
+		{b("openbsd-amd64-68", "build"), none},
 		{b("linux-amd64-fedora", "build"), none},
 		{b("linux-amd64-clang", "build"), none},
 		{b("linux-amd64-sid", "build"), none},