diff --git a/.mega-linter.yml b/.mega-linter.yml
index a1a7d81..4413f17 100644
--- a/.mega-linter.yml
+++ b/.mega-linter.yml
@@ -9,6 +9,7 @@ APPLY_FIXES: none
 # If you use ENABLE_LINTERS variable, all other linters will be disabled by
 # default
 ENABLE_LINTERS:
+  - BASH_SHELLCHECK
   - MARKDOWN_MARKDOWNLINT
 
 # Ignore the pull request template
diff --git a/Makefile b/Makefile
index 0ad05e3..df5440a 100644
--- a/Makefile
+++ b/Makefile
@@ -39,4 +39,4 @@ megalint-fix:  ## Run the mega-linter and attempt to auto fix any issues.
 clean-megalint: ## Clean the temporary files.
 	rm -rf megalinter-reports
 
-lint-check: clean_megalint megalint
+lint-check: clean-megalint megalint
diff --git a/src/test/resources/setup_pubsub.sh b/src/test/resources/setup_pubsub.sh
index 097e508..78bbcac 100755
--- a/src/test/resources/setup_pubsub.sh
+++ b/src/test/resources/setup_pubsub.sh
@@ -1,18 +1,18 @@
 #!/bin/sh
 
 # Wait for pubsub-emulator to come up
-bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' '$PUBSUB_SETUP_HOST')" != "200" ]]; do sleep 1; done'
+bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' '"$PUBSUB_SETUP_HOST"')" != "200" ]]; do sleep 1; done'
 
-curl -X PUT http://$PUBSUB_SETUP_HOST/v1/projects/our-project/topics/event_uac-update
-curl -X PUT http://$PUBSUB_SETUP_HOST/v1/projects/our-project/subscriptions/event_uac-update_rh -H 'Content-Type: application/json' -d '{"topic": "projects/our-project/topics/event_uac-update"}'
+curl -X PUT http://"$PUBSUB_SETUP_HOST"/v1/projects/our-project/topics/event_uac-update
+curl -X PUT http://"$PUBSUB_SETUP_HOST"/v1/projects/our-project/subscriptions/event_uac-update_rh -H 'Content-Type: application/json' -d '{"topic": "projects/our-project/topics/event_uac-update"}'
 
-curl -X PUT http://$PUBSUB_SETUP_HOST/v1/projects/our-project/topics/event_case-update
-curl -X PUT http://$PUBSUB_SETUP_HOST/v1/projects/our-project/subscriptions/event_case-update_rh -H 'Content-Type: application/json' -d '{"topic": "projects/our-project/topics/event_case-update"}'
+curl -X PUT http://"$PUBSUB_SETUP_HOST"/v1/projects/our-project/topics/event_case-update
+curl -X PUT http://"$PUBSUB_SETUP_HOST"/v1/projects/our-project/subscriptions/event_case-update_rh -H 'Content-Type: application/json' -d '{"topic": "projects/our-project/topics/event_case-update"}'
 
-curl -X PUT http://$PUBSUB_SETUP_HOST/v1/projects/our-project/topics/event_collection-exercise-update
-curl -X PUT http://$PUBSUB_SETUP_HOST/v1/projects/our-project/subscriptions/event_collection-exercise-update_rh -H 'Content-Type: application/json' -d '{"topic": "projects/our-project/topics/event_collection-exercise-update"}'
+curl -X PUT http://"$PUBSUB_SETUP_HOST"/v1/projects/our-project/topics/event_collection-exercise-update
+curl -X PUT http://"$PUBSUB_SETUP_HOST"/v1/projects/our-project/subscriptions/event_collection-exercise-update_rh -H 'Content-Type: application/json' -d '{"topic": "projects/our-project/topics/event_collection-exercise-update"}'
 
-curl -X PUT http://$PUBSUB_SETUP_HOST/v1/projects/our-project/topics/event_survey-update
+curl -X PUT http://"$PUBSUB_SETUP_HOST"/v1/projects/our-project/topics/event_survey-update
 
-curl -X PUT http://$PUBSUB_SETUP_HOST/v1/projects/our-project/topics/event_eq-launch
-curl -X PUT http://$PUBSUB_SETUP_HOST/v1/projects/our-project/subscriptions/event_eq-launch -H 'Content-Type: application/json' -d '{"topic": "projects/our-project/topics/event_eq-launch"}'
+curl -X PUT http://"$PUBSUB_SETUP_HOST"/v1/projects/our-project/topics/event_eq-launch
+curl -X PUT http://"$PUBSUB_SETUP_HOST"/v1/projects/our-project/subscriptions/event_eq-launch -H 'Content-Type: application/json' -d '{"topic": "projects/our-project/topics/event_eq-launch"}'