diff --git a/ui/admin/tests/acceptance/credential-library/credential-library-test.js b/ui/admin/tests/acceptance/credential-library/credential-library-test.js
index 0ca994ee1..103c6d608 100644
--- a/ui/admin/tests/acceptance/credential-library/credential-library-test.js
+++ b/ui/admin/tests/acceptance/credential-library/credential-library-test.js
@@ -2,6 +2,7 @@ import { module, test } from 'qunit';
 import { visit, click, fillIn, currentURL, find } from '@ember/test-helpers';
 import { setupApplicationTest } from 'ember-qunit';
 import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import a11yAudit from 'ember-a11y-testing/test-support/audit';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 import { Response } from 'miragejs';
 import { resolve, reject } from 'rsvp';
@@ -30,6 +31,7 @@ module('Acceptance | credential-library', function (hooks) {
     credentialLibrary: null,
     credentialLibraries: null,
     newCredentialLibrary: null,
+    unknownCredentialLibrary: null,
   };
 
   hooks.beforeEach(function () {
@@ -58,12 +60,31 @@ module('Acceptance | credential-library', function (hooks) {
     urls.credentialLibraries = `${urls.credentialStore}/credential-libraries`;
     urls.credentialLibrary = `${urls.credentialLibraries}/${instances.credentialLibrary.id}`;
     urls.newCredentialLibrary = `${urls.credentialLibraries}/new`;
+    urls.unknownCredentialLibrary = `${urls.credentialLibraries}/foo`;
     // Generate resource counter
     getCredentialLibraryCount = () =>
       this.server.schema.credentialLibraries.all().models.length;
     authenticateSession({});
   });
 
+  test('visiting credential libraries', async function (assert) {
+    assert.expect(2);
+    await visit(urls.credentialLibraries);
+    await a11yAudit();
+    assert.equal(currentURL(), urls.credentialLibraries);
+    await visit(urls.credentialLibrary);
+    await a11yAudit();
+    assert.equal(currentURL(), urls.credentialLibrary);
+  });
+
+  test('visiting an unknown credential library displays 404 message', async function (assert) {
+    assert.expect(1);
+    await visit(urls.unknownCredentialLibrary);
+    await a11yAudit();
+    console.debug(find('.rose-message-subtitle'));
+    assert.ok(find('.rose-message-subtitle').textContent.trim(), 'Error 404');
+  });
+
   test('can create a credential library', async function (assert) {
     assert.expect(1);
     const count = getCredentialLibraryCount();
@@ -147,4 +168,22 @@ module('Acceptance | credential-library', function (hooks) {
     assert.equal(getCredentialLibraryCount(), count);
     assert.ok(confirmService.confirm.calledOnce);
   });
+
+  test('deleting a credential library which errors displays error messages', async function (assert) {
+    assert.expect(1);
+    this.server.del('/credential-libraries/:id', () => {
+      return new Response(
+        490,
+        {},
+        {
+          status: 490,
+          code: 'error',
+          message: 'Oops.',
+        }
+      );
+    });
+    await visit(urls.credentialLibrary);
+    await click('.rose-layout-page-actions .rose-dropdown-button-danger');
+    assert.ok(find('[role="alert"]').textContent.trim(), 'Oops.');
+  });
 });