diff --git a/lib/utils/text-utils.js b/lib/utils/text-utils.js
index d0c703130..35532675f 100644
--- a/lib/utils/text-utils.js
+++ b/lib/utils/text-utils.js
@@ -1,46 +1,46 @@
 // @flow
 
 function pluralize(
   nouns: $ReadOnlyArray<string>,
   maxNumberOfNouns: number = 3,
 ): string {
   if (nouns.length === 0 || maxNumberOfNouns <= 0) {
     return '';
   } else if (nouns.length === 1) {
     return nouns[0];
   } else if (maxNumberOfNouns === 1) {
     return `${nouns.length} users`;
   }
 
   const comma = maxNumberOfNouns > 2 && nouns.length > 2 ? ',' : '';
   if (nouns.length <= maxNumberOfNouns) {
     const prefix = nouns.slice(0, -1).join(', ');
     return `${prefix}${comma} and ${nouns[nouns.length - 1]}`;
   }
   const prefix = nouns.slice(0, maxNumberOfNouns - 1).join(', ');
   return `${prefix}${comma} and ${nouns.length - maxNumberOfNouns + 1} others`;
 }
 
 function trimText(text: string, maxLength: number): string {
   if (text.length <= maxLength) {
     return text;
   } else if (maxLength <= 3) {
     return text.substring(0, maxLength);
   }
   return `${text.substring(0, maxLength - 3)}...`;
 }
 
 function pluralizeAndTrim(
   nouns: $ReadOnlyArray<string>,
   maxLength: number,
 ): string {
   for (let maxNumberOfNouns = 3; maxNumberOfNouns >= 2; --maxNumberOfNouns) {
     const text = pluralize(nouns, maxNumberOfNouns);
     if (text.length <= maxLength) {
       return text;
     }
   }
-  return pluralize(nouns, 1);
+  return trimText(pluralize(nouns, 1), maxLength);
 }
 
 export { pluralize, trimText, pluralizeAndTrim };
diff --git a/lib/utils/text-utils.test.js b/lib/utils/text-utils.test.js
index 200a347ab..883194273 100644
--- a/lib/utils/text-utils.test.js
+++ b/lib/utils/text-utils.test.js
@@ -1,116 +1,226 @@
 // @flow
 
-import { pluralize, trimText } from './text-utils.js';
+import { pluralize, trimText, pluralizeAndTrim } from './text-utils.js';
 
 describe('pluralize(nouns, maxNumberOfNouns)', () => {
   it('should return an empty string when no words are given', () => {
     expect(pluralize([])).toBe('');
   });
 
   it('should return a single word when a single word is given', () => {
     expect(pluralize(['a'])).toBe('a');
   });
 
   it('should return "X and Y" when two words are given', () => {
     expect(pluralize(['a', 'b'])).toBe('a and b');
   });
 
   it('should return "X, Y, and Z" when three words are given', () => {
     expect(pluralize(['a', 'b', 'c'])).toBe('a, b, and c');
   });
 
-  it('should return "X, Y, and {N-2} others" when N (>=4) words are given', () => {
-    expect(pluralize(['a', 'b', 'c', 'd'])).toBe('a, b, and 2 others');
-    expect(pluralize(['a', 'b', 'c', 'd', 'e'])).toBe('a, b, and 3 others');
-    expect(pluralize(['a', 'b', 'c', 'd', 'e', 'f'])).toBe(
-      'a, b, and 4 others',
-    );
-  });
-
-  it('should return "X, Y, and Z" when three words are given and maxNumNouns = 3', () => {
-    expect(pluralize(['a', 'b', 'c'])).toBe('a, b, and c');
-  });
-
-  it('should return "X and 2 others" when three words are given and maxNumNouns = 2', () => {
-    expect(pluralize(['cat', 'dog', 'sheep'], 2)).toBe('cat and 2 others');
-  });
-
-  it('should return "3 users" when three words are given and maxNumNouns = 1', () => {
-    expect(pluralize(['cat', 'dog', 'sheep'], 1)).toBe('3 users');
-  });
-
-  it('should return an empty string when three words are given and maxNumNouns = 0', () => {
-    expect(pluralize(['cat', 'dog', 'sheep'], 0)).toBe('');
-  });
-
-  it('should return "A, B, C, and D" when four words are given and maxNumNouns = 5', () => {
-    expect(pluralize(['cat', 'dog', 'sheep', 'moose'], 5)).toBe(
-      'cat, dog, sheep, and moose',
-    );
-  });
+  it(
+    'should return "X, Y, and {N-2} others"' + ' when N (>=4) words are given',
+    () => {
+      expect(pluralize(['a', 'b', 'c', 'd'])).toBe('a, b, and 2 others');
+      expect(pluralize(['a', 'b', 'c', 'd', 'e'])).toBe('a, b, and 3 others');
+      expect(pluralize(['a', 'b', 'c', 'd', 'e', 'f'])).toBe(
+        'a, b, and 4 others',
+      );
+    },
+  );
+
+  it(
+    'should return "X, Y, and Z"' +
+      ' when three words are given and maxNumNouns = 3',
+    () => {
+      expect(pluralize(['a', 'b', 'c'])).toBe('a, b, and c');
+    },
+  );
+
+  it(
+    'should return "X and 2 others"' +
+      ' when three words are given and maxNumNouns = 2',
+    () => {
+      expect(pluralize(['cat', 'dog', 'sheep'], 2)).toBe('cat and 2 others');
+    },
+  );
+
+  it(
+    'should return "3 users"' +
+      ' when three words are given and maxNumNouns = 1',
+    () => {
+      expect(pluralize(['cat', 'dog', 'sheep'], 1)).toBe('3 users');
+    },
+  );
+
+  it(
+    'should return an empty string' +
+      ' when three words are given and maxNumNouns = 0',
+    () => {
+      expect(pluralize(['cat', 'dog', 'sheep'], 0)).toBe('');
+    },
+  );
+
+  it(
+    'should return "A, B, C, and D"' +
+      ' when four words are given and maxNumNouns = 5',
+    () => {
+      expect(pluralize(['cat', 'dog', 'sheep', 'moose'], 5)).toBe(
+        'cat, dog, sheep, and moose',
+      );
+    },
+  );
 });
 
 describe('trimText(text, maxLength)', () => {
-  it('should return the original text when the text is shorter than maxLength', () => {
-    expect(trimText('a', 2)).toBe('a');
-    expect(trimText('a', 3)).toBe('a');
-    expect(trimText('a', 4)).toBe('a');
-
-    expect(trimText('ab', 3)).toBe('ab');
-    expect(trimText('ab', 4)).toBe('ab');
-
-    expect(trimText('abc', 4)).toBe('abc');
-
-    expect(trimText('the quick brown fox jumps', 400)).toBe(
-      'the quick brown fox jumps',
-    );
-  });
-
-  it('should return the original text when the text length is equal to maxLength', () => {
-    expect(trimText('a', 1)).toBe('a');
-    expect(trimText('ab', 2)).toBe('ab');
-    expect(trimText('abc', 3)).toBe('abc');
-
-    expect(trimText('the quick brown fox jumps', 25)).toBe(
-      'the quick brown fox jumps',
-    );
-  });
-
-  it('should return the first maxLength characters of the text when (maxLength <= 3)', () => {
-    expect(trimText('the quick brown fox jumps', 0)).toBe('');
-    expect(trimText('the quick brown fox jumps', 1)).toBe('t');
-    expect(trimText('the quick brown fox jumps', 2)).toBe('th');
-    expect(trimText('the quick brown fox jumps', 3)).toBe('the');
-  });
-
-  it('should return ellipsized text when (text.length > maxLength) && (maxLength > 3)', () => {
-    expect(trimText('the quick brown fox jumps', 4)).toBe('t...');
-    expect(trimText('the quick brown fox jumps', 5)).toBe('th...');
-    expect(trimText('the quick brown fox jumps', 6)).toBe('the...');
-    expect(trimText('the quick brown fox jumps', 7)).toBe('the ...');
-    expect(trimText('the quick brown fox jumps', 8)).toBe('the q...');
-    expect(trimText('the quick brown fox jumps', 9)).toBe('the qu...');
-  });
+  it(
+    'should return the original text' +
+      ' when the text is shorter than maxLength',
+    () => {
+      expect(trimText('a', 2)).toBe('a');
+      expect(trimText('a', 3)).toBe('a');
+      expect(trimText('a', 4)).toBe('a');
+
+      expect(trimText('ab', 3)).toBe('ab');
+      expect(trimText('ab', 4)).toBe('ab');
+
+      expect(trimText('abc', 4)).toBe('abc');
+
+      expect(trimText('the quick brown fox jumps', 400)).toBe(
+        'the quick brown fox jumps',
+      );
+    },
+  );
+
+  it(
+    'should return the original text' +
+      ' when the text length is equal to maxLength',
+    () => {
+      expect(trimText('a', 1)).toBe('a');
+      expect(trimText('ab', 2)).toBe('ab');
+      expect(trimText('abc', 3)).toBe('abc');
+
+      expect(trimText('the quick brown fox jumps', 25)).toBe(
+        'the quick brown fox jumps',
+      );
+    },
+  );
+
+  it(
+    'should return the first maxLength characters of the text' +
+      ' when (maxLength <= 3)',
+    () => {
+      expect(trimText('the quick brown fox jumps', 0)).toBe('');
+      expect(trimText('the quick brown fox jumps', 1)).toBe('t');
+      expect(trimText('the quick brown fox jumps', 2)).toBe('th');
+      expect(trimText('the quick brown fox jumps', 3)).toBe('the');
+    },
+  );
+
+  it(
+    'should return ellipsized text' +
+      ' when (text.length > maxLength) && (maxLength > 3)',
+    () => {
+      expect(trimText('the quick brown fox jumps', 4)).toBe('t...');
+      expect(trimText('the quick brown fox jumps', 5)).toBe('th...');
+      expect(trimText('the quick brown fox jumps', 6)).toBe('the...');
+      expect(trimText('the quick brown fox jumps', 7)).toBe('the ...');
+      expect(trimText('the quick brown fox jumps', 8)).toBe('the q...');
+      expect(trimText('the quick brown fox jumps', 9)).toBe('the qu...');
+    },
+  );
 
   it("shouldn't return a string longer than maxLength", () => {
     expect(trimText('', 0).length).toBeLessThanOrEqual(0);
     expect(trimText('a', 0).length).toBeLessThanOrEqual(0);
     expect(trimText('ab', 0).length).toBeLessThanOrEqual(0);
     expect(trimText('abc', 0).length).toBeLessThanOrEqual(0);
 
     expect(trimText('', 1).length).toBeLessThanOrEqual(1);
     expect(trimText('a', 1).length).toBeLessThanOrEqual(1);
     expect(trimText('ab', 1).length).toBeLessThanOrEqual(1);
     expect(trimText('abc', 1).length).toBeLessThanOrEqual(1);
 
     expect(trimText('', 2).length).toBeLessThanOrEqual(2);
     expect(trimText('a', 2).length).toBeLessThanOrEqual(2);
     expect(trimText('ab', 2).length).toBeLessThanOrEqual(2);
     expect(trimText('abc', 2).length).toBeLessThanOrEqual(2);
 
     expect(trimText('', 3).length).toBeLessThanOrEqual(3);
     expect(trimText('a', 3).length).toBeLessThanOrEqual(3);
     expect(trimText('ab', 3).length).toBeLessThanOrEqual(3);
     expect(trimText('abc', 3).length).toBeLessThanOrEqual(3);
   });
 });
+
+describe('pluralizeAndTrim(text, maxLength)', () => {
+  it('should return an empty string when nouns is an empty array', () => {
+    expect(pluralizeAndTrim([], 0)).toBe('');
+    expect(pluralizeAndTrim([], 10)).toBe('');
+  });
+
+  it('should return an emptyString when maxLength is 0', () => {
+    expect(pluralizeAndTrim(['a', 'b', 'c', 'd'], 0)).toBe('');
+  });
+
+  it(
+    'should return the first element of the array' +
+      ' when the array has only one element',
+    () => {
+      expect(pluralizeAndTrim(['a'], 10)).toBe('a');
+      expect(pluralizeAndTrim(['a'], 0)).toBe('');
+    },
+  );
+
+  it(
+    'should return "X and Y"' +
+      ' when (nouns.length === 2) and ("X and Y".length <= maxLength)',
+    () => {
+      expect(pluralizeAndTrim(['a', 'b'], 10)).toBe('a and b');
+    },
+  );
+
+  it(
+    'should return "2 users"' +
+      ' when (nouns.length === 2) and ("X and Y".length > maxLength)',
+    () => {
+      expect(pluralizeAndTrim(['spongebob', 'squarepants'], 10)).toBe(
+        '2 users',
+      );
+    },
+  );
+
+  it(
+    'should return "X, Y, and Z"' +
+      ' when there are three nouns and all three will fit within maxLength',
+    () => {
+      expect(pluralizeAndTrim(['cat', 'dog', 'sheep'], 20)).toBe(
+        'cat, dog, and sheep',
+      );
+    },
+  );
+
+  it(
+    'should return "X and 2 others"' +
+      ' when there are three nouns but only two will fit within maxLength',
+    () => {
+      expect(pluralizeAndTrim(['cat', 'dog', 'sheep'], 16)).toBe(
+        'cat and 2 others',
+      );
+    },
+  );
+
+  it(
+    'should return "3 users"' +
+      ' when there are three nouns but only one will fit within maxLength',
+    () => {
+      expect(pluralizeAndTrim(['cat', 'dog', 'sheep'], 10)).toBe('3 users');
+    },
+  );
+
+  it('should trim the pluralized string to fit within maxLength', () => {
+    expect(pluralizeAndTrim(['cat', 'dog', 'sheep'], 4)).toBe('3...');
+    expect(pluralizeAndTrim(['a', 'b', 'c', 'd'], 6)).toBe('4 u...');
+  });
+});