diff --git a/scripts/test.sh b/scripts/test.sh
index af2c00c30f..523b01c203 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -x
-
 specified_package="${1}"
 shift
 
@@ -55,7 +53,20 @@ elif [ "${DB}" = "postgres" ]; then
 fi
 
 declare -a packages
-pushd $DIEGO_RELEASE_DIR/src/code.cloudfoundry.org &>/dev/null
+
+if [[ -v specified_package ]]; then
+  pushd "$DIEGO_RELEASE_DIR/src/code.cloudfoundry.org/${specified_package}"
+    mapfile -t packages < <(find . -type f -name '*_test.go' -print0 | xargs -0 -L1 -I{} dirname {} | sort -u)
+
+    ginkgo --race -randomizeAllSpecs -randomizeSuites -failFast -p \
+      -ldflags="extldflags=-WL,--allow-multiple-definition" \
+      "${packages[@]}" "${@}"
+  popd
+
+  exit
+fi
+
+pushd "$DIEGO_RELEASE_DIR/src/code.cloudfoundry.org" &>/dev/null
   mapfile -t packages < <(find . -type f -name '*_test.go' -print0 | xargs -0 -L1 -I{} dirname {} | sort -u)
 popd &>/dev/null