diff --git a/tests/semaphore.test.bash b/tests/semaphore.test.bash
index 2c427fac9..ab0fb4c3a 100755
--- a/tests/semaphore.test.bash
+++ b/tests/semaphore.test.bash
@@ -7,28 +7,17 @@ fi
 
 <<COMMENT
 # amd64-e2e
-bash tests/semaphore.test.bash
+tests/semaphore.test.bash
+sudo HOST_TMP_DIR=/tmp TEST_OPTS="PASSES='build release e2e' MANUAL_VER=v3.3.7" make docker-test
 
 # 386-e2e
-TEST_ARCH=386 bash tests/semaphore.test.bash
+sudo HOST_TMP_DIR=/tmp TEST_OPTS="GOARCH=386 PASSES='build e2e'" make docker-test
 
-# grpc-proxy
-TEST_OPTS="PASSES='build grpcproxy'" bash tests/semaphore.test.bash
+# amd64-unit
+sudo HOST_TMP_DIR=/tmp TEST_OPTS="GOARCH=amd64 PASSES='unit'" make docker-test
 
-# coverage
-TEST_OPTS="coverage" bash tests/semaphore.test.bash
+# 386-unit
+sudo HOST_TMP_DIR=/tmp TEST_OPTS="GOARCH=386 PASSES='unit'" make docker-test
 COMMENT
 
-if [ -z "${TEST_OPTS}" ]; then
-	TEST_OPTS="PASSES='build release e2e' MANUAL_VER=v3.3.7"
-fi
-if [ "${TEST_ARCH}" == "386" ]; then
-  TEST_OPTS="GOARCH=386 PASSES='build e2e'"
-fi
-
-echo "Running tests with" ${TEST_OPTS}
-if [ "${TEST_OPTS}" == "coverage" ]; then
-  sudo HOST_TMP_DIR=/tmp make docker-test-coverage
-else
-  sudo HOST_TMP_DIR=/tmp TEST_OPTS="${TEST_OPTS}" make docker-test
-fi
+sudo HOST_TMP_DIR=/tmp TEST_OPTS="PASSES='build release e2e' MANUAL_VER=v3.3.7" make docker-test