diff --git a/ui/admin/tests/acceptance/accounts/change-password-test.js b/ui/admin/tests/acceptance/accounts/change-password-test.js
index e7264dcc3..e3226fe0c 100644
--- a/ui/admin/tests/acceptance/accounts/change-password-test.js
+++ b/ui/admin/tests/acceptance/accounts/change-password-test.js
@@ -77,7 +77,8 @@ module('Acceptance | accounts | change password', function (hooks) {
 
   test('can change password for account', async function (assert) {
     assert.expect(2);
-    // TODO: Failing due to a11y violation while in dark mode.
+    // TODO: address issue with ICU-15021
+    // Failing due to a11y violation while in dark mode.
     // Investigating issue with styles not properly
     // being applied during test.
     const session = this.owner.lookup('service:session');
diff --git a/ui/admin/tests/acceptance/roles/global-scope-test.js b/ui/admin/tests/acceptance/roles/global-scope-test.js
index 5e0a2dea4..d4a9fbd8b 100644
--- a/ui/admin/tests/acceptance/roles/global-scope-test.js
+++ b/ui/admin/tests/acceptance/roles/global-scope-test.js
@@ -114,7 +114,8 @@ module('Acceptance | roles | global-scope', function (hooks) {
   });
 
   test('visiting role scopes', async function (assert) {
-    // TODO: Failing due to a11y violation while in dark mode.
+    // TODO: address issue with ICU-15021
+    // Failing due to a11y violation while in dark mode.
     // Investigating issue with styles not properly
     // being applied during test.
     const session = this.owner.lookup('service:session');
@@ -399,7 +400,8 @@ module('Acceptance | roles | global-scope', function (hooks) {
   });
 
   test('user can save custom scopes to add on manage custom scopes page', async function (assert) {
-    // TODO: Failing due to a11y violation while in dark mode.
+    // TODO: address issue with ICU-15021
+    // Failing due to a11y violation while in dark mode.
     // Investigating issue with styles not properly
     // being applied during test.
     const session = this.owner.lookup('service:session');
diff --git a/ui/admin/tests/acceptance/roles/org-scope-test.js b/ui/admin/tests/acceptance/roles/org-scope-test.js
index 601fae735..96d37e6d6 100644
--- a/ui/admin/tests/acceptance/roles/org-scope-test.js
+++ b/ui/admin/tests/acceptance/roles/org-scope-test.js
@@ -107,7 +107,8 @@ module('Acceptance | roles | org-scope', function (hooks) {
   });
 
   test('visiting role scopes', async function (assert) {
-    // TODO: Failing due to a11y violation while in dark mode.
+    // TODO: address issue with ICU-15021
+    // Failing due to a11y violation while in dark mode.
     // Investigating issue with styles not properly
     // being applied during test.
     const session = this.owner.lookup('service:session');
diff --git a/ui/admin/tests/acceptance/scopes/read-test.js b/ui/admin/tests/acceptance/scopes/read-test.js
index 4ae6d78c9..ced060735 100644
--- a/ui/admin/tests/acceptance/scopes/read-test.js
+++ b/ui/admin/tests/acceptance/scopes/read-test.js
@@ -74,7 +74,8 @@ module('Acceptance | scopes | read', function (hooks) {
   });
 
   test('visiting global scope settings when feature flag is enabled', async function (assert) {
-    // TODO: Failing due to a11y violation while in dark mode.
+    // TODO: address issue with ICU-15021
+    // Failing due to a11y violation while in dark mode.
     // Investigating issue with styles not properly
     // being applied during test.
     const session = this.owner.lookup('service:session');
diff --git a/ui/admin/tests/acceptance/session-recordings/read-test.js b/ui/admin/tests/acceptance/session-recordings/read-test.js
index 1deae5fda..325331882 100644
--- a/ui/admin/tests/acceptance/session-recordings/read-test.js
+++ b/ui/admin/tests/acceptance/session-recordings/read-test.js
@@ -68,7 +68,8 @@ module('Acceptance | session-recordings | read', function (hooks) {
   });
 
   test('visiting a session recording', async function (assert) {
-    // TODO: Failing due to a11y violation while in dark mode.
+    // TODO: address issue with ICU-15021
+    // Failing due to a11y violation while in dark mode.
     // Investigating issue with styles not properly
     // being applied during test.
     const session = this.owner.lookup('service:session');
diff --git a/ui/admin/tests/acceptance/targets/workers-test.js b/ui/admin/tests/acceptance/targets/workers-test.js
index e7ebb8f3d..4a73e4eaf 100644
--- a/ui/admin/tests/acceptance/targets/workers-test.js
+++ b/ui/admin/tests/acceptance/targets/workers-test.js
@@ -80,7 +80,8 @@ module('Acceptance | targets | workers', function (hooks) {
   });
 
   test('visiting target workers', async function (assert) {
-    // TODO: Failing due to a11y violation while in dark mode.
+    // TODO: address issue with ICU-15021
+    // Failing due to a11y violation while in dark mode.
     // Investigating issue with styles not properly
     // being applied during test.
     const session = this.owner.lookup('service:session');
diff --git a/ui/admin/tests/acceptance/workers/read-test.js b/ui/admin/tests/acceptance/workers/read-test.js
index a4943d039..a49566639 100644
--- a/ui/admin/tests/acceptance/workers/read-test.js
+++ b/ui/admin/tests/acceptance/workers/read-test.js
@@ -58,7 +58,8 @@ module('Acceptance | workers | read', function (hooks) {
   });
 
   test('visiting worker', async function (assert) {
-    // TODO: Failing due to a11y violation while in dark mode.
+    // TODO: address issue with ICU-15021
+    // Failing due to a11y violation while in dark mode.
     // Investigating issue with styles not properly
     // being applied during test.
     const session = this.owner.lookup('service:session');
diff --git a/ui/desktop/tests/acceptance/projects/sessions/index-test.js b/ui/desktop/tests/acceptance/projects/sessions/index-test.js
index 8fd3986a9..eeee1b09f 100644
--- a/ui/desktop/tests/acceptance/projects/sessions/index-test.js
+++ b/ui/desktop/tests/acceptance/projects/sessions/index-test.js
@@ -196,7 +196,8 @@ module('Acceptance | projects | sessions | index', function (hooks) {
   });
 
   test('visiting sessions without targets is OK', async function (assert) {
-    // TODO: Failing due to a11y violation while in dark mode.
+    // TODO: address issue with ICU-15021
+    // Failing due to a11y violation while in dark mode.
     // Investigating issue with styles not properly
     // being applied during test.
     const session = this.owner.lookup('service:session');
diff --git a/ui/desktop/tests/acceptance/projects/targets/index-test.js b/ui/desktop/tests/acceptance/projects/targets/index-test.js
index b74aec8fa..db0a11702 100644
--- a/ui/desktop/tests/acceptance/projects/targets/index-test.js
+++ b/ui/desktop/tests/acceptance/projects/targets/index-test.js
@@ -175,7 +175,8 @@ module('Acceptance | projects | targets | index', function (hooks) {
   });
 
   test('visiting targets index', async function (assert) {
-    // TODO: Failing due to a11y violation while in dark mode.
+    // TODO: address issue with ICU-15021
+    // Failing due to a11y violation while in dark mode.
     // Investigating issue with styles not properly
     // being applied during test.
     const session = this.owner.lookup('service:session');
diff --git a/ui/desktop/tests/acceptance/scopes-test.js b/ui/desktop/tests/acceptance/scopes-test.js
index 9e12af156..af0db0750 100644
--- a/ui/desktop/tests/acceptance/scopes-test.js
+++ b/ui/desktop/tests/acceptance/scopes-test.js
@@ -157,7 +157,8 @@ module('Acceptance | scopes', function (hooks) {
   });
 
   test('visiting global scope', async function (assert) {
-    // TODO: Failing due to a11y violation while in dark mode.
+    // TODO: address issue with ICU-15021
+    // Failing due to a11y violation while in dark mode.
     // Investigating issue with styles not properly
     // being applied during test.
     const session = this.owner.lookup('service:session');
@@ -175,7 +176,8 @@ module('Acceptance | scopes', function (hooks) {
   // In order to resolve this, we might hoist authentication routes up from
   // under scopes.
   test('visiting global scope is not successful when the global scope cannot be fetched', async function (assert) {
-    // TODO: Failing due to a11y violation while in dark mode.
+    // TODO: address issue with ICU-15021
+    // Failing due to a11y violation while in dark mode.
     // Investigating issue with styles not properly
     // being applied during test.
     const session = this.owner.lookup('service:session');
@@ -194,7 +196,8 @@ module('Acceptance | scopes', function (hooks) {
   });
 
   test('visiting org scope', async function (assert) {
-    // TODO: Failing due to a11y violation while in dark mode.
+    // TODO: address issue with ICU-15021
+    // Failing due to a11y violation while in dark mode.
     // Investigating issue with styles not properly
     // being applied during test.
     const session = this.owner.lookup('service:session');