diff --git a/make-linux.mk b/make-linux.mk
index 2ce12fa..76b30db 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -109,8 +109,8 @@ docker_demo: one linux_shared_lib
 	cd $(INT)/docker/docker_demo; docker build --tag="docker_demo_monitor" -f monitor_dockerfile .
 
 # Builds all docker test images
-docker_images:
-	./tests/docker/build.sh
+docker_images: one linux_shared_lib
+	./tests/docker/build_images.sh
 
 # Runs docker container tests
 docker_test:
diff --git a/tests/docker/build.sh b/tests/docker/build.sh
deleted file mode 100755
index bb5fd8e..0000000
--- a/tests/docker/build.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-echo "*** Building Zerotier-One, libraries, and test/monitor images..."
-
-./build_zt.sh
-./build_tests.sh $1
-
-echo "*** Done"
diff --git a/tests/docker/build_tests.sh b/tests/docker/build_images.sh
similarity index 100%
rename from tests/docker/build_tests.sh
rename to tests/docker/build_images.sh
diff --git a/tests/docker/build_zt.sh b/tests/docker/build_zt.sh
deleted file mode 100755
index e279673..0000000
--- a/tests/docker/build_zt.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# Builds Zerotier-One and libraries required for SDK, then
-# copies the binaries into the test directory.
-
-cd ../../
-make clean
-make one
-make sdk
-cd sdk/docker-test
-
-cp ../../zerotier-cli zerotier-cli
-cp ../../zerotier-sdk-service zerotier-sdk-service
-cp ../../libztintercept.so libztintercept.so
-
-cp ../liblwip.so liblwip.so
-cp ../zerotier-intercept zerotier-intercept
-
-cp ../../zerotier-one zerotier-one
-