diff --git a/hack/.golint_failures b/hack/.golint_failures
index 8005c28f027..bf57cb6e3dd 100644
--- a/hack/.golint_failures
+++ b/hack/.golint_failures
@@ -801,6 +801,7 @@ staging/src/k8s.io/sample-apiserver/pkg/registry/wardle/fischer
 staging/src/k8s.io/sample-apiserver/pkg/registry/wardle/flunder
 test/e2e
 test/e2e/apimachinery
+test/e2e/apps
 test/e2e/autoscaling
 test/e2e/chaosmonkey
 test/e2e/common
@@ -817,7 +818,6 @@ test/e2e/scheduling
 test/e2e/storage
 test/e2e/upgrades
 test/e2e/upgrades/apps
-test/e2e/workload
 test/e2e_federation
 test/e2e_federation/framework
 test/e2e_federation/upgrades
diff --git a/test/e2e/BUILD b/test/e2e/BUILD
index 7618d46bf26..2fdf39fe160 100644
--- a/test/e2e/BUILD
+++ b/test/e2e/BUILD
@@ -19,6 +19,7 @@ go_test(
     tags = ["automanaged"],
     deps = [
         "//test/e2e/apimachinery:go_default_library",
+        "//test/e2e/apps:go_default_library",
         "//test/e2e/autoscaling:go_default_library",
         "//test/e2e/framework:go_default_library",
         "//test/e2e/instrumentation/logging:go_default_library",
@@ -30,7 +31,6 @@ go_test(
         "//test/e2e/scalability:go_default_library",
         "//test/e2e/scheduling:go_default_library",
         "//test/e2e/storage:go_default_library",
-        "//test/e2e/workload:go_default_library",
         "//test/utils:go_default_library",
         "//vendor/github.com/onsi/ginkgo:go_default_library",
         "//vendor/github.com/onsi/gomega:go_default_library",
@@ -173,6 +173,7 @@ filegroup(
     srcs = [
         ":package-srcs",
         "//test/e2e/apimachinery:all-srcs",
+        "//test/e2e/apps:all-srcs",
         "//test/e2e/autoscaling:all-srcs",
         "//test/e2e/chaosmonkey:all-srcs",
         "//test/e2e/common:all-srcs",
@@ -189,7 +190,6 @@ filegroup(
         "//test/e2e/storage:all-srcs",
         "//test/e2e/testing-manifests:all-srcs",
         "//test/e2e/upgrades:all-srcs",
-        "//test/e2e/workload:all-srcs",
     ],
     tags = ["automanaged"],
 )
diff --git a/test/e2e/apimachinery/BUILD b/test/e2e/apimachinery/BUILD
index 57e600bac4c..2ace019073f 100644
--- a/test/e2e/apimachinery/BUILD
+++ b/test/e2e/apimachinery/BUILD
@@ -25,9 +25,9 @@ go_library(
         "//pkg/controller:go_default_library",
         "//pkg/printers:go_default_library",
         "//pkg/util/version:go_default_library",
+        "//test/e2e/apps:go_default_library",
         "//test/e2e/framework:go_default_library",
         "//test/e2e/metrics:go_default_library",
-        "//test/e2e/workload:go_default_library",
         "//test/utils:go_default_library",
         "//vendor/github.com/onsi/ginkgo:go_default_library",
         "//vendor/github.com/onsi/gomega:go_default_library",
diff --git a/test/e2e/apimachinery/etcd_failure.go b/test/e2e/apimachinery/etcd_failure.go
index 26d856fcbaa..aa35810f1e1 100644
--- a/test/e2e/apimachinery/etcd_failure.go
+++ b/test/e2e/apimachinery/etcd_failure.go
@@ -23,8 +23,8 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/util/wait"
 	podutil "k8s.io/kubernetes/pkg/api/v1/pod"
+	"k8s.io/kubernetes/test/e2e/apps"
 	"k8s.io/kubernetes/test/e2e/framework"
-	"k8s.io/kubernetes/test/e2e/workload"
 	testutils "k8s.io/kubernetes/test/utils"
 
 	. "github.com/onsi/ginkgo"
@@ -74,7 +74,7 @@ func etcdFailTest(f *framework.Framework, failCommand, fixCommand string) {
 
 	checkExistingRCRecovers(f)
 
-	workload.TestReplicationControllerServeImageOrFail(f, "basic", framework.ServeHostnameImage)
+	apps.TestReplicationControllerServeImageOrFail(f, "basic", framework.ServeHostnameImage)
 }
 
 // For this duration, etcd will be failed by executing a failCommand on the master.
diff --git a/test/e2e/workload/BUILD b/test/e2e/apps/BUILD
similarity index 100%
rename from test/e2e/workload/BUILD
rename to test/e2e/apps/BUILD
diff --git a/test/e2e/workload/OWNERS b/test/e2e/apps/OWNERS
similarity index 100%
rename from test/e2e/workload/OWNERS
rename to test/e2e/apps/OWNERS
diff --git a/test/e2e/workload/cronjob.go b/test/e2e/apps/cronjob.go
similarity index 99%
rename from test/e2e/workload/cronjob.go
rename to test/e2e/apps/cronjob.go
index 51dd12afa6d..3d8f70e35d1 100644
--- a/test/e2e/workload/cronjob.go
+++ b/test/e2e/apps/cronjob.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package workload
+package apps
 
 import (
 	"fmt"
diff --git a/test/e2e/workload/daemon_restart.go b/test/e2e/apps/daemon_restart.go
similarity index 99%
rename from test/e2e/workload/daemon_restart.go
rename to test/e2e/apps/daemon_restart.go
index bf884f50794..20b4c0c97bc 100644
--- a/test/e2e/workload/daemon_restart.go
+++ b/test/e2e/apps/daemon_restart.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package workload
+package apps
 
 import (
 	"fmt"
diff --git a/test/e2e/workload/daemon_set.go b/test/e2e/apps/daemon_set.go
similarity index 99%
rename from test/e2e/workload/daemon_set.go
rename to test/e2e/apps/daemon_set.go
index 38c278eebac..f2825ecf895 100644
--- a/test/e2e/workload/daemon_set.go
+++ b/test/e2e/apps/daemon_set.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package workload
+package apps
 
 import (
 	"fmt"
diff --git a/test/e2e/workload/deployment.go b/test/e2e/apps/deployment.go
similarity index 99%
rename from test/e2e/workload/deployment.go
rename to test/e2e/apps/deployment.go
index 84eceeac3f9..6434fa0160d 100644
--- a/test/e2e/workload/deployment.go
+++ b/test/e2e/apps/deployment.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package workload
+package apps
 
 import (
 	"fmt"
diff --git a/test/e2e/workload/disruption.go b/test/e2e/apps/disruption.go
similarity index 99%
rename from test/e2e/workload/disruption.go
rename to test/e2e/apps/disruption.go
index 2882b5bd35c..3710f09170d 100644
--- a/test/e2e/workload/disruption.go
+++ b/test/e2e/apps/disruption.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package workload
+package apps
 
 import (
 	"fmt"
diff --git a/test/e2e/workload/framework.go b/test/e2e/apps/framework.go
similarity index 97%
rename from test/e2e/workload/framework.go
rename to test/e2e/apps/framework.go
index e7615c5ccb6..d4372e145ca 100644
--- a/test/e2e/workload/framework.go
+++ b/test/e2e/apps/framework.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package workload
+package apps
 
 import "github.com/onsi/ginkgo"
 
diff --git a/test/e2e/workload/job.go b/test/e2e/apps/job.go
similarity index 99%
rename from test/e2e/workload/job.go
rename to test/e2e/apps/job.go
index 95a78564a5d..a60b0f34b20 100644
--- a/test/e2e/workload/job.go
+++ b/test/e2e/apps/job.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package workload
+package apps
 
 import (
 	"fmt"
diff --git a/test/e2e/workload/rc.go b/test/e2e/apps/rc.go
similarity index 99%
rename from test/e2e/workload/rc.go
rename to test/e2e/apps/rc.go
index 776480e1398..62ef1704a93 100644
--- a/test/e2e/workload/rc.go
+++ b/test/e2e/apps/rc.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package workload
+package apps
 
 import (
 	"fmt"
diff --git a/test/e2e/workload/replica_set.go b/test/e2e/apps/replica_set.go
similarity index 99%
rename from test/e2e/workload/replica_set.go
rename to test/e2e/apps/replica_set.go
index 48362c3b882..a1c15d44e9c 100644
--- a/test/e2e/workload/replica_set.go
+++ b/test/e2e/apps/replica_set.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package workload
+package apps
 
 import (
 	"fmt"
diff --git a/test/e2e/workload/statefulset.go b/test/e2e/apps/statefulset.go
similarity index 99%
rename from test/e2e/workload/statefulset.go
rename to test/e2e/apps/statefulset.go
index 4a5755a7627..c5cf256fa00 100644
--- a/test/e2e/workload/statefulset.go
+++ b/test/e2e/apps/statefulset.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package workload
+package apps
 
 import (
 	"fmt"
diff --git a/test/e2e/workload/types.go b/test/e2e/apps/types.go
similarity index 98%
rename from test/e2e/workload/types.go
rename to test/e2e/apps/types.go
index 0f5c8f204c3..6e54767e6bb 100644
--- a/test/e2e/workload/types.go
+++ b/test/e2e/apps/types.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package workload
+package apps
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
index ae07686919e..b76ce37fbc3 100644
--- a/test/e2e/e2e_test.go
+++ b/test/e2e/e2e_test.go
@@ -20,6 +20,7 @@ import (
 	"testing"
 
 	_ "k8s.io/kubernetes/test/e2e/apimachinery"
+	_ "k8s.io/kubernetes/test/e2e/apps"
 	_ "k8s.io/kubernetes/test/e2e/autoscaling"
 	"k8s.io/kubernetes/test/e2e/framework"
 	_ "k8s.io/kubernetes/test/e2e/instrumentation/logging"
@@ -30,7 +31,6 @@ import (
 	_ "k8s.io/kubernetes/test/e2e/scalability"
 	_ "k8s.io/kubernetes/test/e2e/scheduling"
 	_ "k8s.io/kubernetes/test/e2e/storage"
-	_ "k8s.io/kubernetes/test/e2e/workload"
 )
 
 func init() {