diff --git a/slasher/beaconclient/BUILD.bazel b/slasher/beaconclient/BUILD.bazel
index b100be347..28087b2e4 100644
--- a/slasher/beaconclient/BUILD.bazel
+++ b/slasher/beaconclient/BUILD.bazel
@@ -49,10 +49,10 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = [
+        "beaconclient_test.go",
         "chain_data_test.go",
         "historical_data_retrieval_test.go",
         "receivers_test.go",
-        "service_test.go",
         "submit_test.go",
         "validator_retrieval_test.go",
     ],
diff --git a/slasher/beaconclient/service_test.go b/slasher/beaconclient/beaconclient_test.go
similarity index 100%
rename from slasher/beaconclient/service_test.go
rename to slasher/beaconclient/beaconclient_test.go
diff --git a/validator/db/kv/BUILD.bazel b/validator/db/kv/BUILD.bazel
index e133556e3..2fa0087ae 100644
--- a/validator/db/kv/BUILD.bazel
+++ b/validator/db/kv/BUILD.bazel
@@ -48,11 +48,11 @@ go_test(
     srcs = [
         "attester_protection_test.go",
         "backup_test.go",
-        "db_test.go",
         "deprecated_attester_protection_test.go",
         "eip_blacklisted_keys_test.go",
         "genesis_test.go",
         "graffiti_test.go",
+        "kv_test.go",
         "migration_optimal_attester_protection_test.go",
         "migration_source_target_epochs_bucket_test.go",
         "proposer_protection_test.go",
diff --git a/validator/db/kv/db_test.go b/validator/db/kv/kv_test.go
similarity index 100%
rename from validator/db/kv/db_test.go
rename to validator/db/kv/kv_test.go