diff --git a/roles/oneagent/tests/resources/installers/Dynatrace-OneAgent-Linux.sh b/roles/oneagent/tests/resources/installers/Dynatrace-OneAgent-Linux.sh
index 796e4a6..52a2a2c 100644
--- a/roles/oneagent/tests/resources/installers/Dynatrace-OneAgent-Linux.sh
+++ b/roles/oneagent/tests/resources/installers/Dynatrace-OneAgent-Linux.sh
@@ -1,20 +1,20 @@
-#!/bin/sh
+#!/bin/bash -eu
 
 # This script acts as a self contained installer of the procuct
 
-set -e
-
 readonly DEFAULT_INSTALL_DIR="/opt/dynatrace/oneagent"
 readonly INSTALLER_VERSION="##VERSION##"
 readonly DEPLOYMENT_CONF_PATH="/var/lib/dynatrace/oneagent/agent/config"
 
 readonly UNINSTALL_SCRIPT="uninstall.sh"
+# shellcheck disable=SC2155
 readonly UNINSTALL_CODE="$(cat <<-ENDUNINSTALL
 ##UNINSTALL_CODE##
 ENDUNINSTALL
 )"
 
 readonly ONEAGENTCTL_BIN="oneagentctl"
+# shellcheck disable=SC2155
 readonly ONEAGENTCTL_CODE="$(cat <<-ENDCTL
 ##ONEAGENTCTL_CODE##
 ENDCTL
@@ -61,6 +61,7 @@ deployUninstallScript() {
 }
 
 applyConfig() {
+	# shellcheck disable=SC2086
 	"${INSTALL_DIR}/agent/tools/${ONEAGENTCTL_BIN}" ${CTL_PARAMS}
 }
 
diff --git a/roles/oneagent/tests/resources/installers/oneagentctl.sh b/roles/oneagent/tests/resources/installers/oneagentctl.sh
index 08da32a..0914407 100644
--- a/roles/oneagent/tests/resources/installers/oneagentctl.sh
+++ b/roles/oneagent/tests/resources/installers/oneagentctl.sh
@@ -1,9 +1,6 @@
-#!/bin/bash
+#!/bin/bash -eu
 
 # This file simulates deployment functionalities of oneagentctl binary, used to configure installation.
-
-set -e
-
 readonly INSTALLER_VERSION="##VERSION##"
 readonly DEPLOYMENT_CONF_PATH="/var/lib/dynatrace/oneagent/agent/config"
 
@@ -14,6 +11,7 @@ cutVariable() {
 	printf "%s" "${variable}" | cut -d "${delimiter}" -f "${fields}"
 }
 
+# shellcheck disable=SC2155
 saveToConfig() {
 	while [ $# -gt 0 ]; do
 		# example command: --set-host-property=TENANT=tenant1
@@ -36,6 +34,7 @@ saveToConfig() {
 }
 
 readFromConfig() {
+	# shellcheck disable=SC2155
 	local getterType="$(cutVariable "${1}" "-" "5-")"
 
 	if [ "${getterType}" = "properties" ]; then
@@ -49,7 +48,7 @@ main() {
 	if [ "${1}" = '--version' ]; then
 		printf '%s\n' "${INSTALLER_VERSION}"
 	elif printf "%s" "${1}" | grep -q "^--get"; then
-		readFromConfig ${1}
+		readFromConfig "${1}"
 	elif printf "%s" "${1}" | grep -q "^--set"; then
 		saveToConfig "$@"
 	fi