diff --git a/test/e2e/BUILD b/test/e2e/BUILD
index 569c0e4843a..0c539cd6255 100644
--- a/test/e2e/BUILD
+++ b/test/e2e/BUILD
@@ -53,7 +53,6 @@ go_library(
         "cluster_upgrade.go",
         "custom_resource_definition.go",
         "dashboard.go",
-        "disruption.go",
         "dns.go",
         "dns_common.go",
         "dns_configmap.go",
@@ -153,7 +152,6 @@ go_library(
         "//vendor/k8s.io/api/certificates/v1beta1:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
-        "//vendor/k8s.io/api/policy/v1beta1:go_default_library",
         "//vendor/k8s.io/api/rbac/v1beta1:go_default_library",
         "//vendor/k8s.io/api/settings/v1alpha1:go_default_library",
         "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library",
@@ -176,7 +174,6 @@ go_library(
         "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/authentication/serviceaccount:go_default_library",
         "//vendor/k8s.io/client-go/discovery:go_default_library",
-        "//vendor/k8s.io/client-go/kubernetes:go_default_library",
         "//vendor/k8s.io/client-go/rest:go_default_library",
         "//vendor/k8s.io/client-go/tools/cache:go_default_library",
         "//vendor/k8s.io/client-go/util/cert:go_default_library",
diff --git a/test/e2e/network_partition.go b/test/e2e/network_partition.go
index 62237b79d3e..fb058f4a12d 100644
--- a/test/e2e/network_partition.go
+++ b/test/e2e/network_partition.go
@@ -41,6 +41,10 @@ import (
 	. "github.com/onsi/gomega"
 )
 
+const (
+	timeout = 60 * time.Second
+)
+
 func expectNodeReadiness(isReady bool, newNode chan *v1.Node) {
 	timeout := false
 	expected := false
diff --git a/test/e2e/workload/BUILD b/test/e2e/workload/BUILD
index a993d6d6561..021b62830e2 100644
--- a/test/e2e/workload/BUILD
+++ b/test/e2e/workload/BUILD
@@ -14,6 +14,7 @@ go_library(
         "daemon_restart.go",
         "daemon_set.go",
         "deployment.go",
+        "disruption.go",
         "job.go",
         "rc.go",
         "replica_set.go",
@@ -50,6 +51,7 @@ go_library(
         "//vendor/k8s.io/api/batch/v2alpha1:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
+        "//vendor/k8s.io/api/policy/v1beta1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
@@ -63,6 +65,7 @@ go_library(
         "//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
+        "//vendor/k8s.io/client-go/kubernetes:go_default_library",
         "//vendor/k8s.io/client-go/tools/cache:go_default_library",
     ],
 )
diff --git a/test/e2e/disruption.go b/test/e2e/workload/disruption.go
similarity index 99%
rename from test/e2e/disruption.go
rename to test/e2e/workload/disruption.go
index fdff7f1bb55..21047d131a5 100644
--- a/test/e2e/disruption.go
+++ b/test/e2e/workload/disruption.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package e2e
+package workload
 
 import (
 	"fmt"