diff --git a/awx/main/tests/functional/test_credential.py b/awx/main/tests/functional/test_credential.py
new file mode 100644
index 0000000000..7ed76fdd62
--- /dev/null
+++ b/awx/main/tests/functional/test_credential.py
@@ -0,0 +1,15 @@
+import pytest
+
+from django.db import IntegrityError
+from awx.main.models import Credential
+
+@pytest.mark.django_db
+def test_cred_unique_org_name_kind(organization_factory):
+    objects = organization_factory("test")
+
+    cred = Credential(name="test", kind="net", organization=objects.organization)
+    cred.save()
+
+    with pytest.raises(IntegrityError):
+        cred = Credential(name="test", kind="net", organization=objects.organization)
+        cred.save()