diff --git a/pkg/ccl/benchccl/rttanalysisccl/BUILD.bazel b/pkg/ccl/benchccl/rttanalysisccl/BUILD.bazel
index 67a2ec223987..991a914aedc9 100644
--- a/pkg/ccl/benchccl/rttanalysisccl/BUILD.bazel
+++ b/pkg/ccl/benchccl/rttanalysisccl/BUILD.bazel
@@ -19,6 +19,7 @@ go_library(
 
 go_test(
     name = "rttanalysisccl_test",
+    size = "large",
     srcs = [
         "bench_test.go",
         "multi_region_bench_test.go",
diff --git a/pkg/ccl/cliccl/BUILD.bazel b/pkg/ccl/cliccl/BUILD.bazel
index 7456044ea74d..6a2f9b568571 100644
--- a/pkg/ccl/cliccl/BUILD.bazel
+++ b/pkg/ccl/cliccl/BUILD.bazel
@@ -62,7 +62,7 @@ go_library(
 
 go_test(
     name = "cliccl_test",
-    size = "small",
+    size = "medium",
     srcs = [
         "debug_backup_test.go",
         "main_test.go",
diff --git a/pkg/cmd/roachtest/fixtures/1/checkpoint-v21.2.tgz b/pkg/cmd/roachtest/fixtures/1/checkpoint-v21.2.tgz
new file mode 100644
index 000000000000..c923d7dcf943
Binary files /dev/null and b/pkg/cmd/roachtest/fixtures/1/checkpoint-v21.2.tgz differ
diff --git a/pkg/cmd/roachtest/fixtures/2/checkpoint-v21.2.tgz b/pkg/cmd/roachtest/fixtures/2/checkpoint-v21.2.tgz
new file mode 100644
index 000000000000..3f1d15aadd85
Binary files /dev/null and b/pkg/cmd/roachtest/fixtures/2/checkpoint-v21.2.tgz differ
diff --git a/pkg/cmd/roachtest/fixtures/3/checkpoint-v21.2.tgz b/pkg/cmd/roachtest/fixtures/3/checkpoint-v21.2.tgz
new file mode 100644
index 000000000000..05d8df3dd24c
Binary files /dev/null and b/pkg/cmd/roachtest/fixtures/3/checkpoint-v21.2.tgz differ
diff --git a/pkg/cmd/roachtest/fixtures/4/checkpoint-v21.2.tgz b/pkg/cmd/roachtest/fixtures/4/checkpoint-v21.2.tgz
new file mode 100644
index 000000000000..0abbdf028b52
Binary files /dev/null and b/pkg/cmd/roachtest/fixtures/4/checkpoint-v21.2.tgz differ
diff --git a/pkg/cmd/roachtest/tests/predecessor_version.go b/pkg/cmd/roachtest/tests/predecessor_version.go
index ff6dbd12a775..ee2b6fd8c550 100644
--- a/pkg/cmd/roachtest/tests/predecessor_version.go
+++ b/pkg/cmd/roachtest/tests/predecessor_version.go
@@ -36,7 +36,8 @@ func PredecessorVersion(buildVersion version.Version) (string, error) {
 	// checkpoint option enabled to create the missing store directory
 	// fixture (see runVersionUpgrade).
 	verMap := map[string]string{
-		"21.2": "21.1.8",
+		"22.1": "21.2.0-beta.2",
+		"21.2": "21.1.9",
 		"21.1": "20.2.12",
 		"20.2": "20.1.16",
 		"20.1": "19.2.11",
diff --git a/pkg/cmd/roachtest/tests/versionupgrade.go b/pkg/cmd/roachtest/tests/versionupgrade.go
index af1f1d22a68a..1fabfc5d61df 100644
--- a/pkg/cmd/roachtest/tests/versionupgrade.go
+++ b/pkg/cmd/roachtest/tests/versionupgrade.go
@@ -467,7 +467,7 @@ func waitForUpgradeStep(nodes option.NodeListOption) versionStep {
 		t.L().Printf("%s: waiting for cluster to auto-upgrade\n", newVersion)
 
 		for _, i := range nodes {
-			err := retry.ForDuration(30*time.Second, func() error {
+			err := retry.ForDuration(5*time.Minute, func() error {
 				currentVersion := u.clusterVersion(ctx, t, i).String()
 				if currentVersion != newVersion {
 					return fmt.Errorf("%d: expected version %s, got %s", i, newVersion, currentVersion)
diff --git a/pkg/server/BUILD.bazel b/pkg/server/BUILD.bazel
index 2e03724a0454..38b2f10ab197 100644
--- a/pkg/server/BUILD.bazel
+++ b/pkg/server/BUILD.bazel
@@ -261,7 +261,7 @@ go_library(
 
 go_test(
     name = "server_test",
-    size = "medium",
+    size = "large",
     srcs = [
         "addjoin_test.go",
         "admin_cluster_test.go",