diff --git a/.run/Run ArchitectureTest.run.xml b/.run/Run ArchitectureTest.run.xml
index 0a630c7bd..f8fb48dc1 100644
--- a/.run/Run ArchitectureTest.run.xml	
+++ b/.run/Run ArchitectureTest.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run ArchitectureTest" type="JUnit" factoryName="JUnit" folderName="lib">
-    <module name="taskana-core" />
+    <module name="taskana-core-test" />
     <extension name="coverage">
       <pattern>
         <option name="PATTERN" value="pro.taskana.*" />
diff --git a/lib/taskana-core-test/src/test/java/acceptance/classification/get/GetClassificationAccTest.java b/lib/taskana-core-test/src/test/java/acceptance/classification/get/GetClassificationAccTest.java
index 630801fb4..731ebc12c 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/classification/get/GetClassificationAccTest.java
+++ b/lib/taskana-core-test/src/test/java/acceptance/classification/get/GetClassificationAccTest.java
@@ -66,7 +66,7 @@ class GetClassificationAccTest {
 
   @WithAccessId(user = "user-1-1")
   @Test
-  void should_getClassificationById_When_AllPropertiesSet() throws Exception {
+  void should_GetClassificationById_When_AllPropertiesSet() throws Exception {
     Classification classification =
         classificationService.getClassification(classificationWithAllProperties.getId());
 
@@ -77,7 +77,7 @@ class GetClassificationAccTest {
 
   @WithAccessId(user = "user-1-1")
   @Test
-  void should_getClassificationByKeyAndDomain_When_AllPropertiesSet() throws Exception {
+  void should_GetClassificationByKeyAndDomain_When_AllPropertiesSet() throws Exception {
     Classification classification =
         classificationService.getClassification(
             classificationWithAllProperties.getKey(), classificationWithAllProperties.getDomain());
diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/requestchanges/RequestChangesAccTest.java b/lib/taskana-core-test/src/test/java/acceptance/task/requestchanges/RequestChangesAccTest.java
index 10e4b5f7a..551f95441 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/task/requestchanges/RequestChangesAccTest.java
+++ b/lib/taskana-core-test/src/test/java/acceptance/task/requestchanges/RequestChangesAccTest.java
@@ -77,7 +77,7 @@ class RequestChangesAccTest {
 
   @WithAccessId(user = "user-1-1")
   @Test
-  void should_ForceRequestChanges_WhenTaskIsInReviewByDifferentUser() throws Exception {
+  void should_ForceRequestChanges_When_TaskIsInReviewByDifferentUser() throws Exception {
     Instant now = Instant.now();
     Task task = createTaskInReviewByUser("user-1-2").buildAndStore(taskService);
 
@@ -90,7 +90,7 @@ class RequestChangesAccTest {
 
   @WithAccessId(user = "user-1-1")
   @TestFactory
-  Stream<DynamicTest> should_ForceRequestChanges_WhenTaskIsNotInEndState() {
+  Stream<DynamicTest> should_ForceRequestChanges_When_TaskIsNotInEndState() {
     List<TaskState> testCases = Arrays.asList(EnumUtil.allValuesExceptFor(TaskState.END_STATES));
     ThrowingConsumer<TaskState> test =
         state -> {