diff --git a/build/build-plugin.sh b/build/build-plugin.sh
index 6c46d60c8..6dd52d85a 100755
--- a/build/build-plugin.sh
+++ b/build/build-plugin.sh
@@ -14,6 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+if ! [ -z $DEBUG ]; then
+	set -x
+fi
+
 set -o errexit
 set -o nounset
 set -o pipefail
diff --git a/build/build.sh b/build/build.sh
index 0fd952a11..3f37ca447 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -14,6 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+if ! [ -z $DEBUG ]; then
+	set -x
+fi
+
 set -o errexit
 set -o nounset
 set -o pipefail
diff --git a/build/cover.sh b/build/cover.sh
index dc3536d68..3b25c4a23 100755
--- a/build/cover.sh
+++ b/build/cover.sh
@@ -14,6 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+if ! [ -z $DEBUG ]; then
+	set -x
+fi
+
 set -o errexit
 set -o nounset
 set -o pipefail
diff --git a/build/dev-env.sh b/build/dev-env.sh
index 4c74926f8..e0a828ca3 100755
--- a/build/dev-env.sh
+++ b/build/dev-env.sh
@@ -14,6 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+if ! [ -z $DEBUG ]; then
+	set -x
+fi
+
 set -o errexit
 set -o nounset
 set -o pipefail
diff --git a/build/static-check.sh b/build/static-check.sh
index 358cb9ef8..49f408f90 100755
--- a/build/static-check.sh
+++ b/build/static-check.sh
@@ -14,6 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+if ! [ -z $DEBUG ]; then
+	set -x
+fi
+
 set -o errexit
 set -o nounset
 set -o pipefail
diff --git a/build/test-lua.sh b/build/test-lua.sh
index 0663a9b0c..b843f66fd 100755
--- a/build/test-lua.sh
+++ b/build/test-lua.sh
@@ -14,6 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
+if ! [ -z $DEBUG ]; then
+	set -x
+fi
+
 set -o errexit
 set -o nounset
 set -o pipefail
diff --git a/build/test.sh b/build/test.sh
index b206a5e30..758b4e593 100755
--- a/build/test.sh
+++ b/build/test.sh
@@ -14,6 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
+if ! [ -z $DEBUG ]; then
+	set -x
+fi
+
 set -o errexit
 set -o nounset
 set -o pipefail
diff --git a/test/e2e/wait-for-nginx.sh b/test/e2e/wait-for-nginx.sh
index f7b3ad9db..f4e01d968 100755
--- a/test/e2e/wait-for-nginx.sh
+++ b/test/e2e/wait-for-nginx.sh
@@ -15,7 +15,9 @@
 # limitations under the License.
 
 set -e
-set -x
+if ! [ -z $DEBUG ]; then
+	set -x
+fi
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"