diff --git a/src/test/java/net/hostsharing/hsadminng/arch/ArchitectureTest.java b/src/test/java/net/hostsharing/hsadminng/arch/ArchitectureTest.java
index fa49e102..be612e90 100644
--- a/src/test/java/net/hostsharing/hsadminng/arch/ArchitectureTest.java
+++ b/src/test/java/net/hostsharing/hsadminng/arch/ArchitectureTest.java
@@ -129,7 +129,8 @@ public class ArchitectureTest {
     public static final ArchRule hsOfficeBankAccountPackageRule = classes()
             .that().resideInAPackage("..hs.office.bankaccount..")
             .should().onlyBeAccessed().byClassesThat()
-            .resideInAnyPackage("..hs.office.bankaccount..",
+            .resideInAnyPackage(
+                    "..hs.office.bankaccount..",
                     "..hs.office.sepamandate..",
                     "..hs.office.debitor..",
                     "..hs.office.migration..");
@@ -139,7 +140,8 @@ public class ArchitectureTest {
     public static final ArchRule hsOfficeSepaMandatePackageRule = classes()
             .that().resideInAPackage("..hs.office.sepamandate..")
             .should().onlyBeAccessed().byClassesThat()
-            .resideInAnyPackage("..hs.office.sepamandate..",
+            .resideInAnyPackage(
+                    "..hs.office.sepamandate..",
                     "..hs.office.debitor..",
                     "..hs.office.migration..");
 
@@ -148,7 +150,9 @@ public class ArchitectureTest {
     public static final ArchRule hsOfficeContactPackageRule = classes()
             .that().resideInAPackage("..hs.office.contact..")
             .should().onlyBeAccessed().byClassesThat()
-            .resideInAnyPackage("..hs.office.contact..", "..hs.office.relation..",
+            .resideInAnyPackage(
+                    "..hs.office.contact..",
+                    "..hs.office.relation..",
                     "..hs.office.partner..",
                     "..hs.office.debitor..",
                     "..hs.office.membership..",
@@ -159,37 +163,46 @@ public class ArchitectureTest {
     public static final ArchRule hsOfficePersonPackageRule = classes()
             .that().resideInAPackage("..hs.office.person..")
             .should().onlyBeAccessed().byClassesThat()
-            .resideInAnyPackage("..hs.office.person..", "..hs.office.relation..",
+            .resideInAnyPackage(
+                    "..hs.office.person..",
+                    "..hs.office.relation..",
                     "..hs.office.partner..",
                     "..hs.office.debitor..",
                     "..hs.office.membership..",
-                    "..hs.office.migration..");
+                    "..hs.office.migration..")
+            .orShould().haveNameNotMatching(".*Test$");
+
 
     @ArchTest
     @SuppressWarnings("unused")
     public static final ArchRule hsOfficeRelationPackageRule = classes()
             .that().resideInAPackage("..hs.office.relation..")
             .should().onlyBeAccessed().byClassesThat()
-            .resideInAnyPackage("..hs.office.relation..",
+            .resideInAnyPackage(
+                    "..hs.office.relation..",
                     "..hs.office.partner..",
-                    "..hs.office.migration..");
+                    "..hs.office.migration..")
+            .orShould().haveNameNotMatching(".*Test$");
 
     @ArchTest
     @SuppressWarnings("unused")
     public static final ArchRule hsOfficePartnerPackageRule = classes()
             .that().resideInAPackage("..hs.office.partner..")
             .should().onlyBeAccessed().byClassesThat()
-            .resideInAnyPackage("..hs.office.partner..",
+            .resideInAnyPackage(
+                    "..hs.office.partner..",
                     "..hs.office.debitor..",
                     "..hs.office.membership..",
-                    "..hs.office.migration..");
+                    "..hs.office.migration..")
+            .orShould().haveNameNotMatching(".*Test$");
 
     @ArchTest
     @SuppressWarnings("unused")
     public static final ArchRule hsOfficeMembershipPackageRule = classes()
             .that().resideInAPackage("..hs.office.membership..")
             .should().onlyBeAccessed().byClassesThat()
-            .resideInAnyPackage("..hs.office.membership..",
+            .resideInAnyPackage(
+                    "..hs.office.membership..",
                     "..hs.office.coopassets..",
                     "..hs.office.coopshares..",
                     "..hs.office.migration..");