diff --git a/shellcheck.sh b/shellcheck.sh
index aea73fa..45ea112 100755
--- a/shellcheck.sh
+++ b/shellcheck.sh
@@ -5,7 +5,7 @@ set -o pipefail
 ERRORS=()
 
 # find all executables and run `shellcheck`
-for f in $(find . -type f -not -iwholename '*.git*' | sort -u); do
+for f in $(find . -type f -not -iwholename '*.git*' -not -name "Dockerfile" | sort -u); do
 	if file "$f" | grep --quiet shell; then
 		{
 			shellcheck "$f" && echo "[OK]: sucessfully linted $f"
diff --git a/slapd/start.sh b/slapd/start.sh
index 5f2ce82..7187250 100755
--- a/slapd/start.sh
+++ b/slapd/start.sh
@@ -2,9 +2,9 @@
 set -e
 set -o pipefail
 
-: LDAP_ROOTPASS=${LDAP_ROOTPASS}
-: LDAP_DOMAIN=${LDAP_DOMAIN}
-: LDAP_ORGANIZATION=${LDAP_ORGANIZATION}
+: LDAP_ROOTPASS="${LDAP_ROOTPASS}"
+: LDAP_DOMAIN="${LDAP_DOMAIN}"
+: LDAP_ORGANIZATION="${LDAP_ORGANIZATION}"
 
 if [ ! -e /var/lib/ldap/docker_bootstrapped ]; then
   echo "configuring slapd for first run"
diff --git a/sublime-text-3/run.sh b/sublime-text-3/run.sh
index 2fa048a..2ae031d 100644
--- a/sublime-text-3/run.sh
+++ b/sublime-text-3/run.sh
@@ -5,17 +5,17 @@ set -o pipefail
 COMMAND=/opt/sublime_text/sublime_text
 
 if [ -z ${NEWUSER+x} ]; then
-	echo 'WARN: No user was defined, defaulting to root.'
-	echo 'WARN: Sublime will save files as root:root.'
-	echo '      To prevent this, start the container with -e NEWUSER=$USER'
-	exec $COMMAND -w
+	echo "WARN: No user was defined, defaulting to root."
+	echo "WARN: Sublime will save files as root:root."
+	echo "      To prevent this, start the container with -e NEWUSER=\$USER"
+	exec "$COMMAND" -w
 else
 	# The root user already exists, so we only need to do something if
 	# a user has been specified.
-	useradd -s /bin/bash $NEWUSER
+	useradd -s /bin/bash "$NEWUSER"
 	# If you'd like to have Sublime Text add your development folder
 	# to the current project (i.e. in the sidebar at start), append
 	# "-a /home/$NEWUSER/Documents" (without quotes) into the su -c command below.
 	# Example: su $NEWUSER -c "$COMMAND -w -a /home/$NEWUSER/Documents"
-	su $NEWUSER -c "$COMMAND -w"
+	su "$NEWUSER" -c "$COMMAND -w"
 fi
diff --git a/test.sh b/test.sh
index 16e6f3f..9d7665c 100755
--- a/test.sh
+++ b/test.sh
@@ -24,6 +24,7 @@ validate_diff() {
 
 # get the dockerfiles changed
 IFS=$'\n'
+# shellcheck disable=SC2207
 files=( $(validate_diff --name-only -- '*Dockerfile') )
 unset IFS
 
@@ -44,7 +45,7 @@ for f in "${files[@]}"; do
 
 	(
 	set -x
-	docker build -t ${base}:${suite} ${build_dir}
+	docker build -t "${base}:${suite}" "${build_dir}"
 	)
 
 	echo "                       ---                                   "