diff --git a/core/modules/comment/src/Tests/CommentNonNodeTest.php b/core/modules/comment/src/Tests/CommentNonNodeTest.php
index 8d8e38b..379bcde 100644
--- a/core/modules/comment/src/Tests/CommentNonNodeTest.php
+++ b/core/modules/comment/src/Tests/CommentNonNodeTest.php
@@ -471,6 +471,7 @@ public function testsNonIntegerIdEntities() {
     entity_test_create_bundle('entity_test', 'Entity Test', 'entity_test_string_id');
     $limited_user = $this->drupalCreateUser(array(
       'administer entity_test_string_id fields',
+      'administer comment types',
     ));
     $this->drupalLogin($limited_user);
     // Visit the Field UI field add page.
@@ -479,6 +480,11 @@ public function testsNonIntegerIdEntities() {
     $this->assertNoOption('edit-new-storage-type', 'comment');
     // Ensure a core field type shown.
     $this->assertOption('edit-new-storage-type', 'boolean');
+    // Attempt to add a comment-type referencing this entity-type.
+    $this->drupalGet('admin/structure/comment/types/add');
+    $this->assertNoOption('edit-target-entity-type-id', 'entity_test_string_id');
+    $this->assertRaw(t('The following entity-types can not be commented on:'));
+    $this->assertRaw(t('Test entity with string_id'));
 
     // Create a bundle for entity_test_no_id.
     entity_test_create_bundle('entity_test', 'Entity Test', 'entity_test_no_id');