diff --git a/scripts/run_integration_tests.sh b/scripts/run_integration_tests.sh
index c67a4a08..df1db4cf 100755
--- a/scripts/run_integration_tests.sh
+++ b/scripts/run_integration_tests.sh
@@ -3,22 +3,16 @@
 # all: ./scripts/run_integration_tests.sh
 # single: ./scripts/run_integration_tests.sh integration_tests/web/test_async_web_client.py
 
+set -e
+
 script_dir=`dirname $0`
 cd ${script_dir}/..
 
-test_target="$1"
-python_version=`python --version | awk '{print $2}'`
-pip install -U pip && \
-  pip install -r requirements/testing.txt && \
-  pip install -r requirements/optional.txt && \
+pip install -U pip
+pip install -r requirements/testing.txt \
+  -r requirements/optional.txt
+
+python setup.py codegen
 
-if [[ $test_target != "" ]]
-then
-  black slack_sdk/ slack/ tests/ && \
-    python setup.py codegen && \
-    python setup.py integration_tests --test-target $1
-else
-  black slack_sdk/ slack/ tests/ && \
-    python setup.py codegen && \
-    python setup.py integration_tests
-fi
+test_target="${1:-integration_tests/}"
+python setup.py integration_tests --test-target $test_target
diff --git a/scripts/run_unit_tests.sh b/scripts/run_unit_tests.sh
index b9090c01..35c3bfda 100755
--- a/scripts/run_unit_tests.sh
+++ b/scripts/run_unit_tests.sh
@@ -3,22 +3,16 @@
 # all: ./scripts/run_unit_tests.sh
 # single: ./scripts/run_unit_tests.sh tests/slack_sdk_async/web/test_web_client_coverage.py
 
+set -e
+
 script_dir=`dirname $0`
 cd ${script_dir}/..
 
-test_target="$1"
-python_version=`python --version | awk '{print $2}'`
-pip install -U pip && \
-  pip install -r requirements/testing.txt && \
-  pip install -r requirements/optional.txt && \
+pip install -U pip
+pip install -r requirements/testing.txt \
+  -r requirements/optional.txt
+
+python setup.py codegen
 
-if [[ $test_target != "" ]]
-then
-  black slack_sdk/ slack/ tests/ && \
-    python setup.py codegen && \
-    python setup.py unit_tests --test-target $1
-else
-  black slack_sdk/ slack/ tests/ && \
-    python setup.py codegen && \
-    python setup.py unit_tests
-fi
+test_target="${1:-tests/}"
+python setup.py unit_tests --test-target $test_target
diff --git a/scripts/run_validation.sh b/scripts/run_validation.sh
index cca0dd8e..b09e3f09 100755
--- a/scripts/run_validation.sh
+++ b/scripts/run_validation.sh
@@ -1,11 +1,17 @@
 #!/bin/bash
 # ./scripts/run_validation.sh
 
+set -e
+
 script_dir=`dirname $0`
 cd ${script_dir}/..
-pip install -U pip && \
-  pip install -r requirements/testing.txt && \
-  pip install -r requirements/optional.txt && \
-  black slack_sdk/ slack/ tests/ integration_tests/ && \
-  python setup.py codegen && \
-  python setup.py validate
+pip install -U pip
+pip install -r requirements/testing.txt \
+  -r requirements/optional.txt
+
+black --check tests/ integration_tests/
+# TODO: resolve linting errors for tests
+# flake8 tests/ integration_tests/
+
+python setup.py codegen
+python setup.py validate