diff --git a/test/images/BUILD b/test/images/BUILD
index ba74aece48..f94fdc49f5 100644
--- a/test/images/BUILD
+++ b/test/images/BUILD
@@ -11,14 +11,11 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//test/images/clusterapi-tester:all-srcs",
         "//test/images/entrypoint-tester:all-srcs",
         "//test/images/fakegitserver:all-srcs",
-        "//test/images/goproxy:all-srcs",
         "//test/images/liveness:all-srcs",
         "//test/images/logs-generator:all-srcs",
         "//test/images/mounttest:all-srcs",
-        "//test/images/n-way-http:all-srcs",
         "//test/images/net:all-srcs",
         "//test/images/netexec:all-srcs",
         "//test/images/nettest:all-srcs",
diff --git a/test/images/clusterapi-tester/BASEIMAGE b/test/images/clusterapi-tester/BASEIMAGE
deleted file mode 100644
index 44329aaa5b..0000000000
--- a/test/images/clusterapi-tester/BASEIMAGE
+++ /dev/null
@@ -1,5 +0,0 @@
-amd64=busybox
-arm=arm32v6/busybox
-arm64=arm64v8/busybox
-ppc64le=ppc64le/busybox
-s390x=s390x/busybox
diff --git a/test/images/clusterapi-tester/BUILD b/test/images/clusterapi-tester/BUILD
deleted file mode 100644
index 812a1e05d7..0000000000
--- a/test/images/clusterapi-tester/BUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_binary",
-    "go_library",
-)
-
-go_binary(
-    name = "clusterapi-tester",
-    embed = [":go_default_library"],
-)
-
-go_library(
-    name = "go_default_library",
-    srcs = ["clusterapi-tester.go"],
-    importpath = "k8s.io/kubernetes/test/images/clusterapi-tester",
-    deps = [
-        "//pkg/client/clientset_generated/internalclientset:go_default_library",
-        "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
-        "//staging/src/k8s.io/client-go/rest:go_default_library",
-    ],
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/test/images/clusterapi-tester/Dockerfile b/test/images/clusterapi-tester/Dockerfile
deleted file mode 100644
index cfb8401d85..0000000000
--- a/test/images/clusterapi-tester/Dockerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2016 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-FROM BASEIMAGE
-ADD clusterapi-tester /clusterapi-tester
-ENTRYPOINT ["/clusterapi-tester"]
diff --git a/test/images/clusterapi-tester/Makefile b/test/images/clusterapi-tester/Makefile
deleted file mode 100644
index 7e7d827fdc..0000000000
--- a/test/images/clusterapi-tester/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2016 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-SRCS = clusterapi-tester
-ARCH ?= amd64
-TARGET ?= $(CURDIR)
-GOLANG_VERSION ?= latest
-SRC_DIR = $(notdir $(shell pwd))
-export
-
-bin:
-	../image-util.sh bin $(SRCS)
-
-.PHONY: bin
diff --git a/test/images/clusterapi-tester/VERSION b/test/images/clusterapi-tester/VERSION
deleted file mode 100644
index d3827e75a5..0000000000
--- a/test/images/clusterapi-tester/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-1.0
diff --git a/test/images/clusterapi-tester/clusterapi-tester.go b/test/images/clusterapi-tester/clusterapi-tester.go
deleted file mode 100644
index 1e24ec6ffb..0000000000
--- a/test/images/clusterapi-tester/clusterapi-tester.go
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-Copyright 2014 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// A simple pod that first lists all nodes/services through the Kubernetes
-// api, then serves a 200 on /healthz.
-package main
-
-import (
-	"log"
-
-	"fmt"
-	"net/http"
-
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	restclient "k8s.io/client-go/rest"
-	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-)
-
-func main() {
-	cc, err := restclient.InClusterConfig()
-	if err != nil {
-		log.Fatalf("Failed to create client: %v", err)
-	}
-
-	kubeClient, err := clientset.NewForConfig(cc)
-	if err != nil {
-		log.Fatalf("Failed to create client: %v", err)
-	}
-	listAll := metav1.ListOptions{}
-	nodes, err := kubeClient.Core().Nodes().List(listAll)
-	if err != nil {
-		log.Fatalf("Failed to list nodes: %v", err)
-	}
-	log.Printf("Nodes:")
-	for _, node := range nodes.Items {
-		log.Printf("\t%v", node.Name)
-	}
-	services, err := kubeClient.Core().Services(metav1.NamespaceDefault).List(listAll)
-	if err != nil {
-		log.Fatalf("Failed to list services: %v", err)
-	}
-	log.Printf("Services:")
-	for _, svc := range services.Items {
-		log.Printf("\t%v", svc.Name)
-	}
-	log.Printf("Success")
-	http.HandleFunc("/healthz", func(w http.ResponseWriter, r *http.Request) {
-		fmt.Fprintf(w, "Ok")
-	})
-	log.Fatal(http.ListenAndServe(":8080", nil))
-}
diff --git a/test/images/clusterapi-tester/pod.yaml b/test/images/clusterapi-tester/pod.yaml
deleted file mode 100644
index 8a7e401aa7..0000000000
--- a/test/images/clusterapi-tester/pod.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: clusterapi-tester
-spec:
-  containers:
-  - image: gcr.io/kubernetes-e2e-test-images/clusterapi-tester-amd64:1.0
-    name: clusterapi-tester
-    readinessProbe:
-      httpGet:
-        path: /healthz
-        port: 8080
-        scheme: HTTP
-      initialDelaySeconds: 10
-      timeoutSeconds: 5
-      failureThreshold: 3
-      periodSeconds: 10
-      successThreshold: 1
-  restartPolicy: OnFailure
diff --git a/test/images/goproxy/.gitignore b/test/images/goproxy/.gitignore
deleted file mode 100644
index 663e1754bd..0000000000
--- a/test/images/goproxy/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-goproxy
diff --git a/test/images/goproxy/BUILD b/test/images/goproxy/BUILD
deleted file mode 100644
index 0376d68b61..0000000000
--- a/test/images/goproxy/BUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_binary",
-    "go_library",
-)
-
-go_binary(
-    name = "goproxy",
-    embed = [":go_default_library"],
-)
-
-go_library(
-    name = "go_default_library",
-    srcs = ["goproxy.go"],
-    importpath = "k8s.io/kubernetes/test/images/goproxy",
-    deps = ["//vendor/github.com/elazarl/goproxy:go_default_library"],
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/test/images/goproxy/Dockerfile b/test/images/goproxy/Dockerfile
deleted file mode 100644
index d72ac441f6..0000000000
--- a/test/images/goproxy/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2016 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-FROM scratch
-ADD goproxy goproxy
-EXPOSE 8080
-ENTRYPOINT ["/goproxy"]
diff --git a/test/images/goproxy/Makefile b/test/images/goproxy/Makefile
deleted file mode 100644
index 35282790f0..0000000000
--- a/test/images/goproxy/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2016 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-SRCS=goproxy
-ARCH ?= amd64
-TARGET ?= $(CURDIR)
-GOLANG_VERSION ?= latest
-SRC_DIR = $(notdir $(shell pwd))
-export
-
-bin:
-	../image-util.sh bin $(SRCS)
-
-.PHONY: bin
diff --git a/test/images/goproxy/VERSION b/test/images/goproxy/VERSION
deleted file mode 100644
index d3827e75a5..0000000000
--- a/test/images/goproxy/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-1.0
diff --git a/test/images/goproxy/goproxy.go b/test/images/goproxy/goproxy.go
deleted file mode 100644
index 28e25c5c4d..0000000000
--- a/test/images/goproxy/goproxy.go
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2015 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"log"
-	"net/http"
-
-	"github.com/elazarl/goproxy"
-)
-
-func main() {
-	proxy := goproxy.NewProxyHttpServer()
-	proxy.Verbose = true
-	log.Fatal(http.ListenAndServe(":8080", proxy))
-}
diff --git a/test/images/goproxy/pod.yaml b/test/images/goproxy/pod.yaml
deleted file mode 100644
index 4356cbbbc2..0000000000
--- a/test/images/goproxy/pod.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: goproxy
-  labels:
-    app: goproxy
-spec:
-  containers:
-  - name: goproxy
-    image: gcr.io/kubernetes-e2e-test-images/goproxy-amd64:1.0
-    ports:
-    - containerPort: 8080
-    readinessProbe:
-      tcpSocket:
-        port: 8080
-
diff --git a/test/images/n-way-http/BASEIMAGE b/test/images/n-way-http/BASEIMAGE
deleted file mode 100644
index 44329aaa5b..0000000000
--- a/test/images/n-way-http/BASEIMAGE
+++ /dev/null
@@ -1,5 +0,0 @@
-amd64=busybox
-arm=arm32v6/busybox
-arm64=arm64v8/busybox
-ppc64le=ppc64le/busybox
-s390x=s390x/busybox
diff --git a/test/images/n-way-http/BUILD b/test/images/n-way-http/BUILD
deleted file mode 100644
index bcfa957368..0000000000
--- a/test/images/n-way-http/BUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_binary",
-    "go_library",
-)
-
-go_binary(
-    name = "n-way-http",
-    embed = [":go_default_library"],
-)
-
-go_library(
-    name = "go_default_library",
-    srcs = ["server.go"],
-    importpath = "k8s.io/kubernetes/test/images/n-way-http",
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/test/images/n-way-http/Dockerfile b/test/images/n-way-http/Dockerfile
deleted file mode 100644
index 32bf9eacf7..0000000000
--- a/test/images/n-way-http/Dockerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2016 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-FROM BASEIMAGE
-COPY n-way-http /
-ENTRYPOINT ["/n-way-http"]
diff --git a/test/images/n-way-http/Makefile b/test/images/n-way-http/Makefile
deleted file mode 100644
index 2847ed3f1c..0000000000
--- a/test/images/n-way-http/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2016 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-SRCS=n-way-http
-ARCH ?= amd64
-TARGET ?= $(CURDIR)
-GOLANG_VERSION ?= latest
-SRC_DIR = $(notdir $(shell pwd))
-export
-
-bin:
-	../image-util.sh bin $(SRCS)
-
-.PHONY: bin
diff --git a/test/images/n-way-http/VERSION b/test/images/n-way-http/VERSION
deleted file mode 100644
index d3827e75a5..0000000000
--- a/test/images/n-way-http/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-1.0
diff --git a/test/images/n-way-http/server.go b/test/images/n-way-http/server.go
deleted file mode 100644
index 90e276cf2e..0000000000
--- a/test/images/n-way-http/server.go
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-Copyright 2015 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// A webserver that runs n http handlers. Example invocation:
-// - server -port 8080 -prefix foo -num 10 -start 0
-// Will given you 10 /foo(i) endpoints that simply echo foo(i) when requested.
-// - server -start 3 -num 1
-// Will create just one endpoint, at /foo3
-package main
-
-import (
-	"flag"
-	"fmt"
-	"log"
-	"net/http"
-)
-
-var (
-	port   = flag.Int("port", 8080, "Port number for requests.")
-	prefix = flag.String("prefix", "foo", "String used as path prefix")
-	num    = flag.Int("num", 10, "Number of endpoints to create.")
-	start  = flag.Int("start", 0, "Index to start, only makes sense with --num")
-)
-
-func main() {
-	flag.Parse()
-	// This container is used to test the GCE L7 controller which expects "/"
-	// to return a 200 response.
-	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusOK)
-		fmt.Fprint(w, "ok")
-	})
-	for i := *start; i < *start+*num; i++ {
-		path := fmt.Sprintf("%v%d", *prefix, i)
-		http.HandleFunc(fmt.Sprintf("/%v", path), func(w http.ResponseWriter, r *http.Request) {
-			w.WriteHeader(http.StatusOK)
-			fmt.Fprint(w, path)
-		})
-	}
-	log.Printf("server -port %d -prefix %v -num %d -start %d", *port, *prefix, *num, *start)
-	http.ListenAndServe(fmt.Sprintf(":%d", *port), nil)
-}