diff --git a/src/test/java/com/google/devtools/build/android/desugar/covariantreturn/BUILD b/src/test/java/com/google/devtools/build/android/desugar/covariantreturn/BUILD
index 1d7b0bf..4308ccb 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/covariantreturn/BUILD
+++ b/src/test/java/com/google/devtools/build/android/desugar/covariantreturn/BUILD
@@ -34,7 +34,6 @@
         "//third_party:jsr330_inject",
         "//third_party:junit4",
         "//third_party:truth",
-        "//third_party:truth8",
     ],
 )
 
diff --git a/src/test/java/com/google/devtools/build/android/desugar/nest/BUILD b/src/test/java/com/google/devtools/build/android/desugar/nest/BUILD
index ea3920d..ae0c35e 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/nest/BUILD
+++ b/src/test/java/com/google/devtools/build/android/desugar/nest/BUILD
@@ -34,7 +34,6 @@
         "//third_party:jsr330_inject",
         "//third_party:junit4",
         "//third_party:truth",
-        "//third_party:truth8",
     ],
 )
 
@@ -126,7 +125,6 @@
         "//third_party:jsr330_inject",
         "//third_party:junit4",
         "//third_party:truth",
-        "//third_party:truth8",
     ],
 )
 
diff --git a/src/test/java/com/google/devtools/build/android/desugar/stringconcat/BUILD b/src/test/java/com/google/devtools/build/android/desugar/stringconcat/BUILD
index 4c6c7a9..7487f17 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/stringconcat/BUILD
+++ b/src/test/java/com/google/devtools/build/android/desugar/stringconcat/BUILD
@@ -34,7 +34,6 @@
         "//third_party:jsr330_inject",
         "//third_party:junit4",
         "//third_party:truth",
-        "//third_party:truth8",
     ],
 )
 
diff --git a/src/test/java/com/google/devtools/build/android/desugar/testing/junit/BUILD b/src/test/java/com/google/devtools/build/android/desugar/testing/junit/BUILD
index 884bcdd..fb8f749 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/testing/junit/BUILD
+++ b/src/test/java/com/google/devtools/build/android/desugar/testing/junit/BUILD
@@ -36,7 +36,6 @@
         "//third_party:jsr330_inject",
         "//third_party:junit4",
         "//third_party:truth",
-        "//third_party:truth8",
     ],
 )
 
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD
index a625313..81ab7a7 100644
--- a/src/test/java/com/google/devtools/build/lib/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/BUILD
@@ -388,7 +388,7 @@
         "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:failure_details_java_proto",
         "//third_party:mockito",
-        "//third_party:truth8",
+        "//third_party:truth",
         "//third_party/protobuf:protobuf_java",
     ],
 )
@@ -657,7 +657,7 @@
         "//src/main/protobuf:action_cache_java_proto",
         "//third_party:jsr305",
         "//third_party:mockito",
-        "//third_party:truth8",
+        "//third_party:truth",
     ],
 )
 
@@ -1482,7 +1482,7 @@
         "//src/main/tools:process-wrapper",
         "//src/test/shell/integration:spend_cpu_time",
         "//third_party:mockito",
-        "//third_party:truth8",
+        "//third_party:truth",
     ],
 )
 
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/BUILD b/src/test/java/com/google/devtools/build/lib/bazel/BUILD
index ad19613..354df19 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/bazel/BUILD
@@ -59,7 +59,6 @@
         "//third_party:jsr305",
         "//third_party:junit4",
         "//third_party:truth",
-        "//third_party:truth8",
         "//third_party/allocation_instrumenter",
     ],
 )
diff --git a/src/test/java/com/google/devtools/build/lib/blackbox/BUILD b/src/test/java/com/google/devtools/build/lib/blackbox/BUILD
index d00033e..425e356 100644
--- a/src/test/java/com/google/devtools/build/lib/blackbox/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/blackbox/BUILD
@@ -31,7 +31,6 @@
         "//src/test/java/com/google/devtools/build/lib:testutil",
         "//third_party:junit4",
         "//third_party:truth",
-        "//third_party:truth8",
     ],
 )
 
diff --git a/src/test/java/com/google/devtools/build/lib/metrics/BUILD b/src/test/java/com/google/devtools/build/lib/metrics/BUILD
index 6878c15..fd003c8 100644
--- a/src/test/java/com/google/devtools/build/lib/metrics/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/metrics/BUILD
@@ -16,6 +16,5 @@
         "//third_party:junit4",
         "//third_party:mockito",
         "//third_party:truth",
-        "//third_party:truth8",
     ],
 )
diff --git a/src/test/java/com/google/devtools/build/lib/rules/config/BUILD b/src/test/java/com/google/devtools/build/lib/rules/config/BUILD
index 3bf659d..1303832 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/config/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/rules/config/BUILD
@@ -36,7 +36,6 @@
         "//third_party:jsr305",
         "//third_party:junit4",
         "//third_party:truth",
-        "//third_party:truth8",
     ],
 )
 
diff --git a/src/test/java/com/google/devtools/build/lib/shell/BUILD b/src/test/java/com/google/devtools/build/lib/shell/BUILD
index e373dc7..ed79d3e 100644
--- a/src/test/java/com/google/devtools/build/lib/shell/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/shell/BUILD
@@ -51,7 +51,6 @@
         "//third_party:junit4",
         "//third_party:mockito",
         "//third_party:truth",
-        "//third_party:truth8",
     ],
 )
 
@@ -123,7 +122,6 @@
         "//src/test/java/com/google/devtools/build/lib:testutil",
         "//third_party:junit4",
         "//third_party:truth",
-        "//third_party:truth8",
     ],
 )
 
@@ -155,7 +153,6 @@
         "//src/test/java/com/google/devtools/build/lib:testutil",
         "//third_party:junit4",
         "//third_party:truth",
-        "//third_party:truth8",
     ],
 )
 
@@ -222,7 +219,6 @@
         "//src/test/java/com/google/devtools/build/lib:testutil",
         "//third_party:junit4",
         "//third_party:truth",
-        "//third_party:truth8",
     ],
 )
 
@@ -274,7 +270,6 @@
         "//third_party:junit4",
         "//third_party:mockito",
         "//third_party:truth",
-        "//third_party:truth8",
     ],
 )
 
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/trimming/BUILD b/src/test/java/com/google/devtools/build/lib/skyframe/trimming/BUILD
index e39e7da..b488816 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/trimming/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/trimming/BUILD
@@ -62,6 +62,5 @@
         "//third_party:guava-testlib",
         "//third_party:junit4",
         "//third_party:truth",
-        "//third_party:truth8",
     ],
 )
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/BUILD b/src/test/java/com/google/devtools/build/lib/skylark/BUILD
index 6697d1b..b749890 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/skylark/BUILD
@@ -97,7 +97,6 @@
         "//third_party:jsr305",
         "//third_party:junit4",
         "//third_party:truth",
-        "//third_party:truth8",
     ],
 )