diff --git a/data/model/test/test_repository.py b/data/model/test/test_repository.py
new file mode 100644
index 000000000..f15f6236d
--- /dev/null
+++ b/data/model/test/test_repository.py
@@ -0,0 +1,14 @@
+import pytest
+
+from peewee import IntegrityError
+
+from endpoints.test.fixtures import database_uri, init_db_path, sqlitedb_file
+from data.model.repository import create_repository
+
+def test_duplicate_repository_different_kinds(database_uri):
+  # Create an image repo.
+  create_repository('devtable', 'somenewrepo', None, repo_kind='image')
+
+  # Try to create an app repo with the same name, which should fail.
+  with pytest.raises(IntegrityError):
+    create_repository('devtable', 'somenewrepo', None, repo_kind='application')