diff --git a/scripts/joinmarket-qt.sh b/scripts/joinmarket-qt.sh
index cc34066..255aa02 100755
--- a/scripts/joinmarket-qt.sh
+++ b/scripts/joinmarket-qt.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-cd $(dirname "$0")/.. && \
+# shellcheck source=/dev/null
+cd "$(dirname "$0")/.." && \
 source jmvenv/bin/activate && \
 cd scripts && \
 python3 joinmarket-qt.py
diff --git a/test/Dockerfiles/build_docker.sh b/test/Dockerfiles/build_docker.sh
index d6caf39..94b9a38 100755
--- a/test/Dockerfiles/build_docker.sh
+++ b/test/Dockerfiles/build_docker.sh
@@ -20,10 +20,10 @@ build_docker ()
     core_url="https://bitcoincore.org/bin/bitcoin-core-${core_version}/${core_dist}"
     declare -A deps=( [${core_dist}]="${core_url}" )
     jm_root="${TRAVIS_BUILD_DIR}"
-    owner_name="${TRAVIS_REPO_SLUG%\/*}"
+    #owner_name="${TRAVIS_REPO_SLUG%\/*}"
     repo_name="${TRAVIS_REPO_SLUG#*\/}"
 
-    for dep in ${!deps[@]}; do
+    for dep in "${!deps[@]}"; do
         if [[ ! -r "${HOME}/downloads/${dep}" ]]; then
             curl --retry 5 -L "${deps[${dep}]}" -o "$HOME/downloads/${dep}"
         fi
@@ -31,7 +31,7 @@ build_docker ()
 
     mkdir -p "${jm_root}/deps/cache"
     find "$HOME/downloads" -type f -exec cp -v {} "${jm_root}/deps/cache/" \;
-    cd "${jm_root}/../"
+    cd "${jm_root}/../" || return 1
 
     docker build \
         --shm-size=1G \
diff --git a/test/lint/lint-python.sh b/test/lint/lint-python.sh
index dbb9059..a72d12f 100755
--- a/test/lint/lint-python.sh
+++ b/test/lint/lint-python.sh
@@ -13,7 +13,7 @@ elif flake8 --version | grep -q "Python 2"; then
 fi
 
 if [[ $# == 0 ]]; then
-    flake8 $(git ls-files "*.py") --extend-exclude "${EXCLUDE_PATTERNS}"
+    flake8 "$(git ls-files "*.py")" --extend-exclude "${EXCLUDE_PATTERNS}"
 else
     flake8 "$@"
 fi
diff --git a/test/run_tests.sh b/test/run_tests.sh
index 516b327..4f83e19 100755
--- a/test/run_tests.sh
+++ b/test/run_tests.sh
@@ -126,7 +126,7 @@ parse_flags ()
                     echo "Invalid option $1"
                 fi
                 echo "
-Usage: "${0}" [options]
+Usage: ${0} [options]
 
 Options:
 
@@ -155,7 +155,7 @@ run_jm_tests ()
     btcuser="bitcoinrpc"
     btcpwd="123456abcdef"
     nirc="2"
-    if ! parse_flags ${@}; then
+    if ! parse_flags "${@}"; then
         return 1
     fi
 
@@ -176,7 +176,7 @@ run_jm_tests ()
     export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${VIRTUAL_ENV}/lib"
     export C_INCLUDE_PATH="${C_INCLUDE_PATH}:${VIRTUAL_ENV}/include"
 
-    pushd "${jm_source}"
+    pushd "${jm_source}" || return 1
     if [ ! -f 'miniircd.tar.gz' ] || ! sha256_verify 'ce3a4ddc777343645ccd06ca36233b5777e218ee89d887ef529ece86a917fc33' 'miniircd.tar.gz'; then
         http_get "https://github.com/JoinMarket-Org/miniircd/archive/master.tar.gz" "miniircd.tar.gz"
     fi
@@ -217,18 +217,18 @@ run_jm_tests ()
     echo "datadir=${jm_test_datadir}" >> "${jm_test_datadir}/bitcoin.conf"
     python -m pytest $additional_pytest_flags \
         ${HAS_JOSH_K_SEAL_OF_APPROVAL+--cov=jmclient --cov=jmbitcoin --cov=jmbase --cov=jmdaemon --cov-report html} \
-        --btcconf=$btcconf \
-        --btcpwd=$btcpwd \
-        --btcroot=$btcroot \
-        --btcuser=$btcuser \
-        --nirc=$nirc \
+        --btcconf="$btcconf" \
+        --btcpwd="$btcpwd" \
+        --btcroot="$btcroot" \
+        --btcuser="$btcuser" \
+        --nirc="$nirc" \
         -p no:warnings
     local success="$?"
     [[ -f ./joinmarket.cfg ]] && unlink ./joinmarket.cfg
-    if [ -f "${jm_test_datadir}/bitcoind.pid" ] && read bitcoind_pid <"${jm_test_datadir}/bitcoind.pid"; then
-        kill -15 ${bitcoind_pid} || kill -9 ${bitcoind_pid}
+    if [ -f "${jm_test_datadir}/bitcoind.pid" ] && read -r bitcoind_pid < "${jm_test_datadir}/bitcoind.pid"; then
+        kill -15 "${bitcoind_pid}" || kill -9 "${bitcoind_pid}"
     fi
-    if [[ "${HAS_JOSH_K_SEAL_OF_APPROVAL}" == true ]] && (( ${success} != 0 )); then
+    if [[ "${HAS_JOSH_K_SEAL_OF_APPROVAL}" == true ]] && (( success != 0 )); then
         tail -100 "${jm_test_datadir}/regtest/debug.log"
         find "${jm_test_datadir}"
     else
@@ -236,4 +236,4 @@ run_jm_tests ()
     fi
     return ${success:-1}
 }
-run_jm_tests ${@}
+run_jm_tests "${@}"