diff --git a/elements/hadoop/post-install.d/firstboot b/elements/hadoop/post-install.d/firstboot
index b4ea570d..14d26d3a 100644
--- a/elements/hadoop/post-install.d/firstboot
+++ b/elements/hadoop/post-install.d/firstboot
@@ -1,4 +1,5 @@
 #!/bin/bash
+# dib-lint: disable=executable
 
 if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then
     set -x
diff --git a/elements/mysql/install.d/start-mysql.sh b/elements/mysql/install.d/start-mysql.sh
index 79e897df..a075d1e4 100644
--- a/elements/mysql/install.d/start-mysql.sh
+++ b/elements/mysql/install.d/start-mysql.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# dib-lint: disable=executable
 
 if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then
     set -x
diff --git a/elements/storm/install.d/60-storm b/elements/storm/install.d/60-storm
index b4c3f872..e1e28c0c 100755
--- a/elements/storm/install.d/60-storm
+++ b/elements/storm/install.d/60-storm
@@ -5,7 +5,7 @@
 if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then
     set -x
 fi
-set -u
+set -eu
 set -o pipefail
 
 tmp_dir=/tmp/storm
diff --git a/tox.ini b/tox.ini
index ac6dce5c..5bccc427 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,6 +23,7 @@ commands = bash -c "find {toxinidir} -not -wholename \*.tox/\* -and \( -name \*.
 commands =
     flake8 {posargs}
     {toxinidir}/tools/run_bashate.sh
+    dib-lint
 
 [testenv:venv]
 commands = {posargs}