diff --git a/eventstore/tests/test_hcs_tasks.py b/eventstore/tests/test_hcs_tasks.py
index b45b290d..47f523b7 100644
--- a/eventstore/tests/test_hcs_tasks.py
+++ b/eventstore/tests/test_hcs_tasks.py
@@ -8,7 +8,7 @@
 
 class UpdateTurnContactTaskTest(TestCase):
     @responses.activate
-    @override_settings(HC_TURN_URL="https://turn", HC_TURN_TOKEN="token")  # noqa: S106 - Its OK to hardcode passwords in tests
+    @override_settings(HC_TURN_URL="https://turn", HC_TURN_TOKEN="token")  # noqa: S106 - Fake password/token for test purposes
     def test_update_turn_contact_task(self):
         responses.add(
             responses.PATCH,
diff --git a/eventstore/tests/test_tasks.py b/eventstore/tests/test_tasks.py
index 13b1e681..567bb3af 100644
--- a/eventstore/tests/test_tasks.py
+++ b/eventstore/tests/test_tasks.py
@@ -596,13 +596,13 @@ def setUp(self):
     @responses.activate
     @override_settings(
         TURN_URL="https://turn/",
-        TURN_TOKEN="token",  # noqa: S106 - Its OK to hardcode passwords in tests
+        TURN_TOKEN="token",  # noqa: S106 - Fake password/token for test purposes
         EXTERNAL_REGISTRATIONS_V2=True,
         SLACK_CHANNEL="test-slack",
         SLACK_URL="http://slack.com",
         RAPIDPRO_URL="rapidpro",
-        RAPIDPRO_TOKEN="rapidpro-token",  # noqa: S106 - Its OK to hardcode passwords in tests
-        SLACK_TOKEN="slack-token",  # noqa: S106 - Its OK to hardcode passwords in tests
+        RAPIDPRO_TOKEN="rapidpro-token",  # noqa: S106 - Fake password/token for test purposes
+        SLACK_TOKEN="slack-token",  # noqa: S106 - Fake password/token for test purposes
     )
     def test_post_random_contacts_to_slack_channel(self):
         responses.add(
@@ -678,7 +678,7 @@ def test_post_random_contacts_to_slack_channel(self):
         )
 
     @responses.activate
-    @override_settings(TURN_URL="https://turn/", TURN_TOKEN="token")  # noqa: S106 - Its OK to hardcode passwords in tests
+    @override_settings(TURN_URL="https://turn/", TURN_TOKEN="token")  # noqa: S106 - Fake password/token for test purposes
     def test_get_random_contact(self):
         responses.add(
             responses.GET,
@@ -711,7 +711,7 @@ def setUp(self):
         tasks.rapidpro = TembaClient("textit.in", "test-token")
 
     @responses.activate
-    @override_settings(TURN_URL="http://turn/", TURN_TOKEN="token")  # noqa: S106 - Its OK to hardcode passwords in tests
+    @override_settings(TURN_URL="http://turn/", TURN_TOKEN="token")  # noqa: S106 - Fake password/token for test purposes
     def test_get_turn_profile_link(self):
         responses.add(
             responses.GET,
@@ -772,7 +772,7 @@ def setUp(self):
         ]
 
     @responses.activate
-    @override_settings(SLACK_URL="http://slack.com", SLACK_TOKEN="slack_token")  # noqa: S106 - Its OK to hardcode passwords in tests
+    @override_settings(SLACK_URL="http://slack.com", SLACK_TOKEN="slack_token")  # noqa: S106 - Fake password/token for test purposes
     def test_send_slack_message(self):
         responses.add(
             responses.POST,