diff --git a/src/main/java/mops/gruppen2/repository/EventRepository.java b/src/main/java/mops/gruppen2/repository/EventRepository.java
index c4b1249..bb9947b 100644
--- a/src/main/java/mops/gruppen2/repository/EventRepository.java
+++ b/src/main/java/mops/gruppen2/repository/EventRepository.java
@@ -2,6 +2,8 @@ package mops.gruppen2.repository;
 
 import mops.gruppen2.domain.EventDTO;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface EventRepository extends CrudRepository<EventDTO, Long> {
 }
diff --git a/src/test/java/mops/gruppen2/architecture/RepositoryTest.java b/src/test/java/mops/gruppen2/architecture/RepositoryTest.java
new file mode 100644
index 0000000..81f86ee
--- /dev/null
+++ b/src/test/java/mops/gruppen2/architecture/RepositoryTest.java
@@ -0,0 +1,40 @@
+package mops.gruppen2.architecture;
+
+import com.tngtech.archunit.core.importer.ImportOption;
+import com.tngtech.archunit.junit.AnalyzeClasses;
+import com.tngtech.archunit.junit.ArchTest;
+import com.tngtech.archunit.lang.ArchRule;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes;
+
+@AnalyzeClasses(packages = "mops.gruppen2", importOptions = { ImportOption.DoNotIncludeTests.class })
+public class RepositoryTest {
+
+    @ArchTest
+    public static final ArchRule repositoryClassesThatAreAnnotatedWithRepositoryShouldHaveRepositoryInName = classes()
+            .that().areAnnotatedWith(Repository.class)
+            .should().haveSimpleNameEndingWith("Repository");
+
+    @ArchTest
+    public static final ArchRule repositoryClassesShouldBeInRepositoryPackage = classes()
+            .that().haveSimpleNameEndingWith("Repository")
+            .should().resideInAPackage("..repository..");
+
+    @ArchTest
+    public static final ArchRule repositoryClassesShouldBeAnnotatedWithRepositoryAnnotation = classes()
+            .that().haveSimpleNameEndingWith("Repository")
+            .should().beAnnotatedWith(Repository.class);
+
+    @ArchTest
+    public static final ArchRule classesInRepositoryPackageShouldHaveRepositoryInName = classes()
+            .that().resideInAPackage("..repository..")
+            .should().haveSimpleNameEndingWith("Repository");
+
+    @ArchTest
+    public static final ArchRule classesThatAreAssignableToCrudRepositoryShouldHaveRepositoryInName = classes()
+            .that().areAssignableTo(CrudRepository.class)
+            .should().beAnnotatedWith(Repository.class);
+
+}