diff --git a/tests/unit/app-json-2.bats b/tests/unit/app-json-2.bats
index c3fdd2d679a..ca39191aa3b 100644
--- a/tests/unit/app-json-2.bats
+++ b/tests/unit/app-json-2.bats
@@ -65,4 +65,3 @@ teardown() {
   echo "status: $status"
   assert_success
 }
-
diff --git a/tests/unit/app-json-3.bats b/tests/unit/app-json-3.bats
index ead921aed04..83769957978 100644
--- a/tests/unit/app-json-3.bats
+++ b/tests/unit/app-json-3.bats
@@ -63,20 +63,19 @@ persist_scale_callback_a() {
   local APP_REPO_DIR="$2"
   [[ -z "$APP" ]] && local APP="$TEST_APP"
 
-  rm  "$APP_REPO_DIR/Procfile"
+  rm "$APP_REPO_DIR/Procfile"
   touch "$APP_REPO_DIR/Procfile"
   echo "web: python3 web.py" >>"$APP_REPO_DIR/Procfile"
   echo "worker: python3 worker.py" >>"$APP_REPO_DIR/Procfile"
   mv "$APP_REPO_DIR/app-5205a.json" "$APP_REPO_DIR/app.json"
 }
 
-
 persist_scale_callback_b() {
   local APP="$1"
   local APP_REPO_DIR="$2"
   [[ -z "$APP" ]] && local APP="$TEST_APP"
 
-  rm  "$APP_REPO_DIR/Procfile"
+  rm "$APP_REPO_DIR/Procfile"
   touch "$APP_REPO_DIR/Procfile"
   echo "web: python3 web.py" >>"$APP_REPO_DIR/Procfile"
   echo "cron: python3 worker.py" >>"$APP_REPO_DIR/Procfile"
diff --git a/tests/unit/app-json.bats b/tests/unit/app-json.bats
index 210b8bde0a9..7155f59e9c2 100644
--- a/tests/unit/app-json.bats
+++ b/tests/unit/app-json.bats
@@ -37,7 +37,7 @@ teardown() {
   echo "status: $status"
   assert_success
 
-  CID=$(docker ps -a -q  -f "ancestor=dokku/${TEST_APP}" -f "label=dokku_phase_script=postdeploy")
+  CID=$(docker ps -a -q -f "ancestor=dokku/${TEST_APP}" -f "label=dokku_phase_script=postdeploy")
   DOCKER_COMMIT_LABEL_ARGS=("--change" "LABEL org.label-schema.schema-version=1.0" "--change" "LABEL org.label-schema.vendor=dokku" "--change" "LABEL com.dokku.app-name=$TEST_APP")
   IMAGE_ID=$(docker commit "${DOCKER_COMMIT_LABEL_ARGS[@]}" $CID dokku-test/${TEST_APP})
   run /bin/bash -c "docker run --rm $IMAGE_ID ls /app/postdeploy.test"
diff --git a/tests/unit/apps_1.bats b/tests/unit/apps_1.bats
index 79cea42389d..47770711464 100644
--- a/tests/unit/apps_1.bats
+++ b/tests/unit/apps_1.bats
@@ -140,7 +140,7 @@ teardown() {
   echo "output: $output"
   echo "status: $status"
   assert_output ""
-  run /bin/bash -c "curl --silent --write-out '%{http_code}\n' `dokku url great-test-name` | grep 404"
+  run /bin/bash -c "curl --silent --write-out '%{http_code}\n' $(dokku url great-test-name) | grep 404"
   echo "output: $output"
   echo "status: $status"
   assert_output ""
diff --git a/tests/unit/apps_2.bats b/tests/unit/apps_2.bats
index 71b846d4cfb..2de3372443d 100644
--- a/tests/unit/apps_2.bats
+++ b/tests/unit/apps_2.bats
@@ -20,7 +20,7 @@ teardown() {
   echo "output: $output"
   echo "status: $status"
   assert_success
-  run /bin/bash -c "curl --silent --write-out '%{http_code}\n' `dokku url great-test-name` | grep 404"
+  run /bin/bash -c "curl --silent --write-out '%{http_code}\n' $(dokku url great-test-name) | grep 404"
   echo "output: $output"
   echo "status: $status"
   assert_output ""
@@ -140,11 +140,11 @@ teardown() {
   assert_failure
   run [ -f /home/dokku/great-test-name/VHOST ]
   assert_failure
-  run /bin/bash -c "curl --silent --write-out '%{http_code}\n' `dokku url $TEST_APP` | grep 200"
+  run /bin/bash -c "curl --silent --write-out '%{http_code}\n' $(dokku url $TEST_APP) | grep 200"
   echo "output: $output"
   echo "status: $status"
   assert_success
-  run /bin/bash -c "curl --silent --write-out '%{http_code}\n' `dokku url great-test-name` | grep 404"
+  run /bin/bash -c "curl --silent --write-out '%{http_code}\n' $(dokku url great-test-name) | grep 404"
   echo "output: $output"
   echo "status: $status"
   assert_failure
@@ -152,7 +152,7 @@ teardown() {
   echo "output: $output"
   echo "status: $status"
   assert_success
-  run /bin/bash -c "curl --silent --write-out '%{http_code}\n' `dokku url $TEST_APP` | grep 200"
+  run /bin/bash -c "curl --silent --write-out '%{http_code}\n' $(dokku url $TEST_APP) | grep 200"
   echo "output: $output"
   echo "status: $status"
   assert_success
diff --git a/tests/unit/build-env.bats b/tests/unit/build-env.bats
index 8b59c61c5c3..2a0df8f61c0 100644
--- a/tests/unit/build-env.bats
+++ b/tests/unit/build-env.bats
@@ -84,7 +84,7 @@ teardown() {
 @test "(build-env) DOKKU_HOST_ROOT cache bind is used if set" {
   TMP_ROOT=$(mktemp -d)
   mkdir -p $DOKKU_ROOT/.dokkurc
-  echo export DOKKU_HOST_ROOT="$TMP_ROOT" > $DOKKU_ROOT/.dokkurc/HOST_ROOT
+  echo export DOKKU_HOST_ROOT="$TMP_ROOT" >$DOKKU_ROOT/.dokkurc/HOST_ROOT
   DOKKU_HOST_ROOT="$TMP_ROOT" deploy_app
 
   BUILD_CID=$(docker ps -a | grep $TEST_APP | grep /bin/bash | awk '{print $1}' | head -n1)
diff --git a/tests/unit/builder-herokuish.bats b/tests/unit/builder-herokuish.bats
index b4fda84dd0a..fad1bf54254 100644
--- a/tests/unit/builder-herokuish.bats
+++ b/tests/unit/builder-herokuish.bats
@@ -16,4 +16,4 @@ teardown() {
   echo "status: $status"
   assert_success
   assert_output_contains 'DOTENV_KEY=some_value'
-}
\ No newline at end of file
+}
diff --git a/tests/unit/buildpacks.bats b/tests/unit/buildpacks.bats
index 3382a8a8843..cb00643806f 100644
--- a/tests/unit/buildpacks.bats
+++ b/tests/unit/buildpacks.bats
@@ -233,7 +233,6 @@ teardown() {
   assert_output_not_exists
 }
 
-
 @test "(buildpacks) buildpacks:clear" {
   run /bin/bash -c "dokku buildpacks:set $TEST_APP heroku/nodejs"
   echo "output: $output"
diff --git a/tests/unit/client.bats b/tests/unit/client.bats
index 965cda8b99f..53f49b56944 100644
--- a/tests/unit/client.bats
+++ b/tests/unit/client.bats
@@ -189,7 +189,7 @@ teardown() {
   echo "status: $status"
   assert_success
   for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
-    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
+    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(<$CID_FILE)"
     echo "output: $output"
     echo "status: $status"
     assert_success
@@ -203,7 +203,7 @@ teardown() {
   echo "status: $status"
   assert_success
   for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
-    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
+    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(<$CID_FILE)"
     echo "output: $output"
     echo "status: $status"
     assert_failure
@@ -217,7 +217,7 @@ teardown() {
   echo "status: $status"
   assert_success
   for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
-    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
+    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(<$CID_FILE)"
     echo "output: $output"
     echo "status: $status"
     assert_success
diff --git a/tests/unit/config-oddities.bats b/tests/unit/config-oddities.bats
index 6a06761fc9c..011d46e168d 100644
--- a/tests/unit/config-oddities.bats
+++ b/tests/unit/config-oddities.bats
@@ -12,7 +12,7 @@ setup() {
 teardown() {
   destroy_app
   ls -la ${DOKKU_ROOT}
-  if [[ -f ${DOKKU_ROOT}/ENV.bak ]];then
+  if [[ -f ${DOKKU_ROOT}/ENV.bak ]]; then
     mv -f ${DOKKU_ROOT}/ENV.bak ${DOKKU_ROOT}/ENV
   fi
   global_teardown
diff --git a/tests/unit/config.bats b/tests/unit/config.bats
index 4fc522624a8..610fd0a632b 100644
--- a/tests/unit/config.bats
+++ b/tests/unit/config.bats
@@ -12,7 +12,7 @@ setup() {
 teardown() {
   destroy_app
   ls -la ${DOKKU_ROOT}
-  if [[ -f ${DOKKU_ROOT}/ENV.bak ]];then
+  if [[ -f ${DOKKU_ROOT}/ENV.bak ]]; then
     mv -f ${DOKKU_ROOT}/ENV.bak ${DOKKU_ROOT}/ENV
   fi
   global_teardown
diff --git a/tests/unit/core_1.bats b/tests/unit/core_1.bats
index a712916b536..9939e3fc607 100644
--- a/tests/unit/core_1.bats
+++ b/tests/unit/core_1.bats
@@ -34,7 +34,7 @@ teardown() {
   echo "output: $output"
   echo "status: $status"
   assert_success
-  sleep 5  # wait for dokku cleanup to happen in the background
+  sleep 5 # wait for dokku cleanup to happen in the background
 
   run /bin/bash -c "docker inspect $RANDOM_RUN_CID"
   echo "output: $output"
@@ -45,7 +45,7 @@ teardown() {
 
 @test "(core) port exposure (dockerfile raw port)" {
   source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-  cat<<EOF > $DOCKERFILE
+  cat <<EOF >$DOCKERFILE
 EXPOSE 3001/udp
 EXPOSE 3003
 EXPOSE  3000/tcp
@@ -58,7 +58,7 @@ EOF
 
 @test "(core) port exposure (dockerfile tcp port)" {
   source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-  cat<<EOF > $DOCKERFILE
+  cat <<EOF >$DOCKERFILE
 EXPOSE 3001/udp
 EXPOSE  3000/tcp
 EXPOSE 3003
@@ -84,7 +84,7 @@ EOF
 @test "(core) image type detection (herokuish custom user)" {
   export DOKKU_ROOT
   deploy_app
-  CID=$(< "$DOKKU_ROOT/$TEST_APP/CONTAINER.web.1")
+  CID=$(<"$DOKKU_ROOT/$TEST_APP/CONTAINER.web.1")
   docker commit --change "ENV USER postgres" "$CID" "dokku/${TEST_APP}:latest"
   dokku config:set --no-restart "$TEST_APP" DOKKU_APP_USER=postgres
   source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
diff --git a/tests/unit/cron.bats b/tests/unit/cron.bats
index 0a0125bc9a0..6f7f20afd2f 100644
--- a/tests/unit/cron.bats
+++ b/tests/unit/cron.bats
@@ -118,7 +118,7 @@ teardown() {
 }
 
 @test "(cron) injected entries" {
-  echo "echo '@daily;/bin/true'" > /var/lib/dokku/plugins/enabled/cron-entries/cron-entries
+  echo "echo '@daily;/bin/true'" >/var/lib/dokku/plugins/enabled/cron-entries/cron-entries
   chmod +x /var/lib/dokku/plugins/enabled/cron-entries/cron-entries
 
   run /bin/bash -c "dokku plugin:trigger cron-write"
@@ -133,7 +133,7 @@ teardown() {
   assert_output_contains "@daily /bin/true"
 
   # log file
-  echo "echo '@daily;/bin/true;/var/log/dokku/log.log'" > /var/lib/dokku/plugins/enabled/cron-entries/cron-entries
+  echo "echo '@daily;/bin/true;/var/log/dokku/log.log'" >/var/lib/dokku/plugins/enabled/cron-entries/cron-entries
   chmod +x /var/lib/dokku/plugins/enabled/cron-entries/cron-entries
 
   run /bin/bash -c "dokku plugin:trigger cron-write"
@@ -141,7 +141,6 @@ teardown() {
   echo "status: $status"
   assert_success
 
-
   run /bin/bash -c "cat /var/spool/cron/crontabs/dokku"
   echo "output: $output"
   echo "status: $status"
@@ -149,7 +148,7 @@ teardown() {
   assert_output_contains "@daily /bin/true &>> /var/log/dokku/log.log"
 
   # specify matching scheduler
-  echo "[[ \$1 == 'docker-local' ]] && echo '@daily;/bin/true'" > /var/lib/dokku/plugins/enabled/cron-entries/cron-entries
+  echo "[[ \$1 == 'docker-local' ]] && echo '@daily;/bin/true'" >/var/lib/dokku/plugins/enabled/cron-entries/cron-entries
   chmod +x /var/lib/dokku/plugins/enabled/cron-entries/cron-entries
 
   run /bin/bash -c "dokku plugin:trigger cron-write"
@@ -157,7 +156,6 @@ teardown() {
   echo "status: $status"
   assert_success
 
-
   run /bin/bash -c "cat /var/spool/cron/crontabs/dokku"
   echo "output: $output"
   echo "status: $status"
@@ -165,7 +163,7 @@ teardown() {
   assert_output_contains "@daily /bin/true"
 
   # specify non-matching scheduler
-  echo "[[ \$1 == 'kubernetes' ]] && echo '@daily;/bin/true'" > /var/lib/dokku/plugins/enabled/cron-entries/cron-entries
+  echo "[[ \$1 == 'kubernetes' ]] && echo '@daily;/bin/true'" >/var/lib/dokku/plugins/enabled/cron-entries/cron-entries
   chmod +x /var/lib/dokku/plugins/enabled/cron-entries/cron-entries
 
   run /bin/bash -c "dokku plugin:trigger cron-write"
@@ -173,7 +171,6 @@ teardown() {
   echo "status: $status"
   assert_success
 
-
   run /bin/bash -c "cat /var/spool/cron/crontabs/dokku"
   echo "output: $output"
   echo "status: $status"
diff --git a/tests/unit/docker-options.bats b/tests/unit/docker-options.bats
index bfeecfe8485..3b4a40acb36 100644
--- a/tests/unit/docker-options.bats
+++ b/tests/unit/docker-options.bats
@@ -283,7 +283,7 @@ teardown() {
   echo "status: $status"
   assert_success
 
-  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  CID=$(<$DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
   run /bin/bash -c "docker inspect -f '{{ .Config.Volumes }}' $CID | sed -e 's:map::g' | tr -d '[]' | tr ' ' $'\n' | sort | xargs"
   echo "output: $output"
   echo "status: $status"
@@ -325,7 +325,7 @@ teardown() {
   assert_success
   assert_output_contains "One or more build-args \[PAYPAL_CLIENT_ID PAYPAL_CLIENT_MODE\] were not consumed"
 
-  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  CID=$(<$DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
   run /bin/bash -c "docker inspect -f '{{ .Config.Volumes }}' $CID | sed -e 's:map::g' | tr -d '[]' | tr ' ' $'\n' | sort | xargs"
   echo "output: $output"
   echo "status: $status"
diff --git a/tests/unit/git_3.bats b/tests/unit/git_3.bats
index 50a624e5d3f..1cec5559657 100644
--- a/tests/unit/git_3.bats
+++ b/tests/unit/git_3.bats
@@ -303,7 +303,6 @@ teardown() {
   assert_output_contains "Application deployed"
 }
 
-
 @test "(git) git:sync private" {
   if [[ -z "$SYNC_GITHUB_USERNAME" ]] || [[ -z "$SYNC_GITHUB_PASSWORD" ]]; then
     skip "skipping due to missing github credentials SYNC_GITHUB_USERNAME:SYNC_GITHUB_PASSWORD"
diff --git a/tests/unit/network.bats b/tests/unit/network.bats
index 338e26c1a19..c8d503bb84c 100644
--- a/tests/unit/network.bats
+++ b/tests/unit/network.bats
@@ -47,7 +47,7 @@ teardown() {
   assert_http_success "${TEST_APP}.dokku.me"
 
   for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.web.*; do
-    assert_external_port $(< $CID_FILE)
+    assert_external_port $(<$CID_FILE)
   done
 
   run /bin/bash -c "dokku network:set $TEST_APP bind-all-interfaces false"
@@ -62,7 +62,7 @@ teardown() {
   assert_http_success "${TEST_APP}.dokku.me"
 
   for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.web.*; do
-    assert_not_external_port $(< $CID_FILE)
+    assert_not_external_port $(<$CID_FILE)
   done
 }
 
@@ -77,7 +77,7 @@ teardown() {
   echo "status: $status"
   assert_success
 
-  run /bin/bash -c "curl --silent --write-out '%{http_code}\n' `dokku url $TEST_APP` | grep 200"
+  run /bin/bash -c "curl --silent --write-out '%{http_code}\n' $(dokku url $TEST_APP) | grep 200"
   echo "output: $output"
   echo "status: $status"
   assert_success
diff --git a/tests/unit/nginx-vhosts_1.bats b/tests/unit/nginx-vhosts_1.bats
index 3e1fb17f2f5..da865e04473 100644
--- a/tests/unit/nginx-vhosts_1.bats
+++ b/tests/unit/nginx-vhosts_1.bats
@@ -32,7 +32,7 @@ teardown() {
   deploy_app
   dokku domains:disable $TEST_APP
 
-  HOSTNAME=$(< "$DOKKU_ROOT/VHOST")
+  HOSTNAME=$(<"$DOKKU_ROOT/VHOST")
   check_urls http://${HOSTNAME}:[0-9]+
 
   URLS=$(dokku --quiet urls "$TEST_APP")
@@ -60,7 +60,7 @@ teardown() {
 }
 
 @test "(nginx-vhosts) nginx:build-config (with global VHOST)" {
-  echo "dokku.me" > "$DOKKU_ROOT/VHOST"
+  echo "dokku.me" >"$DOKKU_ROOT/VHOST"
   deploy_app
 
   check_urls http://${TEST_APP}.dokku.me
diff --git a/tests/unit/nginx-vhosts_10.bats b/tests/unit/nginx-vhosts_10.bats
index 7377d6e3299..fba31ae9380 100644
--- a/tests/unit/nginx-vhosts_10.bats
+++ b/tests/unit/nginx-vhosts_10.bats
@@ -171,4 +171,3 @@ teardown() {
   echo "status: $status"
   assert_output_contains "X-Forwarded-Ssl" 0
 }
-
diff --git a/tests/unit/nginx-vhosts_4.bats b/tests/unit/nginx-vhosts_4.bats
index f46d7b68f0d..cb9e0983771 100644
--- a/tests/unit/nginx-vhosts_4.bats
+++ b/tests/unit/nginx-vhosts_4.bats
@@ -34,10 +34,10 @@ teardown() {
 
 @test "(nginx-vhosts) nginx:build-config (without global VHOST and IPv4 address set as HOSTNAME)" {
   rm "$DOKKU_ROOT/VHOST"
-  echo "127.0.0.1" > "$DOKKU_ROOT/VHOST"
+  echo "127.0.0.1" >"$DOKKU_ROOT/VHOST"
   deploy_app
 
-  HOSTNAME=$(< "$DOKKU_ROOT/VHOST")
+  HOSTNAME=$(<"$DOKKU_ROOT/VHOST")
   check_urls http://${HOSTNAME}:[0-9]+
 
   URLS=$(dokku --quiet urls "$TEST_APP")
@@ -48,10 +48,10 @@ teardown() {
 
 @test "(nginx-vhosts) nginx:build-config (without global VHOST and IPv6 address set as HOSTNAME)" {
   rm "$DOKKU_ROOT/VHOST"
-  echo "fda5:c7db:a520:bb6d::aabb:ccdd:eeff" > "$DOKKU_ROOT/VHOST"
+  echo "fda5:c7db:a520:bb6d::aabb:ccdd:eeff" >"$DOKKU_ROOT/VHOST"
   deploy_app
 
-  HOSTNAME=$(< "$DOKKU_ROOT/VHOST")
+  HOSTNAME=$(<"$DOKKU_ROOT/VHOST")
   check_urls http://${HOSTNAME}:[0-9]+
 }
 
diff --git a/tests/unit/nginx-vhosts_5.bats b/tests/unit/nginx-vhosts_5.bats
index a6c38ed0055..0e65a35be70 100644
--- a/tests/unit/nginx-vhosts_5.bats
+++ b/tests/unit/nginx-vhosts_5.bats
@@ -16,7 +16,7 @@ teardown() {
 }
 
 @test "(nginx-vhosts) nginx:build-config (sslip.io style hostnames)" {
-  echo "127.0.0.1.sslip.io.dokku.me" > "$DOKKU_ROOT/VHOST"
+  echo "127.0.0.1.sslip.io.dokku.me" >"$DOKKU_ROOT/VHOST"
   deploy_app
 
   check_urls http://${TEST_APP}.127.0.0.1.sslip.io.dokku.me
diff --git a/tests/unit/nginx-vhosts_6.bats b/tests/unit/nginx-vhosts_6.bats
index 38ad54a0b7f..0e01a5b3ef6 100644
--- a/tests/unit/nginx-vhosts_6.bats
+++ b/tests/unit/nginx-vhosts_6.bats
@@ -216,7 +216,7 @@ teardown() {
   echo "status: $status"
   assert_success
 
-  echo "invalid config" > "/home/dokku/${TEST_APP}/nginx.conf"
+  echo "invalid config" >"/home/dokku/${TEST_APP}/nginx.conf"
 
   run /bin/bash -c "dokku nginx:validate-config"
   echo "output: $output"
@@ -238,7 +238,7 @@ teardown() {
   echo "status: $status"
   assert_success
 
-  echo "invalid config" > "/home/dokku/${TEST_APP}/nginx.conf"
+  echo "invalid config" >"/home/dokku/${TEST_APP}/nginx.conf"
 
   run /bin/bash -c "dokku nginx:validate-config $TEST_APP --clean"
   echo "output: $output"
diff --git a/tests/unit/proxy.bats b/tests/unit/proxy.bats
index 8aef61c86f9..be69693fde1 100644
--- a/tests/unit/proxy.bats
+++ b/tests/unit/proxy.bats
@@ -100,7 +100,7 @@ teardown() {
   assert_success
 
   for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.web.*; do
-    assert_not_external_port $(< $CID_FILE)
+    assert_not_external_port $(<$CID_FILE)
   done
 
   run /bin/bash -c "dokku proxy:enable $TEST_APP"
@@ -110,7 +110,7 @@ teardown() {
   assert_http_success "${TEST_APP}.dokku.me"
 
   for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.web.*; do
-    assert_not_external_port $(< $CID_FILE)
+    assert_not_external_port $(<$CID_FILE)
   done
 }
 
diff --git a/tests/unit/ps-dockerfile-1.bats b/tests/unit/ps-dockerfile-1.bats
index bba89ed3072..f74aaf60fc7 100644
--- a/tests/unit/ps-dockerfile-1.bats
+++ b/tests/unit/ps-dockerfile-1.bats
@@ -19,7 +19,7 @@ teardown() {
   echo "status: $status"
   assert_success
   for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
-    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
+    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(<$CID_FILE)"
     echo "output: $output"
     echo "status: $status"
     assert_failure
@@ -30,7 +30,7 @@ teardown() {
   echo "status: $status"
   assert_success
   for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
-    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
+    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(<$CID_FILE)"
     echo "output: $output"
     echo "status: $status"
     assert_success
@@ -41,7 +41,7 @@ teardown() {
   echo "status: $status"
   assert_success
   for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
-    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
+    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(<$CID_FILE)"
     echo "output: $output"
     echo "status: $status"
     assert_success
@@ -52,7 +52,7 @@ teardown() {
   echo "status: $status"
   assert_success
   for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
-    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
+    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(<$CID_FILE)"
     echo "output: $output"
     echo "status: $status"
     assert_success
@@ -83,7 +83,7 @@ teardown() {
   deploy_app dockerfile
   CIDS=""
   for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.web.*; do
-    CIDS+=$(< $CID_FILE)
+    CIDS+=$(<$CID_FILE)
     CIDS+=" "
   done
   CIDS_PATTERN=$(echo $CIDS | sed -e "s: :|:g")
@@ -98,7 +98,7 @@ teardown() {
   assert_success
   CIDS=""
   for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.web.*; do
-    CIDS+=$(< $CID_FILE)
+    CIDS+=$(<$CID_FILE)
     CIDS+=" "
   done
   CIDS_PATTERN=$(echo $CIDS | sed -e "s: :|:g")
@@ -114,7 +114,7 @@ teardown() {
   CIDS=""
   shopt -s nullglob
   for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.web.*; do
-    CIDS+=$(< $CID_FILE)
+    CIDS+=$(<$CID_FILE)
     CIDS+=" "
   done
   run /bin/bash -c "[[ -z \"$CIDS\" ]]"
diff --git a/tests/unit/ps-dockerfile-2.bats b/tests/unit/ps-dockerfile-2.bats
index 35dae977fb1..30221a1dfdd 100644
--- a/tests/unit/ps-dockerfile-2.bats
+++ b/tests/unit/ps-dockerfile-2.bats
@@ -21,7 +21,7 @@ teardown() {
   deploy_app dockerfile-dokku-scale
   CIDS=""
   for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.web.*; do
-    CIDS+=$(< $CID_FILE)
+    CIDS+=$(<$CID_FILE)
     CIDS+=" "
   done
   CIDS_PATTERN=$(echo $CIDS | sed -e "s: :|:g")
@@ -48,7 +48,7 @@ teardown() {
   echo "status: $status"
   assert_success
   for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
-    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
+    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(<$CID_FILE)"
     echo "output: $output"
     echo "status: $status"
     assert_failure
@@ -59,7 +59,7 @@ teardown() {
   echo "status: $status"
   assert_success
   for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
-    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
+    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(<$CID_FILE)"
     echo "output: $output"
     echo "status: $status"
     assert_success
@@ -70,7 +70,7 @@ teardown() {
   echo "status: $status"
   assert_success
   for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
-    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
+    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(<$CID_FILE)"
     echo "output: $output"
     echo "status: $status"
     assert_success
@@ -81,7 +81,7 @@ teardown() {
   echo "status: $status"
   assert_success
   for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
-    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
+    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(<$CID_FILE)"
     echo "output: $output"
     echo "status: $status"
     assert_success
@@ -114,7 +114,7 @@ teardown() {
     assert_success
     goodlines=""
     for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.$PROC_TYPE.*; do
-      cid=$(< $CID_FILE)
+      cid=$(<$CID_FILE)
       assert_output_contains "$cid"
       goodlines+=$(echo "$output" | grep "$cid")
     done
@@ -133,7 +133,7 @@ teardown() {
     assert_success
     goodlines=""
     for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.$PROC_TYPE.*; do
-      cid=$(< $CID_FILE)
+      cid=$(<$CID_FILE)
       assert_output_contains "$cid"
       goodlines+=$(echo "$output" | grep "$cid")
     done
@@ -149,7 +149,7 @@ teardown() {
     CIDS=""
     shopt -s nullglob
     for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.$PROC_TYPE.*; do
-      CIDS+=$(< $CID_FILE)
+      CIDS+=$(<$CID_FILE)
       CIDS+=" "
     done
     shopt -u nullglob
diff --git a/tests/unit/ps-general.bats b/tests/unit/ps-general.bats
index 7c8a5bc3469..24b1edd9d72 100644
--- a/tests/unit/ps-general.bats
+++ b/tests/unit/ps-general.bats
@@ -30,7 +30,7 @@ teardown() {
   dokku config:set "$TEST_APP" key=value key=value=value
   deploy_app dockerfile
 
-  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  CID=$(<$DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
   run /bin/bash -c "dokku ps:inspect $TEST_APP"
   echo "output: $output"
   echo "status: $status"
@@ -40,7 +40,7 @@ teardown() {
 
 @test "(ps:scale) procfile commands extraction" {
   source "$PLUGIN_CORE_AVAILABLE_PATH/ps/functions"
-  cat <<EOF > "$DOKKU_LIB_ROOT/data/ps/$TEST_APP/Procfile"
+  cat <<EOF >"$DOKKU_LIB_ROOT/data/ps/$TEST_APP/Procfile"
 web: node web.js --port \$PORT
 worker: node worker.js
 EOF
@@ -67,7 +67,7 @@ EOF
   assert_output $'cron: 0\ncustom: 0\nrelease: 0\nweb: 1\nworker: 0'
 
   pushd $TMP
-  echo scaletest: sleep infinity >> Procfile
+  echo scaletest: sleep infinity >>Procfile
   git commit Procfile -m 'Add scaletest process'
   git push target master:master
 
@@ -115,7 +115,7 @@ EOF
 
   deploy_app dockerfile
 
-  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  CID=$(<$DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
   run /bin/bash -c "docker inspect -f '{{ .HostConfig.RestartPolicy.Name }}:{{ .HostConfig.RestartPolicy.MaximumRetryCount }}' $CID"
   echo "output: $output"
   echo "status: $status"
@@ -199,7 +199,6 @@ EOF
   assert_output_contains "bar"
 }
 
-
 @test "(ps:set) procfile-path" {
   run deploy_app dockerfile-procfile
   echo "output: $output"
diff --git a/tests/unit/ps-herokuish-1.bats b/tests/unit/ps-herokuish-1.bats
index 10178ca2100..ce2c133c78f 100644
--- a/tests/unit/ps-herokuish-1.bats
+++ b/tests/unit/ps-herokuish-1.bats
@@ -19,7 +19,7 @@ teardown() {
   echo "status: $status"
   assert_success
   for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
-    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
+    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(<$CID_FILE)"
     echo "output: $output"
     echo "status: $status"
     assert_failure
@@ -30,7 +30,7 @@ teardown() {
   echo "status: $status"
   assert_success
   for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
-    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
+    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(<$CID_FILE)"
     echo "output: $output"
     echo "status: $status"
     assert_success
@@ -41,7 +41,7 @@ teardown() {
   echo "status: $status"
   assert_success
   for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
-    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
+    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(<$CID_FILE)"
     echo "output: $output"
     echo "status: $status"
     assert_success
@@ -52,7 +52,7 @@ teardown() {
   echo "status: $status"
   assert_success
   for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
-    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
+    run /bin/bash -c "docker ps -q --no-trunc | grep -q $(<$CID_FILE)"
     echo "output: $output"
     echo "status: $status"
     assert_success
diff --git a/tests/unit/ps-herokuish-2.bats b/tests/unit/ps-herokuish-2.bats
index 0dc232717f3..ef6ba5a1ef7 100644
--- a/tests/unit/ps-herokuish-2.bats
+++ b/tests/unit/ps-herokuish-2.bats
@@ -23,7 +23,7 @@ teardown() {
   for PROC_TYPE in web worker; do
     CIDS=""
     for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.$PROC_TYPE.*; do
-      CIDS+=$(< $CID_FILE)
+      CIDS+=$(<$CID_FILE)
       CIDS+=" "
     done
     CIDS_PATTERN=$(echo $CIDS | sed -e "s: :|:g")
@@ -40,7 +40,7 @@ teardown() {
   for PROC_TYPE in web worker; do
     CIDS=""
     for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.$PROC_TYPE.*; do
-      CIDS+=$(< $CID_FILE)
+      CIDS+=$(<$CID_FILE)
       CIDS+=" "
     done
     CIDS_PATTERN=$(echo $CIDS | sed -e "s: :|:g")
@@ -58,7 +58,7 @@ teardown() {
     CIDS=""
     shopt -s nullglob
     for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.$PROC_TYPE.*; do
-      CIDS+=$(< $CID_FILE)
+      CIDS+=$(<$CID_FILE)
       CIDS+=" "
     done
     shopt -u nullglob
diff --git a/tests/unit/resource_1.bats b/tests/unit/resource_1.bats
index 85d2a19fb14..88836a46114 100644
--- a/tests/unit/resource_1.bats
+++ b/tests/unit/resource_1.bats
@@ -38,14 +38,14 @@ teardown() {
   echo "status: $status"
   assert_success
 
-  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  CID=$(<$DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
   run /bin/bash -c "docker inspect --format '{{.HostConfig.Memory}}' $CID"
   echo "output: $output"
   echo "status: $status"
   assert_output "0"
 
   dokku ps:rebuild "$TEST_APP"
-  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  CID=$(<$DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
   run /bin/bash -c "docker inspect --format '{{.HostConfig.Memory}}' $CID"
   echo "output: $output"
   echo "status: $status"
@@ -57,7 +57,7 @@ teardown() {
   assert_success
 
   dokku ps:rebuild "$TEST_APP"
-  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  CID=$(<$DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
   run /bin/bash -c "docker inspect --format '{{.HostConfig.Memory}}' $CID"
   echo "output: $output"
   echo "status: $status"
@@ -69,7 +69,7 @@ teardown() {
   assert_success
 
   dokku ps:rebuild "$TEST_APP"
-  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  CID=$(<$DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
   run /bin/bash -c "docker inspect --format '{{.HostConfig.Memory}}' $CID"
   echo "output: $output"
   echo "status: $status"
@@ -81,7 +81,7 @@ teardown() {
   assert_success
 
   dokku ps:rebuild "$TEST_APP"
-  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  CID=$(<$DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
   run /bin/bash -c "docker inspect --format '{{.HostConfig.Memory}}' $CID"
   echo "output: $output"
   echo "status: $status"
@@ -93,7 +93,7 @@ teardown() {
   assert_success
 
   dokku ps:rebuild "$TEST_APP"
-  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  CID=$(<$DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
   run /bin/bash -c "docker inspect --format '{{.HostConfig.Memory}}' $CID"
   echo "output: $output"
   echo "status: $status"
@@ -105,7 +105,7 @@ teardown() {
   assert_success
 
   dokku ps:rebuild "$TEST_APP"
-  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  CID=$(<$DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
   run /bin/bash -c "docker inspect --format '{{.HostConfig.Memory}}' $CID"
   echo "output: $output"
   echo "status: $status"
diff --git a/tests/unit/resource_2.bats b/tests/unit/resource_2.bats
index 2707bdd8a9c..44bc4198e96 100644
--- a/tests/unit/resource_2.bats
+++ b/tests/unit/resource_2.bats
@@ -24,14 +24,14 @@ teardown() {
   echo "status: $status"
   assert_success
 
-  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  CID=$(<$DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
   run /bin/bash -c "docker inspect --format '{{.HostConfig.MemoryReservation}}' $CID"
   echo "output: $output"
   echo "status: $status"
   assert_output "0"
 
   dokku ps:rebuild "$TEST_APP"
-  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  CID=$(<$DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
   run /bin/bash -c "docker inspect --format '{{.HostConfig.MemoryReservation}}' $CID"
   echo "output: $output"
   echo "status: $status"
@@ -48,7 +48,7 @@ teardown() {
   assert_success
 
   dokku ps:rebuild "$TEST_APP"
-  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  CID=$(<$DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
   run /bin/bash -c "docker inspect --format '{{.HostConfig.MemoryReservation}}' $CID"
   echo "output: $output"
   echo "status: $status"
@@ -60,7 +60,7 @@ teardown() {
   assert_success
 
   dokku ps:rebuild "$TEST_APP"
-  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  CID=$(<$DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
   run /bin/bash -c "docker inspect --format '{{.HostConfig.MemoryReservation}}' $CID"
   echo "output: $output"
   echo "status: $status"
@@ -72,7 +72,7 @@ teardown() {
   assert_success
 
   dokku ps:rebuild "$TEST_APP"
-  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  CID=$(<$DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
   run /bin/bash -c "docker inspect --format '{{.HostConfig.MemoryReservation}}' $CID"
   echo "output: $output"
   echo "status: $status"
@@ -84,7 +84,7 @@ teardown() {
   assert_success
 
   dokku ps:rebuild "$TEST_APP"
-  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  CID=$(<$DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
   run /bin/bash -c "docker inspect --format '{{.HostConfig.MemoryReservation}}' $CID"
   echo "output: $output"
   echo "status: $status"
diff --git a/tests/unit/run_2.bats b/tests/unit/run_2.bats
index 0be97ab6741..607ea4a8c67 100644
--- a/tests/unit/run_2.bats
+++ b/tests/unit/run_2.bats
@@ -49,7 +49,7 @@ teardown() {
   echo "output: $output"
   echo "status: $status"
   assert_success
-  sleep 5  # wait for dokku cleanup to happen in the background
+  sleep 5 # wait for dokku cleanup to happen in the background
 }
 
 @test "(core) run (with tty)" {
diff --git a/tests/unit/ssh_keys.bats b/tests/unit/ssh_keys.bats
index 37f079c1ecd..33dc3a2ee24 100644
--- a/tests/unit/ssh_keys.bats
+++ b/tests/unit/ssh_keys.bats
@@ -14,14 +14,17 @@ setup() {
   create_key
 
   # Test key without a trailing newline
-  echo -n "$KEY" > /tmp/testkey-no-newline.pub
+  echo -n "$KEY" >/tmp/testkey-no-newline.pub
 
   # the temporary key is useful for adding in the file with two keys
   # useful for a negative test
-  { cat /tmp/testkey.pub ; echo "$KEY" ; } > /tmp/testkey-double.pub
+  {
+    cat /tmp/testkey.pub
+    echo "$KEY"
+  } >/tmp/testkey-double.pub
 
   # another negative test input
-  echo 'invalid!' > /tmp/testkey-invalid.pub
+  echo 'invalid!' >/tmp/testkey-invalid.pub
 
   # save current authorized_keys to remove all changes afterwards
   cp "${DOKKU_ROOT:-/home/dokku}/.ssh/authorized_keys" /tmp/testkey-authorized_keys
@@ -294,7 +297,6 @@ teardown() {
   assert_equal "$output" "1"
 }
 
-
 @test "(ssh-keys) ssh-keys:list --format invalid" {
   run /bin/bash -c "dokku ssh-keys:list --format invalid"
   echo "output: $output"