diff --git a/buildspec-localmodetests.yml b/buildspec-localmodetests.yml
index ccbcf1a62d..141b7bceb1 100644
--- a/buildspec-localmodetests.yml
+++ b/buildspec-localmodetests.yml
@@ -11,15 +11,16 @@ phases:
 
       # local mode tests
       - start_time=`date +%s`
+      - HAS_MATCHING_CHANGES_OUTPUT=$(has-matching-changes "tests/" "src/*.py" "setup.py" "setup.cfg" "buildspec.yml")
       - |
-        if has-matching-changes "tests/" "src/*.py" "setup.py" "setup.cfg" "buildspec.yml"; then
+        if [ "$HAS_MATCHING_CHANGES" = "Changes Found" ] ; then
           tox -e py36 -- tests/integ -m local_mode --durations 50
         fi
       - ./ci-scripts/displaytime.sh 'py36 local mode' $start_time
 
       - start_time=`date +%s`
       - |
-        if has-matching-changes "tests/" "src/*.py" "setup.py" "setup.cfg" "buildspec.yml"; then
+        if [ "$HAS_MATCHING_CHANGES" = "Changes Found" ] ; then
           tox -e py27 -- tests/integ -m local_mode --durations 50
         fi
       - ./ci-scripts/displaytime.sh 'py27 local mode' $start_time
diff --git a/buildspec-notebooktests.yml b/buildspec-notebooktests.yml
index a69ea4f248..548f5d7d90 100644
--- a/buildspec-notebooktests.yml
+++ b/buildspec-notebooktests.yml
@@ -6,8 +6,9 @@ phases:
       # run notebook test
       - echo "running notebook test"
       - start_time=`date +%s`
+      - HAS_MATCHING_CHANGES_OUTPUT=$(has-matching-changes "src/*.py" "setup.py" "setup.cfg" "tests/scripts/run-notebook-test.sh")
       - |
-        if has-matching-changes "src/*.py" "setup.py" "setup.cfg" "tests/scripts/run-notebook-test.sh"; then
+        if [ "$HAS_MATCHING_CHANGES" = "Changes Found" ] ; then
           ./tests/scripts/run-notebook-test.sh
         fi
       - ./ci-scripts/displaytime.sh 'notebook test' $start_time
diff --git a/buildspec.yml b/buildspec.yml
index 4d483a54d1..1a4ec71025 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -11,15 +11,16 @@ phases:
 
       # run integration tests
       - start_time=`date +%s`
+      - HAS_MATCHING_CHANGES_OUTPUT=$(has-matching-changes "tests/" "src/*.py" "setup.py" "setup.cfg" "buildspec.yml")
       - |
-        if has-matching-changes "tests/" "src/*.py" "setup.py" "setup.cfg" "buildspec.yml"; then
+        if [ "$HAS_MATCHING_CHANGES" = "Changes Found" ] ; then
           python3 -u ci-scripts/queue_build.py
         fi
       - ./ci-scripts/displaytime.sh 'build queue' $start_time
 
       - start_time=`date +%s`
       - |
-        if has-matching-changes "tests/" "src/*.py" "setup.py" "setup.cfg" "buildspec.yml"; then
+        if [ "$HAS_MATCHING_CHANGES" = "Changes Found" ] ; then
           tox -e py36 -- tests/integ -m "not local_mode" -n 512 --reruns 3 --reruns-delay 5 --durations 50 --boto-config '{"region_name": "us-east-2"}'
         fi
       - ./ci-scripts/displaytime.sh 'py36 tests/integ' $start_time