diff --git a/federation/BUILD b/federation/BUILD
index 2990180846..5473e90177 100644
--- a/federation/BUILD
+++ b/federation/BUILD
@@ -29,6 +29,8 @@ filegroup(
         "//federation/pkg/kubefed:all-srcs",
         "//federation/plugin/pkg/admission/schedulingpolicy:all-srcs",
         "//federation/registry/cluster:all-srcs",
+        "//federation/test/e2e:all-srcs",
+        "//federation/test/integration:all-srcs",
     ],
     tags = ["automanaged"],
 )
diff --git a/federation/test/e2e/BUILD b/federation/test/e2e/BUILD
index 791e6c755e..4d578c171c 100644
--- a/federation/test/e2e/BUILD
+++ b/federation/test/e2e/BUILD
@@ -27,14 +27,14 @@ go_library(
         "//federation/client/clientset_generated/federation_clientset/typed/core/v1:go_default_library",
         "//federation/pkg/federatedtypes:go_default_library",
         "//federation/pkg/federation-controller/util:go_default_library",
+        "//federation/test/e2e/framework:go_default_library",
+        "//federation/test/e2e/upgrades:go_default_library",
         "//pkg/api:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/cloudprovider:go_default_library",
         "//test/e2e/chaosmonkey:go_default_library",
         "//test/e2e/common:go_default_library",
         "//test/e2e/framework:go_default_library",
-        "//test/e2e_federation/framework:go_default_library",
-        "//test/e2e_federation/upgrades:go_default_library",
         "//test/utils/image:go_default_library",
         "//vendor/github.com/onsi/ginkgo:go_default_library",
         "//vendor/github.com/onsi/gomega:go_default_library",
@@ -64,8 +64,8 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//test/e2e_federation/framework:all-srcs",
-        "//test/e2e_federation/upgrades:all-srcs",
+        "//federation/test/e2e/framework:all-srcs",
+        "//federation/test/e2e/upgrades:all-srcs",
     ],
     tags = ["automanaged"],
 )
diff --git a/federation/test/e2e/upgrades/BUILD b/federation/test/e2e/upgrades/BUILD
index be79ca8f1d..ff2f15e8e7 100644
--- a/federation/test/e2e/upgrades/BUILD
+++ b/federation/test/e2e/upgrades/BUILD
@@ -14,7 +14,7 @@ go_library(
     deps = [
         "//federation/pkg/federatedtypes:go_default_library",
         "//federation/pkg/federatedtypes/crudtester:go_default_library",
-        "//test/e2e_federation/framework:go_default_library",
+        "//federation/test/e2e/framework:go_default_library",
         "//vendor/github.com/onsi/ginkgo:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
     ],
diff --git a/federation/test/integration/BUILD b/federation/test/integration/BUILD
index ab566082f1..15d5e1bbb3 100644
--- a/federation/test/integration/BUILD
+++ b/federation/test/integration/BUILD
@@ -18,7 +18,7 @@ go_test(
         "//federation/apis/federation/v1beta1:go_default_library",
         "//federation/pkg/federatedtypes:go_default_library",
         "//federation/pkg/federatedtypes/crudtester:go_default_library",
-        "//test/integration/federation/framework:go_default_library",
+        "//federation/test/integration/framework:go_default_library",
         "//test/integration/framework:go_default_library",
         "//vendor/github.com/pborman/uuid:go_default_library",
         "//vendor/github.com/stretchr/testify/assert:go_default_library",
@@ -43,7 +43,7 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//test/integration/federation/framework:all-srcs",
+        "//federation/test/integration/framework:all-srcs",
     ],
     tags = ["automanaged"],
 )
diff --git a/test/BUILD b/test/BUILD
index 0233959be4..831bcb91f1 100644
--- a/test/BUILD
+++ b/test/BUILD
@@ -12,7 +12,6 @@ filegroup(
     srcs = [
         ":package-srcs",
         "//test/e2e:all-srcs",
-        "//test/e2e_federation:all-srcs",
         "//test/e2e_node:all-srcs",
         "//test/fixtures:all-srcs",
         "//test/images:all-srcs",
diff --git a/test/e2e/BUILD b/test/e2e/BUILD
index 59572bc5e7..c207566f7b 100644
--- a/test/e2e/BUILD
+++ b/test/e2e/BUILD
@@ -51,6 +51,7 @@ go_library(
         "ubernetes_lite.go",
     ],
     deps = [
+        "//federation/test/e2e:go_default_library",
         "//pkg/api:go_default_library",
         "//pkg/api/testapi:go_default_library",
         "//pkg/api/v1/pod:go_default_library",
@@ -66,7 +67,6 @@ go_library(
         "//test/e2e/framework/metrics:go_default_library",
         "//test/e2e/generated:go_default_library",
         "//test/e2e/manifest:go_default_library",
-        "//test/e2e_federation:go_default_library",
         "//test/utils:go_default_library",
         "//test/utils/image:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
diff --git a/test/integration/BUILD b/test/integration/BUILD
index be220b5b2a..e11ee6ea81 100644
--- a/test/integration/BUILD
+++ b/test/integration/BUILD
@@ -40,7 +40,6 @@ filegroup(
         "//test/integration/etcd:all-srcs",
         "//test/integration/evictions:all-srcs",
         "//test/integration/examples:all-srcs",
-        "//test/integration/federation:all-srcs",
         "//test/integration/framework:all-srcs",
         "//test/integration/garbagecollector:all-srcs",
         "//test/integration/kubectl:all-srcs",