diff --git a/autoroll/go/repo_manager/child/BUILD.bazel b/autoroll/go/repo_manager/child/BUILD.bazel
index f1bee2d..8735128 100644
--- a/autoroll/go/repo_manager/child/BUILD.bazel
+++ b/autoroll/go/repo_manager/child/BUILD.bazel
@@ -61,7 +61,6 @@
         "//go/gitiles/testutils",
         "//go/httputils",
         "//go/mockhttpclient",
-        "//go/testutils",
         "//go/testutils/unittest",
         "//go/vfs",
         "@com_github_stretchr_testify//mock",
diff --git a/go/deepequal/assertdeep/BUILD.bazel b/go/deepequal/assertdeep/BUILD.bazel
index bb29e00..b23a4ee 100644
--- a/go/deepequal/assertdeep/BUILD.bazel
+++ b/go/deepequal/assertdeep/BUILD.bazel
@@ -15,14 +15,3 @@
         "@com_github_stretchr_testify//require",
     ],
 )
-
-go_test(
-    name = "assertdeep_test",
-    srcs = ["assertdeep_test.go"],
-    embed = [":assertdeep"],
-    deps = [
-        "//go/sktest",
-        "//go/testutils",
-        "//go/testutils/unittest",
-    ],
-)
diff --git a/go/vfs/shared_tests/BUILD.bazel b/go/vfs/shared_tests/BUILD.bazel
index eaf5f0e..4447523 100644
--- a/go/vfs/shared_tests/BUILD.bazel
+++ b/go/vfs/shared_tests/BUILD.bazel
@@ -8,7 +8,6 @@
     visibility = ["//visibility:public"],
     deps = [
         "//go/sktest",
-        "//go/testutils",
         "//go/vfs",
         "@com_github_stretchr_testify//require",
     ],
diff --git a/gold-client/go/gcsuploader/BUILD.bazel b/gold-client/go/gcsuploader/BUILD.bazel
index 9079f50..e85ed84 100644
--- a/gold-client/go/gcsuploader/BUILD.bazel
+++ b/gold-client/go/gcsuploader/BUILD.bazel
@@ -21,7 +21,6 @@
     embed = [":gcsuploader"],
     deps = [
         "//go/exec",
-        "//go/testutils",
         "//go/testutils/unittest",
         "@com_github_stretchr_testify//assert",
         "@com_github_stretchr_testify//require",
diff --git a/perf/go/regression/continuous/BUILD.bazel b/perf/go/regression/continuous/BUILD.bazel
index f33a165..180c064 100644
--- a/perf/go/regression/continuous/BUILD.bazel
+++ b/perf/go/regression/continuous/BUILD.bazel
@@ -36,5 +36,6 @@
         "//perf/go/alerts",
         "//perf/go/config",
         "@com_github_stretchr_testify//assert",
+        "@com_github_stretchr_testify//require",
     ],
 )
diff --git a/perf/go/regression/sqlregressionstore/BUILD.bazel b/perf/go/regression/sqlregressionstore/BUILD.bazel
index 9240f43..16a1ee4 100644
--- a/perf/go/regression/sqlregressionstore/BUILD.bazel
+++ b/perf/go/regression/sqlregressionstore/BUILD.bazel
@@ -7,6 +7,7 @@
     importpath = "go.skia.org/infra/perf/go/regression/sqlregressionstore",
     visibility = ["//visibility:public"],
     deps = [
+        "//go/metrics2",
         "//go/skerr",
         "//go/sklog",
         "//perf/go/alerts",
diff --git a/perf/nanostat/BUILD.bazel b/perf/nanostat/BUILD.bazel
index 13c69f4..cabe80f 100644
--- a/perf/nanostat/BUILD.bazel
+++ b/perf/nanostat/BUILD.bazel
@@ -29,6 +29,5 @@
         "//go/testutils",
         "//go/testutils/unittest",
         "@com_github_stretchr_testify//assert",
-        "@com_github_stretchr_testify//require",
     ],
 )
diff --git a/power/go/testdata/BUILD.bazel b/power/go/testdata/BUILD.bazel
index 533f06a..f85cb6c 100644
--- a/power/go/testdata/BUILD.bazel
+++ b/power/go/testdata/BUILD.bazel
@@ -9,7 +9,6 @@
     deps = [
         "//go/sktest",
         "//go/testutils",
-        "@com_github_stretchr_testify//require",
         "@org_chromium_go_luci//common/api/swarming/swarming/v1:swarming",
     ],
 )
diff --git a/task_driver/go/db/memory/BUILD.bazel b/task_driver/go/db/memory/BUILD.bazel
index 3f0ccff..4e3c39a 100644
--- a/task_driver/go/db/memory/BUILD.bazel
+++ b/task_driver/go/db/memory/BUILD.bazel
@@ -18,7 +18,6 @@
     srcs = ["memory_test.go"],
     embed = [":memory"],
     deps = [
-        "//go/testutils",
         "//go/testutils/unittest",
         "//task_driver/go/db",
         "//task_driver/go/db/shared_tests",
diff --git a/task_scheduler/go/scheduling/BUILD.bazel b/task_scheduler/go/scheduling/BUILD.bazel
index d3b2602..bf52d0c 100644
--- a/task_scheduler/go/scheduling/BUILD.bazel
+++ b/task_scheduler/go/scheduling/BUILD.bazel
@@ -80,6 +80,7 @@
         "//task_scheduler/go/testutils",
         "//task_scheduler/go/types",
         "//task_scheduler/go/window",
+        "@com_github_stretchr_testify//assert",
         "@com_github_stretchr_testify//require",
         "@com_google_cloud_go_storage//:storage",
         "@org_chromium_go_luci//common/api/swarming/swarming/v1:swarming",