diff --git a/Makefile b/Makefile
index bfd6741c6..f2e92bddb 100644
--- a/Makefile
+++ b/Makefile
@@ -39,22 +39,6 @@ clean:
 	rm -rf ./tests/e2e/default.proxy
 	find ./ -name "127.0.0.1:*" -o -name "localhost:*" -o -name "*.log" -o -name "agent-*" -o -name "*.coverprofile" -o -name "testname-proxy-*" | $(XARGS)
 
-docker-clean:
-	docker images
-	docker image prune --force
-
-docker-start:
-	service docker restart
-
-docker-kill:
-	docker kill `docker ps -q` || true
-
-docker-remove:
-	docker rm --force `docker ps -a -q` || true
-	docker rmi --force `docker images -q` || true
-
-
-
 GO_VERSION ?= 1.16.3
 ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound")
 
@@ -96,31 +80,6 @@ pull-docker-test:
 	$(info GO_VERSION: $(GO_VERSION))
 	docker pull gcr.io/etcd-development/etcd-test:go$(GO_VERSION)
 
-
-
-# Example:
-#   make build-docker-test
-#   make compile-with-docker-test
-#   make compile-setup-gopath-with-docker-test
-
-compile-with-docker-test:
-	$(info GO_VERSION: $(GO_VERSION))
-	docker run \
-	  --rm \
-	  --mount type=bind,source=`pwd`,destination=/go/src/go.etcd.io/etcd \
-	  gcr.io/etcd-development/etcd-test:go$(GO_VERSION) \
-	  /bin/bash -c "GO_BUILD_FLAGS=-v GOOS=linux GOARCH=amd64 ./build.sh && ./bin/etcd --version"
-
-compile-setup-gopath-with-docker-test:
-	$(info GO_VERSION: $(GO_VERSION))
-	docker run \
-	  --rm \
-	  --mount type=bind,source=`pwd`,destination=/etcd \
-	  gcr.io/etcd-development/etcd-test:go$(GO_VERSION) \
-	  /bin/bash -c "cd /etcd && ETCD_SETUP_GOPATH=1 GO_BUILD_FLAGS=-v GOOS=linux GOARCH=amd64 ./build.sh && ./bin/etcd --version && rm -rf ./gopath"
-
-
-
 # Example:
 #
 # Local machine:
@@ -129,22 +88,9 @@ compile-setup-gopath-with-docker-test:
 #   TEST_OPTS="PASSES='build unit release integration_e2e functional'" make test
 #   TEST_OPTS="PASSES='build grpcproxy'" make test
 #
-# Example (test with docker):
-#   make pull-docker-test
-#   TEST_OPTS="PASSES='fmt'" make docker-test
-#   TEST_OPTS="VERBOSE=2 PASSES='unit'" make docker-test
-#
-# Travis CI (test with docker):
-#   TEST_OPTS="PASSES='fmt bom dep build unit'" make docker-test
-#
-# Semaphore CI (test with docker):
-#   TEST_OPTS="PASSES='build unit release integration_e2e functional'" make docker-test
-#   HOST_TMP_DIR=/tmp TEST_OPTS="PASSES='build unit release integration_e2e functional'" make docker-test
-#   TEST_OPTS="GOARCH=386 PASSES='build unit integration_e2e'" make docker-test
-#
-# grpc-proxy tests (test with docker):
-#   TEST_OPTS="PASSES='build grpcproxy'" make docker-test
-#   HOST_TMP_DIR=/tmp TEST_OPTS="PASSES='build grpcproxy'" make docker-test
+# grpc-proxy tests:
+#   TEST_OPTS="PASSES='build grpcproxy'" make test
+#   HOST_TMP_DIR=/tmp TEST_OPTS="PASSES='build grpcproxy'" make test
 
 .PHONY: test
 test:
@@ -191,9 +137,7 @@ docker-test-coverage:
 	! egrep "(--- FAIL:|DATA RACE|panic: test timed out|appears to have leaked)" -B50 -A10 docker-test-coverage-$(TEST_SUFFIX).log
 
 
-
 # Example:
-#   make compile-with-docker-test
 #   ETCD_VERSION=v3-test make build-docker-release-main
 #   ETCD_VERSION=v3-test make push-docker-release-main
 #   gsutil -m acl ch -u allUsers:R -r gs://artifacts.etcd-development.appspot.com
@@ -216,333 +160,3 @@ build-docker-release-main:
 push-docker-release-main:
 	$(info ETCD_VERSION: $(ETCD_VERSION))
 	docker push gcr.io/etcd-development/etcd:$(ETCD_VERSION)
-
-
-
-# Example:
-#   make build-docker-test
-#   make compile-with-docker-test
-#   make build-docker-static-ip-test
-#
-#   gcloud auth configure-docker
-#   make push-docker-static-ip-test
-#
-#   gsutil -m acl ch -u allUsers:R -r gs://artifacts.etcd-development.appspot.com
-#   make pull-docker-static-ip-test
-#
-#   make docker-static-ip-test-certs-run
-#   make docker-static-ip-test-certs-metrics-proxy-run
-
-build-docker-static-ip-test:
-	$(info GO_VERSION: $(GO_VERSION))
-	@sed 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' ./tests/docker-static-ip/Dockerfile > $(TMP_DOCKERFILE)
-	docker build \
-	  --network=host \
-	  --tag gcr.io/etcd-development/etcd-static-ip-test:go$(GO_VERSION) \
-	  --file ./tests/docker-static-ip/Dockerfile \
-	  $(TMP_DOCKERFILE)
-
-push-docker-static-ip-test:
-	$(info GO_VERSION: $(GO_VERSION))
-	docker push gcr.io/etcd-development/etcd-static-ip-test:go$(GO_VERSION)
-
-pull-docker-static-ip-test:
-	$(info GO_VERSION: $(GO_VERSION))
-	docker pull gcr.io/etcd-development/etcd-static-ip-test:go$(GO_VERSION)
-
-docker-static-ip-test-certs-run:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
-	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
-	docker run \
-	  --rm \
-	  --tty \
-	  $(TMP_DIR_MOUNT_FLAG) \
-	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
-	  --mount type=bind,source=`pwd`/tests/docker-static-ip/certs,destination=/certs \
-	  gcr.io/etcd-development/etcd-static-ip-test:go$(GO_VERSION) \
-	  /bin/bash -c "cd /etcd && /certs/run.sh && rm -rf m*.etcd"
-
-docker-static-ip-test-certs-metrics-proxy-run:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
-	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
-	docker run \
-	  --rm \
-	  --tty \
-	  $(TMP_DIR_MOUNT_FLAG) \
-	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
-	  --mount type=bind,source=`pwd`/tests/docker-static-ip/certs-metrics-proxy,destination=/certs-metrics-proxy \
-	  gcr.io/etcd-development/etcd-static-ip-test:go$(GO_VERSION) \
-	  /bin/bash -c "cd /etcd && /certs-metrics-proxy/run.sh && rm -rf m*.etcd"
-
-
-
-# Example:
-#   make build-docker-test
-#   make compile-with-docker-test
-#   make build-docker-dns-test
-#
-#   gcloud auth configure-docker
-#   make push-docker-dns-test
-#
-#   gsutil -m acl ch -u allUsers:R -r gs://artifacts.etcd-development.appspot.com
-#   make pull-docker-dns-test
-#
-#   make docker-dns-test-insecure-run
-#   make docker-dns-test-certs-run
-#   make docker-dns-test-certs-gateway-run
-#   make docker-dns-test-certs-wildcard-run
-#   make docker-dns-test-certs-common-name-auth-run
-#   make docker-dns-test-certs-common-name-multi-run
-#   make docker-dns-test-certs-san-dns-run
-
-build-docker-dns-test:
-	$(info GO_VERSION: $(GO_VERSION))
-	@sed 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' ./tests/docker-dns/Dockerfile > $(TMP_DOCKERFILE)
-	docker build \
-	  --network=host \
-	  --tag gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \
-	  --file ./tests/docker-dns/Dockerfile \
-	  $(TMP_DOCKERFILE)
-
-	docker run \
-	  --rm \
-	  --dns 127.0.0.1 \
-	  gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \
-	  /bin/bash -c "/etc/init.d/bind9 start && cat /dev/null >/etc/hosts && dig etcd.local"
-
-push-docker-dns-test:
-	$(info GO_VERSION: $(GO_VERSION))
-	docker push gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION)
-
-pull-docker-dns-test:
-	$(info GO_VERSION: $(GO_VERSION))
-	docker pull gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION)
-
-docker-dns-test-insecure-run:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
-	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
-	docker run \
-	  --rm \
-	  --tty \
-	  --dns 127.0.0.1 \
-	  $(TMP_DIR_MOUNT_FLAG) \
-	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
-	  --mount type=bind,source=`pwd`/tests/docker-dns/insecure,destination=/insecure \
-	  gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \
-	  /bin/bash -c "cd /etcd && /insecure/run.sh && rm -rf m*.etcd"
-
-docker-dns-test-certs-run:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
-	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
-	docker run \
-	  --rm \
-	  --tty \
-	  --dns 127.0.0.1 \
-	  $(TMP_DIR_MOUNT_FLAG) \
-	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
-	  --mount type=bind,source=`pwd`/tests/docker-dns/certs,destination=/certs \
-	  gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \
-	  /bin/bash -c "cd /etcd && /certs/run.sh && rm -rf m*.etcd"
-
-docker-dns-test-certs-gateway-run:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
-	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
-	docker run \
-	  --rm \
-	  --tty \
-	  --dns 127.0.0.1 \
-	  $(TMP_DIR_MOUNT_FLAG) \
-	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
-	  --mount type=bind,source=`pwd`/tests/docker-dns/certs-gateway,destination=/certs-gateway \
-	  gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \
-	  /bin/bash -c "cd /etcd && /certs-gateway/run.sh && rm -rf m*.etcd"
-
-docker-dns-test-certs-wildcard-run:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
-	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
-	docker run \
-	  --rm \
-	  --tty \
-	  --dns 127.0.0.1 \
-	  $(TMP_DIR_MOUNT_FLAG) \
-	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
-	  --mount type=bind,source=`pwd`/tests/docker-dns/certs-wildcard,destination=/certs-wildcard \
-	  gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \
-	  /bin/bash -c "cd /etcd && /certs-wildcard/run.sh && rm -rf m*.etcd"
-
-docker-dns-test-certs-common-name-auth-run:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
-	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
-	docker run \
-	  --rm \
-	  --tty \
-	  --dns 127.0.0.1 \
-	  $(TMP_DIR_MOUNT_FLAG) \
-	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
-	  --mount type=bind,source=`pwd`/tests/docker-dns/certs-common-name-auth,destination=/certs-common-name-auth \
-	  gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \
-	  /bin/bash -c "cd /etcd && /certs-common-name-auth/run.sh && rm -rf m*.etcd"
-
-docker-dns-test-certs-common-name-multi-run:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
-	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
-	docker run \
-	  --rm \
-	  --tty \
-	  --dns 127.0.0.1 \
-	  $(TMP_DIR_MOUNT_FLAG) \
-	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
-	  --mount type=bind,source=`pwd`/tests/docker-dns/certs-common-name-multi,destination=/certs-common-name-multi \
-	  gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \
-	  /bin/bash -c "cd /etcd && /certs-common-name-multi/run.sh && rm -rf m*.etcd"
-
-docker-dns-test-certs-san-dns-run:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
-	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
-	docker run \
-	  --rm \
-	  --tty \
-	  --dns 127.0.0.1 \
-	  $(TMP_DIR_MOUNT_FLAG) \
-	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
-	  --mount type=bind,source=`pwd`/tests/docker-dns/certs-san-dns,destination=/certs-san-dns \
-	  gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \
-	  /bin/bash -c "cd /etcd && /certs-san-dns/run.sh && rm -rf m*.etcd"
-
-
-# Example:
-#   make build-docker-test
-#   make compile-with-docker-test
-#   make build-docker-dns-srv-test
-#   gcloud auth configure-docker
-#   make push-docker-dns-srv-test
-#   gsutil -m acl ch -u allUsers:R -r gs://artifacts.etcd-development.appspot.com
-#   make pull-docker-dns-srv-test
-#   make docker-dns-srv-test-certs-run
-#   make docker-dns-srv-test-certs-gateway-run
-#   make docker-dns-srv-test-certs-wildcard-run
-
-build-docker-dns-srv-test:
-	$(info GO_VERSION: $(GO_VERSION))
-	@sed 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' > $(TMP_DOCKERFILE)
-	docker build \
-	  --network=host \
-	  --tag gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION) \
-	  --file ./tests/docker-dns-srv/Dockerfile \
-	  $(TMP_DOCKERFILE)
-
-	docker run \
-	  --rm \
-	  --dns 127.0.0.1 \
-	  gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION) \
-	  /bin/bash -c "/etc/init.d/bind9 start && cat /dev/null >/etc/hosts && dig +noall +answer SRV _etcd-client-ssl._tcp.etcd.local && dig +noall +answer SRV _etcd-server-ssl._tcp.etcd.local && dig +noall +answer m1.etcd.local m2.etcd.local m3.etcd.local"
-
-push-docker-dns-srv-test:
-	$(info GO_VERSION: $(GO_VERSION))
-	docker push gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION)
-
-pull-docker-dns-srv-test:
-	$(info GO_VERSION: $(GO_VERSION))
-	docker pull gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION)
-
-docker-dns-srv-test-certs-run:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
-	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
-	docker run \
-	  --rm \
-	  --tty \
-	  --dns 127.0.0.1 \
-	  $(TMP_DIR_MOUNT_FLAG) \
-	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
-	  --mount type=bind,source=`pwd`/tests/docker-dns-srv/certs,destination=/certs \
-	  gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION) \
-	  /bin/bash -c "cd /etcd && /certs/run.sh && rm -rf m*.etcd"
-
-docker-dns-srv-test-certs-gateway-run:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
-	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
-	docker run \
-	  --rm \
-	  --tty \
-	  --dns 127.0.0.1 \
-	  $(TMP_DIR_MOUNT_FLAG) \
-	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
-	  --mount type=bind,source=`pwd`/tests/docker-dns-srv/certs-gateway,destination=/certs-gateway \
-	  gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION) \
-	  /bin/bash -c "cd /etcd && /certs-gateway/run.sh && rm -rf m*.etcd"
-
-docker-dns-srv-test-certs-wildcard-run:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
-	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
-	docker run \
-	  --rm \
-	  --tty \
-	  --dns 127.0.0.1 \
-	  $(TMP_DIR_MOUNT_FLAG) \
-	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
-	  --mount type=bind,source=`pwd`/tests/docker-dns-srv/certs-wildcard,destination=/certs-wildcard \
-	  gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION) \
-	  /bin/bash -c "cd /etcd && /certs-wildcard/run.sh && rm -rf m*.etcd"
-
-
-
-# Example:
-#   make build-functional
-#   make build-docker-functional
-#   make push-docker-functional
-#   make pull-docker-functional
-
-build-functional:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info ETCD_VERSION: $(ETCD_VERSION))
-	./tests/functional/build
-	./bin/etcd-agent -help || true && \
-	  ./bin/etcd-proxy -help || true && \
-	  ./bin/etcd-runner --help || true && \
-	  ./bin/etcd-tester -help || true
-
-build-docker-functional:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info ETCD_VERSION: $(ETCD_VERSION))
-	@sed 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' > $(TMP_DOCKERFILE)
-	docker build \
-	  --network=host \
-	  --tag gcr.io/etcd-development/etcd-functional:go$(GO_VERSION) \
-	  --file ./tests/functional/Dockerfile \
-	  .
-	@mv ./tests/functional/Dockerfile.bak ./tests/functional/Dockerfile
-
-	docker run \
-	  --rm \
-	  gcr.io/etcd-development/etcd-functional:go$(GO_VERSION) \
-	  /bin/bash -c "./bin/etcd --version && \
-	   ./bin/etcd-failpoints --version && \
-	   ./bin/etcdctl version && \
-	   ./bin/etcdutl version && \
-	   ./bin/etcd-agent -help || true && \
-	   ./bin/etcd-proxy -help || true && \
-	   ./bin/etcd-runner --help || true && \
-	   ./bin/etcd-tester -help || true && \
-	   ./bin/benchmark --help || true"
-
-push-docker-functional:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info ETCD_VERSION: $(ETCD_VERSION))
-	docker push gcr.io/etcd-development/etcd-functional:go$(GO_VERSION)
-
-pull-docker-functional:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info ETCD_VERSION: $(ETCD_VERSION))
-	docker pull gcr.io/etcd-development/etcd-functional:go$(GO_VERSION)
diff --git a/tests/manual/Makefile b/tests/manual/Makefile
new file mode 100644
index 000000000..87ee9e8c8
--- /dev/null
+++ b/tests/manual/Makefile
@@ -0,0 +1,283 @@
+TMP_DOCKERFILE:=$(shell mktemp)
+GO_VERSION ?= 1.16.3
+TMP_DIR_MOUNT_FLAG = --tmpfs=/tmp:exec
+ifdef HOST_TMP_DIR
+	TMP_DIR_MOUNT_FLAG = --mount type=bind,source=$(HOST_TMP_DIR),destination=/tmp
+endif
+
+# Example:
+#   make build-docker-test
+#   make compile-with-docker-test
+#   make build-docker-static-ip-test
+#
+#   gcloud auth configure-docker
+#   make push-docker-static-ip-test
+#
+#   gsutil -m acl ch -u allUsers:R -r gs://artifacts.etcd-development.appspot.com
+#   make pull-docker-static-ip-test
+#
+#   make docker-static-ip-test-certs-run
+#   make docker-static-ip-test-certs-metrics-proxy-run
+
+build-docker-static-ip-test:
+	$(info GO_VERSION: $(GO_VERSION))
+	@sed 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' ./docker-static-ip/Dockerfile > $(TMP_DOCKERFILE)
+	docker build \
+	  --network=host \
+	  --tag gcr.io/etcd-development/etcd-static-ip-test:go$(GO_VERSION) \
+	  --file ./docker-static-ip/Dockerfile \
+	  $(TMP_DOCKERFILE)
+
+push-docker-static-ip-test:
+	$(info GO_VERSION: $(GO_VERSION))
+	docker push gcr.io/etcd-development/etcd-static-ip-test:go$(GO_VERSION)
+
+pull-docker-static-ip-test:
+	$(info GO_VERSION: $(GO_VERSION))
+	docker pull gcr.io/etcd-development/etcd-static-ip-test:go$(GO_VERSION)
+
+docker-static-ip-test-certs-run:
+	$(info GO_VERSION: $(GO_VERSION))
+	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
+	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
+	docker run \
+	  --rm \
+	  --tty \
+	  $(TMP_DIR_MOUNT_FLAG) \
+	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
+	  --mount type=bind,source=`pwd`/tests/docker-static-ip/certs,destination=/certs \
+	  gcr.io/etcd-development/etcd-static-ip-test:go$(GO_VERSION) \
+	  /bin/bash -c "cd /etcd && /certs/run.sh && rm -rf m*.etcd"
+
+docker-static-ip-test-certs-metrics-proxy-run:
+	$(info GO_VERSION: $(GO_VERSION))
+	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
+	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
+	docker run \
+	  --rm \
+	  --tty \
+	  $(TMP_DIR_MOUNT_FLAG) \
+	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
+	  --mount type=bind,source=`pwd`/tests/docker-static-ip/certs-metrics-proxy,destination=/certs-metrics-proxy \
+	  gcr.io/etcd-development/etcd-static-ip-test:go$(GO_VERSION) \
+	  /bin/bash -c "cd /etcd && /certs-metrics-proxy/run.sh && rm -rf m*.etcd"
+
+
+
+# Example:
+#   make build-docker-test
+#   make compile-with-docker-test
+#   make build-docker-dns-test
+#
+#   gcloud auth configure-docker
+#   make push-docker-dns-test
+#
+#   gsutil -m acl ch -u allUsers:R -r gs://artifacts.etcd-development.appspot.com
+#   make pull-docker-dns-test
+#
+#   make docker-dns-test-insecure-run
+#   make docker-dns-test-certs-run
+#   make docker-dns-test-certs-gateway-run
+#   make docker-dns-test-certs-wildcard-run
+#   make docker-dns-test-certs-common-name-auth-run
+#   make docker-dns-test-certs-common-name-multi-run
+#   make docker-dns-test-certs-san-dns-run
+
+build-docker-dns-test:
+	$(info GO_VERSION: $(GO_VERSION))
+	@sed 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' ./docker-dns/Dockerfile > $(TMP_DOCKERFILE)
+	docker build \
+	  --network=host \
+	  --tag gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \
+	  --file ./docker-dns/Dockerfile \
+	  $(TMP_DOCKERFILE)
+
+	docker run \
+	  --rm \
+	  --dns 127.0.0.1 \
+	  gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \
+	  /bin/bash -c "/etc/init.d/bind9 start && cat /dev/null >/etc/hosts && dig etcd.local"
+
+push-docker-dns-test:
+	$(info GO_VERSION: $(GO_VERSION))
+	docker push gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION)
+
+pull-docker-dns-test:
+	$(info GO_VERSION: $(GO_VERSION))
+	docker pull gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION)
+
+docker-dns-test-insecure-run:
+	$(info GO_VERSION: $(GO_VERSION))
+	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
+	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
+	docker run \
+	  --rm \
+	  --tty \
+	  --dns 127.0.0.1 \
+	  $(TMP_DIR_MOUNT_FLAG) \
+	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
+	  --mount type=bind,source=`pwd`/tests/docker-dns/insecure,destination=/insecure \
+	  gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \
+	  /bin/bash -c "cd /etcd && /insecure/run.sh && rm -rf m*.etcd"
+
+docker-dns-test-certs-run:
+	$(info GO_VERSION: $(GO_VERSION))
+	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
+	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
+	docker run \
+	  --rm \
+	  --tty \
+	  --dns 127.0.0.1 \
+	  $(TMP_DIR_MOUNT_FLAG) \
+	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
+	  --mount type=bind,source=`pwd`/tests/docker-dns/certs,destination=/certs \
+	  gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \
+	  /bin/bash -c "cd /etcd && /certs/run.sh && rm -rf m*.etcd"
+
+docker-dns-test-certs-gateway-run:
+	$(info GO_VERSION: $(GO_VERSION))
+	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
+	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
+	docker run \
+	  --rm \
+	  --tty \
+	  --dns 127.0.0.1 \
+	  $(TMP_DIR_MOUNT_FLAG) \
+	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
+	  --mount type=bind,source=`pwd`/tests/docker-dns/certs-gateway,destination=/certs-gateway \
+	  gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \
+	  /bin/bash -c "cd /etcd && /certs-gateway/run.sh && rm -rf m*.etcd"
+
+docker-dns-test-certs-wildcard-run:
+	$(info GO_VERSION: $(GO_VERSION))
+	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
+	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
+	docker run \
+	  --rm \
+	  --tty \
+	  --dns 127.0.0.1 \
+	  $(TMP_DIR_MOUNT_FLAG) \
+	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
+	  --mount type=bind,source=`pwd`/tests/docker-dns/certs-wildcard,destination=/certs-wildcard \
+	  gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \
+	  /bin/bash -c "cd /etcd && /certs-wildcard/run.sh && rm -rf m*.etcd"
+
+docker-dns-test-certs-common-name-auth-run:
+	$(info GO_VERSION: $(GO_VERSION))
+	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
+	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
+	docker run \
+	  --rm \
+	  --tty \
+	  --dns 127.0.0.1 \
+	  $(TMP_DIR_MOUNT_FLAG) \
+	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
+	  --mount type=bind,source=`pwd`/tests/docker-dns/certs-common-name-auth,destination=/certs-common-name-auth \
+	  gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \
+	  /bin/bash -c "cd /etcd && /certs-common-name-auth/run.sh && rm -rf m*.etcd"
+
+docker-dns-test-certs-common-name-multi-run:
+	$(info GO_VERSION: $(GO_VERSION))
+	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
+	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
+	docker run \
+	  --rm \
+	  --tty \
+	  --dns 127.0.0.1 \
+	  $(TMP_DIR_MOUNT_FLAG) \
+	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
+	  --mount type=bind,source=`pwd`/tests/docker-dns/certs-common-name-multi,destination=/certs-common-name-multi \
+	  gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \
+	  /bin/bash -c "cd /etcd && /certs-common-name-multi/run.sh && rm -rf m*.etcd"
+
+docker-dns-test-certs-san-dns-run:
+	$(info GO_VERSION: $(GO_VERSION))
+	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
+	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
+	docker run \
+	  --rm \
+	  --tty \
+	  --dns 127.0.0.1 \
+	  $(TMP_DIR_MOUNT_FLAG) \
+	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
+	  --mount type=bind,source=`pwd`/tests/docker-dns/certs-san-dns,destination=/certs-san-dns \
+	  gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \
+	  /bin/bash -c "cd /etcd && /certs-san-dns/run.sh && rm -rf m*.etcd"
+
+
+# Example:
+#   make build-docker-test
+#   make compile-with-docker-test
+#   make build-docker-dns-srv-test
+#   gcloud auth configure-docker
+#   make push-docker-dns-srv-test
+#   gsutil -m acl ch -u allUsers:R -r gs://artifacts.etcd-development.appspot.com
+#   make pull-docker-dns-srv-test
+#   make docker-dns-srv-test-certs-run
+#   make docker-dns-srv-test-certs-gateway-run
+#   make docker-dns-srv-test-certs-wildcard-run
+
+build-docker-dns-srv-test:
+	$(info GO_VERSION: $(GO_VERSION))
+	@sed 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' > $(TMP_DOCKERFILE)
+	docker build \
+	  --network=host \
+	  --tag gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION) \
+	  --file ./docker-dns-srv/Dockerfile \
+	  $(TMP_DOCKERFILE)
+
+	docker run \
+	  --rm \
+	  --dns 127.0.0.1 \
+	  gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION) \
+	  /bin/bash -c "/etc/init.d/bind9 start && cat /dev/null >/etc/hosts && dig +noall +answer SRV _etcd-client-ssl._tcp.etcd.local && dig +noall +answer SRV _etcd-server-ssl._tcp.etcd.local && dig +noall +answer m1.etcd.local m2.etcd.local m3.etcd.local"
+
+push-docker-dns-srv-test:
+	$(info GO_VERSION: $(GO_VERSION))
+	docker push gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION)
+
+pull-docker-dns-srv-test:
+	$(info GO_VERSION: $(GO_VERSION))
+	docker pull gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION)
+
+docker-dns-srv-test-certs-run:
+	$(info GO_VERSION: $(GO_VERSION))
+	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
+	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
+	docker run \
+	  --rm \
+	  --tty \
+	  --dns 127.0.0.1 \
+	  $(TMP_DIR_MOUNT_FLAG) \
+	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
+	  --mount type=bind,source=`pwd`/tests/docker-dns-srv/certs,destination=/certs \
+	  gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION) \
+	  /bin/bash -c "cd /etcd && /certs/run.sh && rm -rf m*.etcd"
+
+docker-dns-srv-test-certs-gateway-run:
+	$(info GO_VERSION: $(GO_VERSION))
+	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
+	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
+	docker run \
+	  --rm \
+	  --tty \
+	  --dns 127.0.0.1 \
+	  $(TMP_DIR_MOUNT_FLAG) \
+	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
+	  --mount type=bind,source=`pwd`/tests/docker-dns-srv/certs-gateway,destination=/certs-gateway \
+	  gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION) \
+	  /bin/bash -c "cd /etcd && /certs-gateway/run.sh && rm -rf m*.etcd"
+
+docker-dns-srv-test-certs-wildcard-run:
+	$(info GO_VERSION: $(GO_VERSION))
+	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
+	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
+	docker run \
+	  --rm \
+	  --tty \
+	  --dns 127.0.0.1 \
+	  $(TMP_DIR_MOUNT_FLAG) \
+	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
+	  --mount type=bind,source=`pwd`/tests/docker-dns-srv/certs-wildcard,destination=/certs-wildcard \
+	  gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION) \
+	  /bin/bash -c "cd /etcd && /certs-wildcard/run.sh && rm -rf m*.etcd"
diff --git a/tests/docker-dns-srv/Dockerfile b/tests/manual/docker-dns-srv/Dockerfile
similarity index 100%
rename from tests/docker-dns-srv/Dockerfile
rename to tests/manual/docker-dns-srv/Dockerfile
diff --git a/tests/docker-dns-srv/certs-gateway/Procfile b/tests/manual/docker-dns-srv/certs-gateway/Procfile
similarity index 100%
rename from tests/docker-dns-srv/certs-gateway/Procfile
rename to tests/manual/docker-dns-srv/certs-gateway/Procfile
diff --git a/tests/docker-dns-srv/certs-gateway/ca-csr.json b/tests/manual/docker-dns-srv/certs-gateway/ca-csr.json
similarity index 100%
rename from tests/docker-dns-srv/certs-gateway/ca-csr.json
rename to tests/manual/docker-dns-srv/certs-gateway/ca-csr.json
diff --git a/tests/docker-dns-srv/certs-gateway/ca.crt b/tests/manual/docker-dns-srv/certs-gateway/ca.crt
similarity index 100%
rename from tests/docker-dns-srv/certs-gateway/ca.crt
rename to tests/manual/docker-dns-srv/certs-gateway/ca.crt
diff --git a/tests/docker-dns-srv/certs-gateway/gencert.json b/tests/manual/docker-dns-srv/certs-gateway/gencert.json
similarity index 100%
rename from tests/docker-dns-srv/certs-gateway/gencert.json
rename to tests/manual/docker-dns-srv/certs-gateway/gencert.json
diff --git a/tests/docker-dns-srv/certs-gateway/gencerts.sh b/tests/manual/docker-dns-srv/certs-gateway/gencerts.sh
similarity index 100%
rename from tests/docker-dns-srv/certs-gateway/gencerts.sh
rename to tests/manual/docker-dns-srv/certs-gateway/gencerts.sh
diff --git a/tests/docker-dns-srv/certs-gateway/run.sh b/tests/manual/docker-dns-srv/certs-gateway/run.sh
similarity index 100%
rename from tests/docker-dns-srv/certs-gateway/run.sh
rename to tests/manual/docker-dns-srv/certs-gateway/run.sh
diff --git a/tests/docker-dns-srv/certs-gateway/server-ca-csr.json b/tests/manual/docker-dns-srv/certs-gateway/server-ca-csr.json
similarity index 100%
rename from tests/docker-dns-srv/certs-gateway/server-ca-csr.json
rename to tests/manual/docker-dns-srv/certs-gateway/server-ca-csr.json
diff --git a/tests/docker-dns-srv/certs-gateway/server.crt b/tests/manual/docker-dns-srv/certs-gateway/server.crt
similarity index 100%
rename from tests/docker-dns-srv/certs-gateway/server.crt
rename to tests/manual/docker-dns-srv/certs-gateway/server.crt
diff --git a/tests/docker-dns-srv/certs-gateway/server.key.insecure b/tests/manual/docker-dns-srv/certs-gateway/server.key.insecure
similarity index 100%
rename from tests/docker-dns-srv/certs-gateway/server.key.insecure
rename to tests/manual/docker-dns-srv/certs-gateway/server.key.insecure
diff --git a/tests/docker-dns-srv/certs-wildcard/Procfile b/tests/manual/docker-dns-srv/certs-wildcard/Procfile
similarity index 100%
rename from tests/docker-dns-srv/certs-wildcard/Procfile
rename to tests/manual/docker-dns-srv/certs-wildcard/Procfile
diff --git a/tests/docker-dns-srv/certs-wildcard/ca-csr.json b/tests/manual/docker-dns-srv/certs-wildcard/ca-csr.json
similarity index 100%
rename from tests/docker-dns-srv/certs-wildcard/ca-csr.json
rename to tests/manual/docker-dns-srv/certs-wildcard/ca-csr.json
diff --git a/tests/docker-dns-srv/certs-wildcard/ca.crt b/tests/manual/docker-dns-srv/certs-wildcard/ca.crt
similarity index 100%
rename from tests/docker-dns-srv/certs-wildcard/ca.crt
rename to tests/manual/docker-dns-srv/certs-wildcard/ca.crt
diff --git a/tests/docker-dns-srv/certs-wildcard/gencert.json b/tests/manual/docker-dns-srv/certs-wildcard/gencert.json
similarity index 100%
rename from tests/docker-dns-srv/certs-wildcard/gencert.json
rename to tests/manual/docker-dns-srv/certs-wildcard/gencert.json
diff --git a/tests/docker-dns-srv/certs-wildcard/gencerts.sh b/tests/manual/docker-dns-srv/certs-wildcard/gencerts.sh
similarity index 100%
rename from tests/docker-dns-srv/certs-wildcard/gencerts.sh
rename to tests/manual/docker-dns-srv/certs-wildcard/gencerts.sh
diff --git a/tests/docker-dns-srv/certs-wildcard/run.sh b/tests/manual/docker-dns-srv/certs-wildcard/run.sh
similarity index 100%
rename from tests/docker-dns-srv/certs-wildcard/run.sh
rename to tests/manual/docker-dns-srv/certs-wildcard/run.sh
diff --git a/tests/docker-dns-srv/certs-wildcard/server-ca-csr.json b/tests/manual/docker-dns-srv/certs-wildcard/server-ca-csr.json
similarity index 100%
rename from tests/docker-dns-srv/certs-wildcard/server-ca-csr.json
rename to tests/manual/docker-dns-srv/certs-wildcard/server-ca-csr.json
diff --git a/tests/docker-dns-srv/certs-wildcard/server.crt b/tests/manual/docker-dns-srv/certs-wildcard/server.crt
similarity index 100%
rename from tests/docker-dns-srv/certs-wildcard/server.crt
rename to tests/manual/docker-dns-srv/certs-wildcard/server.crt
diff --git a/tests/docker-dns-srv/certs-wildcard/server.key.insecure b/tests/manual/docker-dns-srv/certs-wildcard/server.key.insecure
similarity index 100%
rename from tests/docker-dns-srv/certs-wildcard/server.key.insecure
rename to tests/manual/docker-dns-srv/certs-wildcard/server.key.insecure
diff --git a/tests/docker-dns-srv/certs/Procfile b/tests/manual/docker-dns-srv/certs/Procfile
similarity index 100%
rename from tests/docker-dns-srv/certs/Procfile
rename to tests/manual/docker-dns-srv/certs/Procfile
diff --git a/tests/docker-dns-srv/certs/ca-csr.json b/tests/manual/docker-dns-srv/certs/ca-csr.json
similarity index 100%
rename from tests/docker-dns-srv/certs/ca-csr.json
rename to tests/manual/docker-dns-srv/certs/ca-csr.json
diff --git a/tests/docker-dns-srv/certs/ca.crt b/tests/manual/docker-dns-srv/certs/ca.crt
similarity index 100%
rename from tests/docker-dns-srv/certs/ca.crt
rename to tests/manual/docker-dns-srv/certs/ca.crt
diff --git a/tests/docker-dns-srv/certs/gencert.json b/tests/manual/docker-dns-srv/certs/gencert.json
similarity index 100%
rename from tests/docker-dns-srv/certs/gencert.json
rename to tests/manual/docker-dns-srv/certs/gencert.json
diff --git a/tests/docker-dns-srv/certs/gencerts.sh b/tests/manual/docker-dns-srv/certs/gencerts.sh
similarity index 100%
rename from tests/docker-dns-srv/certs/gencerts.sh
rename to tests/manual/docker-dns-srv/certs/gencerts.sh
diff --git a/tests/docker-dns-srv/certs/run.sh b/tests/manual/docker-dns-srv/certs/run.sh
similarity index 100%
rename from tests/docker-dns-srv/certs/run.sh
rename to tests/manual/docker-dns-srv/certs/run.sh
diff --git a/tests/docker-dns-srv/certs/server-ca-csr.json b/tests/manual/docker-dns-srv/certs/server-ca-csr.json
similarity index 100%
rename from tests/docker-dns-srv/certs/server-ca-csr.json
rename to tests/manual/docker-dns-srv/certs/server-ca-csr.json
diff --git a/tests/docker-dns-srv/certs/server.crt b/tests/manual/docker-dns-srv/certs/server.crt
similarity index 100%
rename from tests/docker-dns-srv/certs/server.crt
rename to tests/manual/docker-dns-srv/certs/server.crt
diff --git a/tests/docker-dns-srv/certs/server.key.insecure b/tests/manual/docker-dns-srv/certs/server.key.insecure
similarity index 100%
rename from tests/docker-dns-srv/certs/server.key.insecure
rename to tests/manual/docker-dns-srv/certs/server.key.insecure
diff --git a/tests/docker-dns-srv/etcd.zone b/tests/manual/docker-dns-srv/etcd.zone
similarity index 100%
rename from tests/docker-dns-srv/etcd.zone
rename to tests/manual/docker-dns-srv/etcd.zone
diff --git a/tests/docker-dns-srv/named.conf b/tests/manual/docker-dns-srv/named.conf
similarity index 100%
rename from tests/docker-dns-srv/named.conf
rename to tests/manual/docker-dns-srv/named.conf
diff --git a/tests/docker-dns-srv/rdns.zone b/tests/manual/docker-dns-srv/rdns.zone
similarity index 100%
rename from tests/docker-dns-srv/rdns.zone
rename to tests/manual/docker-dns-srv/rdns.zone
diff --git a/tests/docker-dns-srv/resolv.conf b/tests/manual/docker-dns-srv/resolv.conf
similarity index 100%
rename from tests/docker-dns-srv/resolv.conf
rename to tests/manual/docker-dns-srv/resolv.conf
diff --git a/tests/docker-dns/Dockerfile b/tests/manual/docker-dns/Dockerfile
similarity index 100%
rename from tests/docker-dns/Dockerfile
rename to tests/manual/docker-dns/Dockerfile
diff --git a/tests/docker-dns/certs-common-name-auth/Procfile b/tests/manual/docker-dns/certs-common-name-auth/Procfile
similarity index 100%
rename from tests/docker-dns/certs-common-name-auth/Procfile
rename to tests/manual/docker-dns/certs-common-name-auth/Procfile
diff --git a/tests/docker-dns/certs-common-name-auth/ca-csr.json b/tests/manual/docker-dns/certs-common-name-auth/ca-csr.json
similarity index 100%
rename from tests/docker-dns/certs-common-name-auth/ca-csr.json
rename to tests/manual/docker-dns/certs-common-name-auth/ca-csr.json
diff --git a/tests/docker-dns/certs-common-name-auth/ca.crt b/tests/manual/docker-dns/certs-common-name-auth/ca.crt
similarity index 100%
rename from tests/docker-dns/certs-common-name-auth/ca.crt
rename to tests/manual/docker-dns/certs-common-name-auth/ca.crt
diff --git a/tests/docker-dns/certs-common-name-auth/gencert.json b/tests/manual/docker-dns/certs-common-name-auth/gencert.json
similarity index 100%
rename from tests/docker-dns/certs-common-name-auth/gencert.json
rename to tests/manual/docker-dns/certs-common-name-auth/gencert.json
diff --git a/tests/docker-dns/certs-common-name-auth/gencerts.sh b/tests/manual/docker-dns/certs-common-name-auth/gencerts.sh
similarity index 100%
rename from tests/docker-dns/certs-common-name-auth/gencerts.sh
rename to tests/manual/docker-dns/certs-common-name-auth/gencerts.sh
diff --git a/tests/docker-dns/certs-common-name-auth/run.sh b/tests/manual/docker-dns/certs-common-name-auth/run.sh
similarity index 100%
rename from tests/docker-dns/certs-common-name-auth/run.sh
rename to tests/manual/docker-dns/certs-common-name-auth/run.sh
diff --git a/tests/docker-dns/certs-common-name-auth/server-ca-csr.json b/tests/manual/docker-dns/certs-common-name-auth/server-ca-csr.json
similarity index 100%
rename from tests/docker-dns/certs-common-name-auth/server-ca-csr.json
rename to tests/manual/docker-dns/certs-common-name-auth/server-ca-csr.json
diff --git a/tests/docker-dns/certs-common-name-auth/server.crt b/tests/manual/docker-dns/certs-common-name-auth/server.crt
similarity index 100%
rename from tests/docker-dns/certs-common-name-auth/server.crt
rename to tests/manual/docker-dns/certs-common-name-auth/server.crt
diff --git a/tests/docker-dns/certs-common-name-auth/server.key.insecure b/tests/manual/docker-dns/certs-common-name-auth/server.key.insecure
similarity index 100%
rename from tests/docker-dns/certs-common-name-auth/server.key.insecure
rename to tests/manual/docker-dns/certs-common-name-auth/server.key.insecure
diff --git a/tests/docker-dns/certs-common-name-multi/Procfile b/tests/manual/docker-dns/certs-common-name-multi/Procfile
similarity index 100%
rename from tests/docker-dns/certs-common-name-multi/Procfile
rename to tests/manual/docker-dns/certs-common-name-multi/Procfile
diff --git a/tests/docker-dns/certs-common-name-multi/ca-csr.json b/tests/manual/docker-dns/certs-common-name-multi/ca-csr.json
similarity index 100%
rename from tests/docker-dns/certs-common-name-multi/ca-csr.json
rename to tests/manual/docker-dns/certs-common-name-multi/ca-csr.json
diff --git a/tests/docker-dns/certs-common-name-multi/ca.crt b/tests/manual/docker-dns/certs-common-name-multi/ca.crt
similarity index 100%
rename from tests/docker-dns/certs-common-name-multi/ca.crt
rename to tests/manual/docker-dns/certs-common-name-multi/ca.crt
diff --git a/tests/docker-dns/certs-common-name-multi/gencert.json b/tests/manual/docker-dns/certs-common-name-multi/gencert.json
similarity index 100%
rename from tests/docker-dns/certs-common-name-multi/gencert.json
rename to tests/manual/docker-dns/certs-common-name-multi/gencert.json
diff --git a/tests/docker-dns/certs-common-name-multi/gencerts.sh b/tests/manual/docker-dns/certs-common-name-multi/gencerts.sh
similarity index 100%
rename from tests/docker-dns/certs-common-name-multi/gencerts.sh
rename to tests/manual/docker-dns/certs-common-name-multi/gencerts.sh
diff --git a/tests/docker-dns/certs-common-name-multi/run.sh b/tests/manual/docker-dns/certs-common-name-multi/run.sh
similarity index 100%
rename from tests/docker-dns/certs-common-name-multi/run.sh
rename to tests/manual/docker-dns/certs-common-name-multi/run.sh
diff --git a/tests/docker-dns/certs-common-name-multi/server-1.crt b/tests/manual/docker-dns/certs-common-name-multi/server-1.crt
similarity index 100%
rename from tests/docker-dns/certs-common-name-multi/server-1.crt
rename to tests/manual/docker-dns/certs-common-name-multi/server-1.crt
diff --git a/tests/docker-dns/certs-common-name-multi/server-1.key.insecure b/tests/manual/docker-dns/certs-common-name-multi/server-1.key.insecure
similarity index 100%
rename from tests/docker-dns/certs-common-name-multi/server-1.key.insecure
rename to tests/manual/docker-dns/certs-common-name-multi/server-1.key.insecure
diff --git a/tests/docker-dns/certs-common-name-multi/server-2.crt b/tests/manual/docker-dns/certs-common-name-multi/server-2.crt
similarity index 100%
rename from tests/docker-dns/certs-common-name-multi/server-2.crt
rename to tests/manual/docker-dns/certs-common-name-multi/server-2.crt
diff --git a/tests/docker-dns/certs-common-name-multi/server-2.key.insecure b/tests/manual/docker-dns/certs-common-name-multi/server-2.key.insecure
similarity index 100%
rename from tests/docker-dns/certs-common-name-multi/server-2.key.insecure
rename to tests/manual/docker-dns/certs-common-name-multi/server-2.key.insecure
diff --git a/tests/docker-dns/certs-common-name-multi/server-3.crt b/tests/manual/docker-dns/certs-common-name-multi/server-3.crt
similarity index 100%
rename from tests/docker-dns/certs-common-name-multi/server-3.crt
rename to tests/manual/docker-dns/certs-common-name-multi/server-3.crt
diff --git a/tests/docker-dns/certs-common-name-multi/server-3.key.insecure b/tests/manual/docker-dns/certs-common-name-multi/server-3.key.insecure
similarity index 100%
rename from tests/docker-dns/certs-common-name-multi/server-3.key.insecure
rename to tests/manual/docker-dns/certs-common-name-multi/server-3.key.insecure
diff --git a/tests/docker-dns/certs-common-name-multi/server-ca-csr-1.json b/tests/manual/docker-dns/certs-common-name-multi/server-ca-csr-1.json
similarity index 100%
rename from tests/docker-dns/certs-common-name-multi/server-ca-csr-1.json
rename to tests/manual/docker-dns/certs-common-name-multi/server-ca-csr-1.json
diff --git a/tests/docker-dns/certs-common-name-multi/server-ca-csr-2.json b/tests/manual/docker-dns/certs-common-name-multi/server-ca-csr-2.json
similarity index 100%
rename from tests/docker-dns/certs-common-name-multi/server-ca-csr-2.json
rename to tests/manual/docker-dns/certs-common-name-multi/server-ca-csr-2.json
diff --git a/tests/docker-dns/certs-common-name-multi/server-ca-csr-3.json b/tests/manual/docker-dns/certs-common-name-multi/server-ca-csr-3.json
similarity index 100%
rename from tests/docker-dns/certs-common-name-multi/server-ca-csr-3.json
rename to tests/manual/docker-dns/certs-common-name-multi/server-ca-csr-3.json
diff --git a/tests/docker-dns/certs-gateway/Procfile b/tests/manual/docker-dns/certs-gateway/Procfile
similarity index 100%
rename from tests/docker-dns/certs-gateway/Procfile
rename to tests/manual/docker-dns/certs-gateway/Procfile
diff --git a/tests/docker-dns/certs-gateway/ca-csr.json b/tests/manual/docker-dns/certs-gateway/ca-csr.json
similarity index 100%
rename from tests/docker-dns/certs-gateway/ca-csr.json
rename to tests/manual/docker-dns/certs-gateway/ca-csr.json
diff --git a/tests/docker-dns/certs-gateway/ca.crt b/tests/manual/docker-dns/certs-gateway/ca.crt
similarity index 100%
rename from tests/docker-dns/certs-gateway/ca.crt
rename to tests/manual/docker-dns/certs-gateway/ca.crt
diff --git a/tests/docker-dns/certs-gateway/gencert.json b/tests/manual/docker-dns/certs-gateway/gencert.json
similarity index 100%
rename from tests/docker-dns/certs-gateway/gencert.json
rename to tests/manual/docker-dns/certs-gateway/gencert.json
diff --git a/tests/docker-dns/certs-gateway/gencerts.sh b/tests/manual/docker-dns/certs-gateway/gencerts.sh
similarity index 100%
rename from tests/docker-dns/certs-gateway/gencerts.sh
rename to tests/manual/docker-dns/certs-gateway/gencerts.sh
diff --git a/tests/docker-dns/certs-gateway/run.sh b/tests/manual/docker-dns/certs-gateway/run.sh
similarity index 100%
rename from tests/docker-dns/certs-gateway/run.sh
rename to tests/manual/docker-dns/certs-gateway/run.sh
diff --git a/tests/docker-dns/certs-gateway/server-ca-csr.json b/tests/manual/docker-dns/certs-gateway/server-ca-csr.json
similarity index 100%
rename from tests/docker-dns/certs-gateway/server-ca-csr.json
rename to tests/manual/docker-dns/certs-gateway/server-ca-csr.json
diff --git a/tests/docker-dns/certs-gateway/server.crt b/tests/manual/docker-dns/certs-gateway/server.crt
similarity index 100%
rename from tests/docker-dns/certs-gateway/server.crt
rename to tests/manual/docker-dns/certs-gateway/server.crt
diff --git a/tests/docker-dns/certs-gateway/server.key.insecure b/tests/manual/docker-dns/certs-gateway/server.key.insecure
similarity index 100%
rename from tests/docker-dns/certs-gateway/server.key.insecure
rename to tests/manual/docker-dns/certs-gateway/server.key.insecure
diff --git a/tests/docker-dns/certs-san-dns/Procfile b/tests/manual/docker-dns/certs-san-dns/Procfile
similarity index 100%
rename from tests/docker-dns/certs-san-dns/Procfile
rename to tests/manual/docker-dns/certs-san-dns/Procfile
diff --git a/tests/docker-dns/certs-san-dns/ca-csr.json b/tests/manual/docker-dns/certs-san-dns/ca-csr.json
similarity index 100%
rename from tests/docker-dns/certs-san-dns/ca-csr.json
rename to tests/manual/docker-dns/certs-san-dns/ca-csr.json
diff --git a/tests/docker-dns/certs-san-dns/ca.crt b/tests/manual/docker-dns/certs-san-dns/ca.crt
similarity index 100%
rename from tests/docker-dns/certs-san-dns/ca.crt
rename to tests/manual/docker-dns/certs-san-dns/ca.crt
diff --git a/tests/docker-dns/certs-san-dns/gencert.json b/tests/manual/docker-dns/certs-san-dns/gencert.json
similarity index 100%
rename from tests/docker-dns/certs-san-dns/gencert.json
rename to tests/manual/docker-dns/certs-san-dns/gencert.json
diff --git a/tests/docker-dns/certs-san-dns/gencerts.sh b/tests/manual/docker-dns/certs-san-dns/gencerts.sh
similarity index 100%
rename from tests/docker-dns/certs-san-dns/gencerts.sh
rename to tests/manual/docker-dns/certs-san-dns/gencerts.sh
diff --git a/tests/docker-dns/certs-san-dns/run.sh b/tests/manual/docker-dns/certs-san-dns/run.sh
similarity index 100%
rename from tests/docker-dns/certs-san-dns/run.sh
rename to tests/manual/docker-dns/certs-san-dns/run.sh
diff --git a/tests/docker-dns/certs-san-dns/server-1.crt b/tests/manual/docker-dns/certs-san-dns/server-1.crt
similarity index 100%
rename from tests/docker-dns/certs-san-dns/server-1.crt
rename to tests/manual/docker-dns/certs-san-dns/server-1.crt
diff --git a/tests/docker-dns/certs-san-dns/server-1.key.insecure b/tests/manual/docker-dns/certs-san-dns/server-1.key.insecure
similarity index 100%
rename from tests/docker-dns/certs-san-dns/server-1.key.insecure
rename to tests/manual/docker-dns/certs-san-dns/server-1.key.insecure
diff --git a/tests/docker-dns/certs-san-dns/server-2.crt b/tests/manual/docker-dns/certs-san-dns/server-2.crt
similarity index 100%
rename from tests/docker-dns/certs-san-dns/server-2.crt
rename to tests/manual/docker-dns/certs-san-dns/server-2.crt
diff --git a/tests/docker-dns/certs-san-dns/server-2.key.insecure b/tests/manual/docker-dns/certs-san-dns/server-2.key.insecure
similarity index 100%
rename from tests/docker-dns/certs-san-dns/server-2.key.insecure
rename to tests/manual/docker-dns/certs-san-dns/server-2.key.insecure
diff --git a/tests/docker-dns/certs-san-dns/server-3.crt b/tests/manual/docker-dns/certs-san-dns/server-3.crt
similarity index 100%
rename from tests/docker-dns/certs-san-dns/server-3.crt
rename to tests/manual/docker-dns/certs-san-dns/server-3.crt
diff --git a/tests/docker-dns/certs-san-dns/server-3.key.insecure b/tests/manual/docker-dns/certs-san-dns/server-3.key.insecure
similarity index 100%
rename from tests/docker-dns/certs-san-dns/server-3.key.insecure
rename to tests/manual/docker-dns/certs-san-dns/server-3.key.insecure
diff --git a/tests/docker-dns/certs-san-dns/server-ca-csr-1.json b/tests/manual/docker-dns/certs-san-dns/server-ca-csr-1.json
similarity index 100%
rename from tests/docker-dns/certs-san-dns/server-ca-csr-1.json
rename to tests/manual/docker-dns/certs-san-dns/server-ca-csr-1.json
diff --git a/tests/docker-dns/certs-san-dns/server-ca-csr-2.json b/tests/manual/docker-dns/certs-san-dns/server-ca-csr-2.json
similarity index 100%
rename from tests/docker-dns/certs-san-dns/server-ca-csr-2.json
rename to tests/manual/docker-dns/certs-san-dns/server-ca-csr-2.json
diff --git a/tests/docker-dns/certs-san-dns/server-ca-csr-3.json b/tests/manual/docker-dns/certs-san-dns/server-ca-csr-3.json
similarity index 100%
rename from tests/docker-dns/certs-san-dns/server-ca-csr-3.json
rename to tests/manual/docker-dns/certs-san-dns/server-ca-csr-3.json
diff --git a/tests/docker-dns/certs-wildcard/Procfile b/tests/manual/docker-dns/certs-wildcard/Procfile
similarity index 100%
rename from tests/docker-dns/certs-wildcard/Procfile
rename to tests/manual/docker-dns/certs-wildcard/Procfile
diff --git a/tests/docker-dns/certs-wildcard/ca-csr.json b/tests/manual/docker-dns/certs-wildcard/ca-csr.json
similarity index 100%
rename from tests/docker-dns/certs-wildcard/ca-csr.json
rename to tests/manual/docker-dns/certs-wildcard/ca-csr.json
diff --git a/tests/docker-dns/certs-wildcard/ca.crt b/tests/manual/docker-dns/certs-wildcard/ca.crt
similarity index 100%
rename from tests/docker-dns/certs-wildcard/ca.crt
rename to tests/manual/docker-dns/certs-wildcard/ca.crt
diff --git a/tests/docker-dns/certs-wildcard/gencert.json b/tests/manual/docker-dns/certs-wildcard/gencert.json
similarity index 100%
rename from tests/docker-dns/certs-wildcard/gencert.json
rename to tests/manual/docker-dns/certs-wildcard/gencert.json
diff --git a/tests/docker-dns/certs-wildcard/gencerts.sh b/tests/manual/docker-dns/certs-wildcard/gencerts.sh
similarity index 100%
rename from tests/docker-dns/certs-wildcard/gencerts.sh
rename to tests/manual/docker-dns/certs-wildcard/gencerts.sh
diff --git a/tests/docker-dns/certs-wildcard/run.sh b/tests/manual/docker-dns/certs-wildcard/run.sh
similarity index 100%
rename from tests/docker-dns/certs-wildcard/run.sh
rename to tests/manual/docker-dns/certs-wildcard/run.sh
diff --git a/tests/docker-dns/certs-wildcard/server-ca-csr.json b/tests/manual/docker-dns/certs-wildcard/server-ca-csr.json
similarity index 100%
rename from tests/docker-dns/certs-wildcard/server-ca-csr.json
rename to tests/manual/docker-dns/certs-wildcard/server-ca-csr.json
diff --git a/tests/docker-dns/certs-wildcard/server.crt b/tests/manual/docker-dns/certs-wildcard/server.crt
similarity index 100%
rename from tests/docker-dns/certs-wildcard/server.crt
rename to tests/manual/docker-dns/certs-wildcard/server.crt
diff --git a/tests/docker-dns/certs-wildcard/server.key.insecure b/tests/manual/docker-dns/certs-wildcard/server.key.insecure
similarity index 100%
rename from tests/docker-dns/certs-wildcard/server.key.insecure
rename to tests/manual/docker-dns/certs-wildcard/server.key.insecure
diff --git a/tests/docker-dns/certs/Procfile b/tests/manual/docker-dns/certs/Procfile
similarity index 100%
rename from tests/docker-dns/certs/Procfile
rename to tests/manual/docker-dns/certs/Procfile
diff --git a/tests/docker-dns/certs/ca-csr.json b/tests/manual/docker-dns/certs/ca-csr.json
similarity index 100%
rename from tests/docker-dns/certs/ca-csr.json
rename to tests/manual/docker-dns/certs/ca-csr.json
diff --git a/tests/docker-dns/certs/ca.crt b/tests/manual/docker-dns/certs/ca.crt
similarity index 100%
rename from tests/docker-dns/certs/ca.crt
rename to tests/manual/docker-dns/certs/ca.crt
diff --git a/tests/docker-dns/certs/gencert.json b/tests/manual/docker-dns/certs/gencert.json
similarity index 100%
rename from tests/docker-dns/certs/gencert.json
rename to tests/manual/docker-dns/certs/gencert.json
diff --git a/tests/docker-dns/certs/gencerts.sh b/tests/manual/docker-dns/certs/gencerts.sh
similarity index 100%
rename from tests/docker-dns/certs/gencerts.sh
rename to tests/manual/docker-dns/certs/gencerts.sh
diff --git a/tests/docker-dns/certs/run.sh b/tests/manual/docker-dns/certs/run.sh
similarity index 100%
rename from tests/docker-dns/certs/run.sh
rename to tests/manual/docker-dns/certs/run.sh
diff --git a/tests/docker-dns/certs/server-ca-csr.json b/tests/manual/docker-dns/certs/server-ca-csr.json
similarity index 100%
rename from tests/docker-dns/certs/server-ca-csr.json
rename to tests/manual/docker-dns/certs/server-ca-csr.json
diff --git a/tests/docker-dns/certs/server.crt b/tests/manual/docker-dns/certs/server.crt
similarity index 100%
rename from tests/docker-dns/certs/server.crt
rename to tests/manual/docker-dns/certs/server.crt
diff --git a/tests/docker-dns/certs/server.key.insecure b/tests/manual/docker-dns/certs/server.key.insecure
similarity index 100%
rename from tests/docker-dns/certs/server.key.insecure
rename to tests/manual/docker-dns/certs/server.key.insecure
diff --git a/tests/docker-dns/etcd.zone b/tests/manual/docker-dns/etcd.zone
similarity index 100%
rename from tests/docker-dns/etcd.zone
rename to tests/manual/docker-dns/etcd.zone
diff --git a/tests/docker-dns/insecure/Procfile b/tests/manual/docker-dns/insecure/Procfile
similarity index 100%
rename from tests/docker-dns/insecure/Procfile
rename to tests/manual/docker-dns/insecure/Procfile
diff --git a/tests/docker-dns/insecure/run.sh b/tests/manual/docker-dns/insecure/run.sh
similarity index 100%
rename from tests/docker-dns/insecure/run.sh
rename to tests/manual/docker-dns/insecure/run.sh
diff --git a/tests/docker-dns/named.conf b/tests/manual/docker-dns/named.conf
similarity index 100%
rename from tests/docker-dns/named.conf
rename to tests/manual/docker-dns/named.conf
diff --git a/tests/docker-dns/rdns.zone b/tests/manual/docker-dns/rdns.zone
similarity index 100%
rename from tests/docker-dns/rdns.zone
rename to tests/manual/docker-dns/rdns.zone
diff --git a/tests/docker-dns/resolv.conf b/tests/manual/docker-dns/resolv.conf
similarity index 100%
rename from tests/docker-dns/resolv.conf
rename to tests/manual/docker-dns/resolv.conf
diff --git a/tests/docker-static-ip/Dockerfile b/tests/manual/docker-static-ip/Dockerfile
similarity index 100%
rename from tests/docker-static-ip/Dockerfile
rename to tests/manual/docker-static-ip/Dockerfile
diff --git a/tests/docker-static-ip/certs-metrics-proxy/Procfile b/tests/manual/docker-static-ip/certs-metrics-proxy/Procfile
similarity index 100%
rename from tests/docker-static-ip/certs-metrics-proxy/Procfile
rename to tests/manual/docker-static-ip/certs-metrics-proxy/Procfile
diff --git a/tests/docker-static-ip/certs-metrics-proxy/ca-csr.json b/tests/manual/docker-static-ip/certs-metrics-proxy/ca-csr.json
similarity index 100%
rename from tests/docker-static-ip/certs-metrics-proxy/ca-csr.json
rename to tests/manual/docker-static-ip/certs-metrics-proxy/ca-csr.json
diff --git a/tests/docker-static-ip/certs-metrics-proxy/ca.crt b/tests/manual/docker-static-ip/certs-metrics-proxy/ca.crt
similarity index 100%
rename from tests/docker-static-ip/certs-metrics-proxy/ca.crt
rename to tests/manual/docker-static-ip/certs-metrics-proxy/ca.crt
diff --git a/tests/docker-static-ip/certs-metrics-proxy/gencert.json b/tests/manual/docker-static-ip/certs-metrics-proxy/gencert.json
similarity index 100%
rename from tests/docker-static-ip/certs-metrics-proxy/gencert.json
rename to tests/manual/docker-static-ip/certs-metrics-proxy/gencert.json
diff --git a/tests/docker-static-ip/certs-metrics-proxy/gencerts.sh b/tests/manual/docker-static-ip/certs-metrics-proxy/gencerts.sh
similarity index 100%
rename from tests/docker-static-ip/certs-metrics-proxy/gencerts.sh
rename to tests/manual/docker-static-ip/certs-metrics-proxy/gencerts.sh
diff --git a/tests/docker-static-ip/certs-metrics-proxy/run.sh b/tests/manual/docker-static-ip/certs-metrics-proxy/run.sh
similarity index 100%
rename from tests/docker-static-ip/certs-metrics-proxy/run.sh
rename to tests/manual/docker-static-ip/certs-metrics-proxy/run.sh
diff --git a/tests/docker-static-ip/certs-metrics-proxy/server-ca-csr.json b/tests/manual/docker-static-ip/certs-metrics-proxy/server-ca-csr.json
similarity index 100%
rename from tests/docker-static-ip/certs-metrics-proxy/server-ca-csr.json
rename to tests/manual/docker-static-ip/certs-metrics-proxy/server-ca-csr.json
diff --git a/tests/docker-static-ip/certs-metrics-proxy/server.crt b/tests/manual/docker-static-ip/certs-metrics-proxy/server.crt
similarity index 100%
rename from tests/docker-static-ip/certs-metrics-proxy/server.crt
rename to tests/manual/docker-static-ip/certs-metrics-proxy/server.crt
diff --git a/tests/docker-static-ip/certs-metrics-proxy/server.key.insecure b/tests/manual/docker-static-ip/certs-metrics-proxy/server.key.insecure
similarity index 100%
rename from tests/docker-static-ip/certs-metrics-proxy/server.key.insecure
rename to tests/manual/docker-static-ip/certs-metrics-proxy/server.key.insecure
diff --git a/tests/docker-static-ip/certs/Procfile b/tests/manual/docker-static-ip/certs/Procfile
similarity index 100%
rename from tests/docker-static-ip/certs/Procfile
rename to tests/manual/docker-static-ip/certs/Procfile
diff --git a/tests/docker-static-ip/certs/ca-csr.json b/tests/manual/docker-static-ip/certs/ca-csr.json
similarity index 100%
rename from tests/docker-static-ip/certs/ca-csr.json
rename to tests/manual/docker-static-ip/certs/ca-csr.json
diff --git a/tests/docker-static-ip/certs/ca.crt b/tests/manual/docker-static-ip/certs/ca.crt
similarity index 100%
rename from tests/docker-static-ip/certs/ca.crt
rename to tests/manual/docker-static-ip/certs/ca.crt
diff --git a/tests/docker-static-ip/certs/gencert.json b/tests/manual/docker-static-ip/certs/gencert.json
similarity index 100%
rename from tests/docker-static-ip/certs/gencert.json
rename to tests/manual/docker-static-ip/certs/gencert.json
diff --git a/tests/docker-static-ip/certs/gencerts.sh b/tests/manual/docker-static-ip/certs/gencerts.sh
similarity index 100%
rename from tests/docker-static-ip/certs/gencerts.sh
rename to tests/manual/docker-static-ip/certs/gencerts.sh
diff --git a/tests/docker-static-ip/certs/run.sh b/tests/manual/docker-static-ip/certs/run.sh
similarity index 100%
rename from tests/docker-static-ip/certs/run.sh
rename to tests/manual/docker-static-ip/certs/run.sh
diff --git a/tests/docker-static-ip/certs/server-ca-csr.json b/tests/manual/docker-static-ip/certs/server-ca-csr.json
similarity index 100%
rename from tests/docker-static-ip/certs/server-ca-csr.json
rename to tests/manual/docker-static-ip/certs/server-ca-csr.json
diff --git a/tests/docker-static-ip/certs/server.crt b/tests/manual/docker-static-ip/certs/server.crt
similarity index 100%
rename from tests/docker-static-ip/certs/server.crt
rename to tests/manual/docker-static-ip/certs/server.crt
diff --git a/tests/docker-static-ip/certs/server.key.insecure b/tests/manual/docker-static-ip/certs/server.key.insecure
similarity index 100%
rename from tests/docker-static-ip/certs/server.key.insecure
rename to tests/manual/docker-static-ip/certs/server.key.insecure