diff --git a/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestPrismParsingXml.java b/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestPrismParsingXml.java
index e6079a44141..0ba23b8a640 100644
--- a/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestPrismParsingXml.java
+++ b/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestPrismParsingXml.java
@@ -87,11 +87,9 @@ public void testPrismParseXxe() throws Exception {
 
             AssertJUnit.fail("Unexpected success");
         } catch (IllegalStateException e) {
-            // THEN
-            System.out.println("Expected exception: "+e);
+            displayExpectedException(e);
             assertTrue("Unexpected exception message: "+e.getMessage(), e.getMessage().contains("DOCTYPE"));
         }
-
     }
 
     @Test
@@ -102,10 +100,8 @@ public void testPrismParseDomXxe() {
 
             AssertJUnit.fail("Unexpected success");
         } catch (IllegalStateException e) {
-            // THEN
-            System.out.println("Expected exception: "+e);
+            displayExpectedException(e);
             assertTrue("Unexpected exception message: "+e.getMessage(), e.getMessage().contains("DOCTYPE"));
         }
-
     }
 }
diff --git a/model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpression.java b/model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpression.java
index c01530effb7..521db481531 100644
--- a/model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpression.java
+++ b/model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpression.java
@@ -425,23 +425,18 @@ protected <V extends PrismValue, D extends ItemDefinition> void evaluateExpressi
                     expressionContext.getContextDescription(), expressionContext.getTask(), result);
 
         } catch (SecurityViolationException e) {
-            // Exception may happen here, or it may happen later.
-            // Expected
-            logger.debug("Expected exception", e);
+            displayExpectedException(e);
             assertTrue("Wrong exception message: " + e.getMessage(), e.getMessage().contains("Access to script language"));
             return;
         }
 
         logger.debug("Starting evaluation of expression (expecting security violation): {}", expression);
         try {
-
             expression.evaluate(expressionContext, result);
 
             AssertJUnit.fail("Unexpected success of expression evaluation");
-
         } catch (SecurityViolationException e) {
-            // Expected
-            logger.debug("Expected exception", e);
+            displayExpectedException(e);
             assertTrue("Wrong exception message: " + e.getMessage(),
                     e.getMessage().contains("Access to expression evaluator")
                             || e.getMessage().contains("Access to Groovy method"));
@@ -499,7 +494,7 @@ protected ExpressionProfile compileExpressionProfile(String profileName) throws
         ExpressionProfiles profiles = compiler.compile(expressions);
         ExpressionProfile profile = profiles.getProfile(profileName);
         if (profile == null) {
-            throw new SchemaException("Profile '" + profile + "' not found in system config");
+            throw new SchemaException("Profile '" + profileName + "' not found in system config");
         }
         return profile;
     }
diff --git a/model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/AbstractScriptTest.java b/model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/AbstractScriptTest.java
index 150554d70ce..86890526077 100644
--- a/model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/AbstractScriptTest.java
+++ b/model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/AbstractScriptTest.java
@@ -380,8 +380,7 @@ protected void evaluateAndAssertStringScalarExpressionRestricted(
             List<PrismPropertyValue<String>> expressionResultList = evaluateStringExpression(fileName, testName, variables);
             AssertJUnit.fail("Expression " + testName + ": unexpected success, result value: " + expressionResultList);
         } catch (SecurityViolationException e) {
-            System.out.println("Expected exception: " + e);
-            logger.debug("Expected exception", e);
+            displayExpectedException(e);
         }
     }
 
diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestDependencies.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestDependencies.java
index 99e7d0d4cc0..6c16a321a21 100644
--- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestDependencies.java
+++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestDependencies.java
@@ -372,10 +372,8 @@ public void test300SortToWavesXYZCircular() throws Exception {
 
             AssertJUnit.fail("Unexpected success");
         } catch (PolicyViolationException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
-
     }
 
     private LensProjectionContext fillContextWithDummyElaineAccount(
diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPasswordPolicyProcessor.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPasswordPolicyProcessor.java
index fe5d0a27b51..93fafed1871 100644
--- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPasswordPolicyProcessor.java
+++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPasswordPolicyProcessor.java
@@ -179,8 +179,7 @@ private void doTestModifyPasswordExpectFailure(String password) throws Exception
 
             fail("Expected PolicyViolationException but didn't get one.");
         } catch (PolicyViolationException ex) {
-            // this is expected
-            displayException("expected exception", ex);
+            displayExpectedException(ex);
             result.computeStatus();
             TestUtil.assertFailure(result);
         }
diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules2.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules2.java
index 7f7a05da74c..0fa915f0450 100644
--- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules2.java
+++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules2.java
@@ -626,7 +626,6 @@ public void test200AddUnresolvable() throws Exception {
 
         assertFocusModificationSanity(context);
 
-        // WHEN
         when();
         try {
             clockwork.run(context, task, result);
@@ -634,8 +633,7 @@ public void test200AddUnresolvable() throws Exception {
             fail("unexpected success");
         } catch (ObjectNotFoundException e) {
             then();
-            System.out.println("Expected exception: " + e);
-            e.printStackTrace(System.out);
+            displayExpectedException(e);
             if (!e.getMessage().contains("No policy constraint named 'unresolvable' could be found")) {
                 fail("Exception message was not as expected: " + e.getMessage());
             }
@@ -662,8 +660,7 @@ public void test210AddCyclic() throws Exception {
             fail("unexpected success");
         } catch (SchemaException e) {
             then();
-            System.out.println("Expected exception: " + e);
-            e.printStackTrace(System.out);
+            displayExpectedException(e);
             if (!e.getMessage().contains("Trying to resolve cyclic reference to constraint")) {
                 fail("Exception message was not as expected: " + e.getMessage());
             }
@@ -747,8 +744,7 @@ public void test230AddAmbiguous() throws Exception {
             fail("unexpected success");
         } catch (SchemaException e) {
             then();
-            System.out.println("Expected exception: " + e);
-            e.printStackTrace(System.out);
+            displayExpectedException(e);
             if (!e.getMessage().contains("Conflicting definitions of 'constraint-B'")) {
                 fail("Exception message was not as expected: " + e.getMessage());
             }
@@ -779,8 +775,7 @@ public void test300ModifyInducement() throws Exception {
             fail("unexpected success");
         } catch (PolicyViolationException e) {
             then();
-            System.out.println("Expected exception: " + e);
-            e.printStackTrace(System.out);
+            displayExpectedException(e);
             if (!getTranslatedMessage(e).contains("Role \"Immutable inducements\" is to be modified")) {
                 fail("Exception message was not as expected: " + getTranslatedMessage(e));
             }
@@ -859,8 +854,7 @@ public void test330AddInducement() throws Exception {
             fail("unexpected success");
         } catch (PolicyViolationException e) {
             then();
-            System.out.println("Expected exception: " + e);
-            e.printStackTrace(System.out);
+            displayExpectedException(e);
             if (!getTranslatedMessage(e).contains("Role \"No inducements add or delete\" is to be modified")) {
                 fail("Exception message was not as expected: " + getTranslatedMessage(e));
             }
@@ -891,8 +885,7 @@ public void test340AddInducementViaExpression() throws Exception {
             fail("unexpected success");
         } catch (PolicyViolationException e) {
             then();
-            System.out.println("Expected exception: " + e);
-            e.printStackTrace(System.out);
+            displayExpectedException(e);
             if (!getTranslatedMessage(e).contains("Role \"No inducements add or delete (expression)\" is to be modified")) {
                 fail("Exception message was not as expected: " + getTranslatedMessage(e));
             }
diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java
index d07349c7c5c..daa86fe6402 100644
--- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java
+++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java
@@ -633,9 +633,7 @@ public void test269DeleteBarbossaDummyAccount() throws Exception {
                     "there is no focus context";
             assert false : "The operation was successful but it should throw expcetion";
         } catch (PolicyViolationException e) {
-            // THEN: success
-            // this is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
     }
diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestAbstractAuthenticationEvaluator.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestAbstractAuthenticationEvaluator.java
index 6ce37afe69a..97a57603dce 100644
--- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestAbstractAuthenticationEvaluator.java
+++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestAbstractAuthenticationEvaluator.java
@@ -208,11 +208,8 @@ public void test101PasswordLoginBadPasswordJack() throws Exception {
             AssertJUnit.fail("Unexpected success");
 
         } catch (BadCredentialsException e) {
-            // This is expected
-
-            // THEN
             then();
-            displayException("expected exception", e);
+            displayExpectedException(e);
             assertBadPasswordException(e);
         }
         XMLGregorianCalendar endTs = clock.currentTimeXMLGregorianCalendar();
@@ -239,11 +236,8 @@ public void test102PasswordLoginNullPasswordJack() throws Exception {
             AssertJUnit.fail("Unexpected success");
 
         } catch (BadCredentialsException e) {
-            // This is expected
-
-            // THEN
             then();
-            displayException("expected exception", e);
+            displayExpectedException(e);
             assertPasswordEncodingException(e);
         }
 
@@ -269,11 +263,8 @@ public void test103PasswordLoginEmptyPasswordJack() throws Exception {
             AssertJUnit.fail("Unexpected success");
 
         } catch (BadCredentialsException e) {
-            // This is expected
-
-            // THEN
             then();
-            displayException("expected exception", e);
+            displayExpectedException(e);
             assertPasswordEncodingException(e);
         }
 
@@ -298,11 +289,8 @@ public void test105PasswordLoginNullUsernameNullPassword() {
             AssertJUnit.fail("Unexpected success");
 
         } catch (BadCredentialsException e) {
-            // This is expected
-
-            // THEN
             then();
-            displayException("expected exception", e);
+            displayExpectedException(e);
             assertPasswordEncodingException(e);
         }
 
@@ -323,14 +311,10 @@ public void test106PasswordLoginEmptyUsernameBadPassword() {
             AssertJUnit.fail("Unexpected success");
 
         } catch (UsernameNotFoundException e) {
-            // This is expected
-
-            // THEN
             then();
-            displayException("expected exception", e);
+            displayExpectedException(e);
             assertNoUserException(e);
         }
-
     }
 
     @Test
@@ -348,14 +332,10 @@ public void test107PasswordLoginBadUsernameBadPassword() {
             AssertJUnit.fail("Unexpected success");
 
         } catch (UsernameNotFoundException e) {
-            // This is expected
-
-            // THEN
             then();
-            displayException("expected exception", e);
+            displayExpectedException(e);
             assertNoUserException(e);
         }
-
     }
 
     /**
@@ -384,7 +364,7 @@ public void test125PasswordLoginBadPasswordJackAfterLockoutFailedAttemptsDuratio
 
             // THEN
             then();
-            displayException("expected exception", e);
+            displayExpectedException(e);
             assertBadPasswordException(e);
         }
         XMLGregorianCalendar endTs = clock.currentTimeXMLGregorianCalendar();
@@ -411,9 +391,7 @@ public void test130PasswordLoginLockout() throws Exception {
 
             AssertJUnit.fail("Unexpected success");
         } catch (BadCredentialsException e) {
-            // This is expected
-
-            displayException("expected exception", e);
+            displayExpectedException(e);
             assertBadPasswordException(e);
         }
 
@@ -428,9 +406,7 @@ public void test130PasswordLoginLockout() throws Exception {
 
             AssertJUnit.fail("Unexpected success");
         } catch (BadCredentialsException e) {
-            // This is expected
-
-            displayException("expected exception", e);
+            displayExpectedException(e);
             assertBadPasswordException(e);
         }
 
@@ -460,11 +436,8 @@ public void test132PasswordLoginLockedoutGoodPassword() throws Exception {
 
             AssertJUnit.fail("Unexpected success");
         } catch (LockedException e) {
-            // This is expected
-
-            // THEN
             then();
-            displayException("expected exception", e);
+            displayExpectedException(e);
             assertLockedException(e);
         }
 
@@ -487,14 +460,11 @@ public void test133PasswordLoginLockedoutBadPassword() throws Exception {
 
             AssertJUnit.fail("Unexpected success");
         } catch (LockedException e) {
-            // This is expected
-
-            // THEN
             then();
-            displayException("expected exception", e);
+            displayExpectedException(e);
 
-            // this is important. The exception should give no indication whether the password is
-            // good or bad
+            // This is important.
+            // The exception should give no indication whether the password is good or bad.
             assertLockedException(e);
         }
 
@@ -542,11 +512,8 @@ public void test136PasswordLoginLockoutAgain() throws Exception {
 
             AssertJUnit.fail("Unexpected success");
         } catch (BadCredentialsException e) {
-            // This is expected
-
-            // THEN
             then();
-            displayException("expected exception", e);
+            displayExpectedException(e);
             assertBadPasswordException(e);
         }
 
@@ -561,11 +528,8 @@ public void test136PasswordLoginLockoutAgain() throws Exception {
 
             AssertJUnit.fail("Unexpected success");
         } catch (BadCredentialsException e) {
-            // This is expected
-
-            // THEN
             then();
-            displayException("expected exception", e);
+            displayExpectedException(e);
             assertBadPasswordException(e);
         }
 
@@ -580,11 +544,8 @@ public void test136PasswordLoginLockoutAgain() throws Exception {
 
             AssertJUnit.fail("Unexpected success");
         } catch (BadCredentialsException e) {
-            // This is expected
-
-            // THEN
             then();
-            displayException("expected exception", e);
+            displayExpectedException(e);
             assertBadPasswordException(e);
         }
 
@@ -611,11 +572,8 @@ public void test137PasswordLoginLockedoutGoodPasswordAgain() throws Exception {
 
             AssertJUnit.fail("Unexpected success");
         } catch (LockedException e) {
-            // This is expected
-
-            // THEN
             then();
-            displayException("expected exception", e);
+            displayExpectedException(e);
             assertLockedException(e);
         }
 
@@ -681,12 +639,8 @@ public void test139TryToLockByModelService() throws Exception {
 
             AssertJUnit.fail("Unexpected success");
         } catch (SchemaException e) {
-            // This is expected
-
-            // THEN
             then();
-            displayException("expected exception", e);
-
+            displayExpectedException(e);
         }
 
         PrismObject<UserType> userAfter = getUser(USER_JACK_OID);
@@ -879,11 +833,8 @@ public void test202UserGuybrushPasswordLoginBadPassword() throws Exception {
             AssertJUnit.fail("Unexpected success");
 
         } catch (BadCredentialsException e) {
-            // This is expected
-
-            // THEN
             then();
-            displayException("expected exception", e);
+            displayExpectedException(e);
             assertBadPasswordException(e);
         }
         XMLGregorianCalendar endTs = clock.currentTimeXMLGregorianCalendar();
@@ -934,11 +885,8 @@ public void test210UserGuybrushPasswordLoginGoodPasswordExpired() throws Excepti
             AssertJUnit.fail("Unexpected success");
 
         } catch (CredentialsExpiredException e) {
-            // This is expected
-
-            // THEN
             then();
-            displayException("expected exception", e);
+            displayExpectedException(e);
             assertExpiredException(e);
         }
 
@@ -1065,14 +1013,11 @@ private void loginJackGoodPasswordExpectDenied() throws ObjectNotFoundException,
 
             AssertJUnit.fail("Unexpected success");
         } catch (DisabledException e) {
-            // This is expected
-
-            // THEN
             then();
-            displayException("expected exception", e);
+            displayExpectedException(e);
 
-            // this is important. The exception should give no indication whether the password is
-            // good or bad
+            // This is important.
+            // The exception should give no indication whether the password is good or bad.
             assertDisabledException(e);
         }
 
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
index d3e2a7edde7..947b02b96f5 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
@@ -161,9 +161,8 @@ public void test099ModifyUserAddAccountFailing() throws Exception {
             assertNotReached();
 
         } catch (UnsupportedOperationException e) {
-            // THEN
             then();
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         assertFailure(result);
@@ -2055,8 +2054,7 @@ public void test180ModifyUserAddAccountFullEnforcement() throws Exception {
 
             AssertJUnit.fail("Unexpected executeChanges success");
         } catch (PolicyViolationException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         // THEN
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java
index 3a0d8a11dce..a04e4c86439 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java
@@ -329,8 +329,7 @@ private void doPreviewFail(
             modelInteractionService.previewChanges(deltas, new ModelExecuteOptions(), task, result);
             AssertJUnit.fail("Expected exception, but it haven't come");
         } catch (SchemaException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         result.computeStatus();
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
index 7c935ba9d2a..59aee222e6b 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
@@ -204,8 +204,7 @@ public void test050AddRoleRecursionAssignment() throws Exception {
 
             assertNotReached();
         } catch (PolicyViolationException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         // THEN
@@ -279,8 +278,7 @@ public void test100ModifyUserGuybrushAddAccountDummyRedNoAttributesConflict() th
 
             AssertJUnit.fail("Unexpected executeChanges success");
         } catch (ObjectAlreadyExistsException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         //TODO: this is not yet expected.. there is a checking code in the ProjectionValueProcessor..
@@ -910,8 +908,7 @@ public void test332AssignDeGhoulashRecursion() throws Exception {
 
             assertNotReached();
         } catch (PolicyViolationException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         // THEN
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/archetypes/TestArchetypes.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/archetypes/TestArchetypes.java
index f0de021b365..0e0bd37d5ec 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/archetypes/TestArchetypes.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/archetypes/TestArchetypes.java
@@ -765,8 +765,7 @@ public void test162AddFraudster() throws Exception {
 
             assertNotReached();
         } catch (PolicyViolationException e) {
-            // Expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         // THEN
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestRoleEntitlement.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestRoleEntitlement.java
index 7a98c07e36c..0bd26cc53b7 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestRoleEntitlement.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestRoleEntitlement.java
@@ -243,9 +243,7 @@ public void test108ModifyRoleAddEntitlementAgain() throws Exception {
             // THEN
             assert false : "Expected executeChanges operation to fail but it has obviously succeeded";
         } catch (SchemaException e) {
-            // This is expected
-            e.printStackTrace();
-            // THEN
+            displayExpectedException(e);
             String message = e.getMessage();
             assertMessageContains(message, "already contains entitlement");
             assertMessageContains(message, "group");
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/multi/TestMultiResource.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/multi/TestMultiResource.java
index 4e567158282..e59db83100c 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/multi/TestMultiResource.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/multi/TestMultiResource.java
@@ -263,8 +263,7 @@ public void test121JackTryDeleteAccount() throws Exception {
 
             AssertJUnit.fail("Unexpected success");
         } catch (PolicyViolationException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
     }
 
@@ -1318,8 +1317,7 @@ public void test350AddAccountLavender() throws Exception {
 
             AssertJUnit.fail("Unexpected success");
         } catch (PolicyViolationException e) {
-            // this is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         // THEN
@@ -1441,8 +1439,7 @@ public void test370DeleteAccountDummy() throws Exception {
 
             AssertJUnit.fail("Unexpected success");
         } catch (PolicyViolationException e) {
-            // this is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         // THEN
@@ -1476,8 +1473,7 @@ public void test372UnlinkAccountDummy() throws Exception {
 
             AssertJUnit.fail("Unexpected success");
         } catch (PolicyViolationException e) {
-            // this is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         // THEN
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestAssignmentErrors.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestAssignmentErrors.java
index 562991a9041..8eab91cb89b 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestAssignmentErrors.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestAssignmentErrors.java
@@ -319,9 +319,8 @@ public void test210UserSharptoothAssignAccountBrokenGeneric() throws Exception {
 
             assertNotReached();
         } catch (GenericConnectorException e) {
-            // THEN
             then();
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
         assertFailure(result);
 
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestBrokenResources.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestBrokenResources.java
index 12d69564af1..75bd636c477 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestBrokenResources.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestBrokenResources.java
@@ -200,8 +200,7 @@ public void test100GetAccountMurray() throws Exception {
             display("Account (unexpected)", account);
             AssertJUnit.fail("Expected SystemException but the operation was successful");
         } catch (SystemException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
             result.computeStatus();
             display("getObject result", result);
             TestUtil.assertFailure("getObject result", result);
@@ -785,9 +784,8 @@ public void test401AssignTwoResourcesBroken() throws Exception {
 
             assertNotReached();
         } catch (GenericConnectorException e) {
-            // THEN
             then();
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         result.computeStatus();
@@ -926,9 +924,8 @@ public void test510AssignResourceBlackError() throws Exception {
             assertNotReached();
 
         } catch (GenericConnectorException e) {
-            // THEN
             then();
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         assertFailure(result);
@@ -993,9 +990,8 @@ public void test514ModifyUserEmployeeNumberRuntime() throws Exception {
             assertNotReached();
 
         } catch (RuntimeException e) {
-            // THEN
             then();
-            displayException("Expected exception", e);
+            displayExpectedException(e);
             assertEquals("Wrong exception message", "Booom! PowerFail script failed (runtime)", e.getMessage());
         }
 
@@ -1031,9 +1027,8 @@ public void test518UnassignResourceBlack() throws Exception {
             assertNotReached();
 
         } catch (RuntimeException e) {
-            // THEN
             then();
-            displayException("Expected exception", e);
+            displayExpectedException(e);
             assertEquals("Wrong exception message", "Booom! PowerFail script failed (runtime)", e.getMessage());
         }
 
@@ -1215,7 +1210,7 @@ public void test600GuybrushAssignAccountDummyViolet() throws Exception {
 
             assertNotReached();
         } catch (ExpressionEvaluationException e) {
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         // THEN
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java
index ad10c8c8f8e..89fbc097c62 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java
@@ -798,9 +798,8 @@ public void test310JackConflictParentOrgRefAndAssignmentsAddOrg() throws Excepti
 
             assertNotReached();
         } catch (PolicyViolationException e) {
-            // THEN
             then();
-            displayException("Expected exception", e);
+            displayExpectedException(e);
             assertFailure(result);
         }
 
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
index 18c3d0f8327..e7ecc2f99c0 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
@@ -1188,8 +1188,7 @@ public void test222ModifyUserJackPasswordBadContainer() throws Exception {
             AssertJUnit.fail("Unexpected success");
 
         } catch (PolicyViolationException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         // THEN
@@ -1400,8 +1399,7 @@ public void test300TwoParentOrgRefs() throws Exception {
 
             AssertJUnit.fail("Unexpected success");
         } catch (PolicyViolationException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         // THEN
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/persona/TestPersonaPassword.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/persona/TestPersonaPassword.java
index 808477a42bd..18989a73226 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/persona/TestPersonaPassword.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/persona/TestPersonaPassword.java
@@ -86,8 +86,7 @@ public void test145ModifyPersonaPasswordBack() throws Exception {
 
             assertNotReached();
         } catch (PolicyViolationException e) {
-            // expected
-            displayException("expected exception", e);
+            displayExpectedException(e);
         }
 
         // THEN
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
index 0874a0b83b1..78d1ad8a20f 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
@@ -1627,8 +1627,7 @@ public void test602JackAssignRolePirate() throws Exception {
 
             AssertJUnit.fail("Unexpected success");
         } catch (PolicyViolationException e) {
-            // this is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
             assertMessage(e, "Violation of SoD policy: Role \"Judge\" excludes role \"Pirate\", they cannot be assigned at the same time");
         }
 
@@ -1752,8 +1751,7 @@ public void test612JackAssignRoleGovernor() throws Exception {
 
             AssertJUnit.fail("Unexpected success");
         } catch (PolicyViolationException e) {
-            // this is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
             assertMessage(e, "Role \"Governor\" requires at most 1 assignees with the relation of \"default\". The operation would result in 2 assignees.");
         }
 
@@ -1786,8 +1784,7 @@ public void test613JackAssignRoleGovernorAsApprover() throws Exception {
 
             AssertJUnit.fail("Unexpected success");
         } catch (PolicyViolationException e) {
-            // this is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
             assertMessage(e, "Role \"Governor\" requires at most 0 assignees with the relation of \"approver\". The operation would result in 1 assignees.");
         }
 
@@ -1911,8 +1908,7 @@ public void test625BignoseAssignRoleCanibal() throws Exception {
 
             AssertJUnit.fail("Unexpected success");
         } catch (PolicyViolationException e) {
-            // this is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
             assertMessage(e, "Role \"Cannibal\" requires at most 3 assignees with the relation of \"default\". The operation would result in 4 assignees.");
         }
 
@@ -1966,8 +1962,7 @@ public void test628RedskullUnassignRoleCanibal() throws Exception {
 
             AssertJUnit.fail("Unexpected success");
         } catch (PolicyViolationException e) {
-            // this is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
             assertMessage(e, "Role \"Cannibal\" requires at least 2 assignees with the relation of \"default\". The operation would result in 1 assignees.");
         }
 
@@ -2034,8 +2029,7 @@ public void test632RappUnassignRoleCannibalAsOwner() throws Exception {
 
             AssertJUnit.fail("Unexpected success");
         } catch (PolicyViolationException e) {
-            // this is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
             assertMessage(e, "Role \"Cannibal\" requires at least 1 assignees with the relation of \"owner\". The operation would result in 0 assignees.");
         }
 
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityBasic.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityBasic.java
index 859dd85f987..d631c9818df 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityBasic.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityBasic.java
@@ -1532,7 +1532,7 @@ private void assertJack24xManager(boolean fullControl) throws Exception {
             addObject(ORG_CHEATERS_FILE, task, result); // MID-3874
             assertNotReached();
         } catch (PolicyViolationException e) {
-            displayException("Expected exception", e);
+            displayExpectedException(e);
             assertFailure(result);
         }
 
@@ -1577,14 +1577,11 @@ private void assertJack24xManager(boolean fullControl) throws Exception {
 //        assertSearch(ShadowType.class, query, 2);
 
         try {
-
             modelService.searchObjects(ShadowType.class, query, null, task, result);
 
             AssertJUnit.fail("unexpected success");
-
         } catch (SchemaException e) {
-            // This is expected. The authorizations will mix on-resource and off-resource search.
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
         result.computeStatus();
         TestUtil.assertFailure(result);
@@ -1661,15 +1658,13 @@ private void assertJack24xManagerDefense(boolean fullControl) throws Exception {
 //        assertSearch(ShadowType.class, query, 2);
 
         try {
-
             modelService.searchObjects(ShadowType.class, query, null, task, result);
 
             AssertJUnit.fail("unexpected success");
-
         } catch (SchemaException e) {
-            // This is expected. The authorizations will mix on-resource and off-resource search.
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
+
         assertFailure(result);
 
         assertSearch(UserType.class, null, 5);
diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java
index 095b840dcd7..5abae446ac5 100644
--- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java
+++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java
@@ -229,9 +229,8 @@ public void test107AGetModifiedAccountFromCacheMax() throws Exception {
 
             assertNotReached();
         } catch (ConfigurationException e) {
-            // Caching is disabled, this is expected.
             then();
-            displayException("Expected exception", e);
+            displayExpectedException(e);
             assertFailure(result);
         }
 
@@ -1996,8 +1995,7 @@ public boolean handle(PrismObject<ShadowType> object, OperationResult parentResu
             AssertJUnit.fail("unexpected success");
 
         } catch (SchemaException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         // THEN
@@ -3739,8 +3737,7 @@ public void test502ModifyProtectedAccountShadowAttributes() throws Exception {
             provisioningService.modifyObject(ShadowType.class, ACCOUNT_DAEMON_OID, modifications, null, null, task, result);
             AssertJUnit.fail("Expected security exception while modifying 'daemon' account");
         } catch (SecurityViolationException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         result.computeStatus();
@@ -3800,9 +3797,8 @@ public void test509DeleteProtectedAccountShadow() throws Exception {
 
             AssertJUnit.fail("Expected security exception while deleting 'daemon' account");
         } catch (SecurityViolationException e) {
-            // This is expected
             then();
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         assertFailure(result);
@@ -3949,9 +3945,8 @@ public void test600AddAccountAlreadyExist() throws Exception {
 
             assertNotReached();
         } catch (ObjectAlreadyExistsException e) {
-            // This is expected
             then();
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         // THEN
diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyConsistency.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyConsistency.java
index 6a91ea7d6fd..f0bb8726a77 100644
--- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyConsistency.java
+++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyConsistency.java
@@ -1417,7 +1417,7 @@ public void test800AddAccountMorganAlreadyExists() throws Exception {
             assertNotReached();
         } catch (ObjectAlreadyExistsException e) {
             then();
-            displayException("expected exception", e);
+            displayExpectedException(e);
         }
 
         // THEN
@@ -1495,7 +1495,7 @@ public void test802AddAccountMorganAlreadyExistsAgain() throws Exception {
             assertNotReached();
         } catch (ObjectAlreadyExistsException e) {
             then();
-            displayException("expected exception", e);
+            displayExpectedException(e);
         }
 
         // THEN
@@ -1614,7 +1614,7 @@ public void test806RenameAccountElizabethAlreadyExists() throws Exception {
             assertNotReached();
         } catch (ObjectAlreadyExistsException e) {
             then();
-            displayException("expected exception", e);
+            displayExpectedException(e);
         }
 
         // THEN
@@ -1692,7 +1692,7 @@ public void test808RenameAccountElizabethAlreadyExistsAgain() throws Exception {
             assertNotReached();
         } catch (ObjectAlreadyExistsException e) {
             then();
-            displayException("expected exception", e);
+            displayExpectedException(e);
         }
 
         // THEN
@@ -1852,7 +1852,7 @@ public void test812ModifyAccountWillNotFound() throws Exception {
             assertNotReached();
         } catch (ObjectNotFoundException e) {
             then();
-            displayException("expected exception", e);
+            displayExpectedException(e);
         }
 
         // THEN
@@ -1991,7 +1991,7 @@ public void test816AddAccountElizabethAfterDeathAlreadyExists() throws Exception
             provisioningService.addObject(account, null, null, task, result);
         } catch (ObjectAlreadyExistsException e) {
             then();
-            displayException("expected exception", e);
+            displayExpectedException(e);
         }
 
         // THEN
diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyNegative.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyNegative.java
index 696a95ec261..56363517a0c 100644
--- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyNegative.java
+++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyNegative.java
@@ -136,8 +136,7 @@ public void test200AddAccountNullAttributes() throws Exception {
 
             assertNotReached();
         } catch (SchemaException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         then();
@@ -165,8 +164,7 @@ public void test201AddAccountEmptyAttributes() throws Exception {
 
             AssertJUnit.fail("The addObject operation was successful. But expecting an exception.");
         } catch (SchemaException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         syncServiceMock.assertNotifyFailureOnly();
@@ -195,8 +193,7 @@ public void test210AddAccountNoObjectClass() throws Exception {
 
             AssertJUnit.fail("The addObject operation was successful. But expecting an exception.");
         } catch (SchemaException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         syncServiceMock.assertNotifyFailureOnly();
@@ -223,8 +220,7 @@ public void test220AddAccountNoResourceRef() throws Exception {
 
             AssertJUnit.fail("The addObject operation was successful. But expecting an exception.");
         } catch (SchemaException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         //FIXME: not sure, if this check is needed..if the resource is not specified, provisioning probably will be not called.
@@ -251,10 +247,8 @@ public void test221DeleteAccountResourceNotFound() throws Exception {
             String oid = repositoryService.addObject(account, null, result);
             ProvisioningOperationOptions options = ProvisioningOperationOptions.createForce(true);
             provisioningService.deleteObject(ShadowType.class, oid, options, null, task, result);
-//            AssertJUnit.fail("The addObject operation was successful. But expecting an exception.");
         } catch (SchemaException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         //FIXME: is this really notify failure? the resource does not exist but shadow is deleted. maybe other case of notify?
@@ -287,12 +281,10 @@ public void test230GetAccountDeletedShadow() throws Exception {
 
             assertNotReached();
         } catch (ObjectNotFoundException e) {
-            // this is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
             result.computeStatus();
             display("Result", result);
             TestUtil.assertFailure(result);
-
         }
 
         syncServiceMock.assertNoNotifyChange();
diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummySecurity.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummySecurity.java
index 8462325d10b..0a6f86fc537 100644
--- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummySecurity.java
+++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummySecurity.java
@@ -69,8 +69,7 @@ public void test100AddAccountDrink() throws Exception {
 
             AssertJUnit.fail("Unexpected success");
         } catch (SecurityViolationException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
     }
 
@@ -188,10 +187,8 @@ public void test210ModifyAccountQuote() throws Exception {
                     new OperationProvisioningScriptsType(), null, task, result);
 
             AssertJUnit.fail("Unexpected success");
-
         } catch (SecurityViolationException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
     }
 
diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java
index 0f43f688692..5c113ffd5c8 100644
--- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java
+++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java
@@ -740,7 +740,7 @@ public void test111GetObjectNotFoundRepo() throws Exception {
             provisioningService.getObject(ObjectType.class, NON_EXISTENT_OID, null, task, result).asObjectable();
             Assert.fail("Expected exception, but haven't got one");
         } catch (ObjectNotFoundException e) {
-            // This is expected
+            displayExpectedException(e);
 
             // Just to close the top-level result.
             result.recordFatalError("Error :-)");
@@ -884,7 +884,7 @@ public void test130AddDeleteAccountSparrow() throws Exception {
             provisioningService.getObject(ShadowType.class, ACCOUNT_SPARROW_OID, null, task, result);
             Assert.fail("Expected exception ObjectNotFoundException, but haven't got one.");
         } catch (ObjectNotFoundException ex) {
-            displayException("Expected exception", ex);
+            displayExpectedException(ex);
         }
 
         try {
@@ -892,7 +892,7 @@ public void test130AddDeleteAccountSparrow() throws Exception {
             // objType = container.getObject();
             Assert.fail("Expected exception, but haven't got one.");
         } catch (ObjectNotFoundException ex) {
-            displayException("Expected exception", ex);
+            displayExpectedException(ex);
             assertTrue(ex.getMessage().contains(ACCOUNT_SPARROW_OID));
         }
 
@@ -2010,8 +2010,7 @@ public void test300AddObjectObjectAlreadyExistResource() throws Exception {
             AssertJUnit.fail("Expected addObject operation to fail but it was successful");
 
         } catch (ObjectAlreadyExistsException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
 
             // The exception should originate from the LDAP layers
             IntegrationTestTools.assertInMessageRecursive(e, "LDAP");
@@ -2036,8 +2035,7 @@ public void test310AddObjectNoSn() throws Exception {
             AssertJUnit.fail("Expected addObject operation to fail but it was successful");
 
         } catch (SchemaException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
 
             // This error should be detectable before it reaches a resource. Therefore we check that the
             // cause was not a LDAP exception
@@ -2157,7 +2155,7 @@ public void test329DeleteAccountPosix() throws Exception {
             provisioningService.getObject(ShadowType.class, ACCOUNT_POSIX_MCMUTTON_OID, null, task, result);
             Assert.fail("Expected exception ObjectNotFoundException, but haven't got one.");
         } catch (ObjectNotFoundException ex) {
-            displayException("Expected exception", ex);
+            displayExpectedException(ex);
         }
 
         try {
@@ -2165,7 +2163,7 @@ public void test329DeleteAccountPosix() throws Exception {
             // objType = container.getObject();
             Assert.fail("Expected exception, but haven't got one.");
         } catch (ObjectNotFoundException ex) {
-            displayException("Expected exception", ex);
+            displayExpectedException(ex);
             assertTrue(ex.getMessage().contains(ACCOUNT_POSIX_MCMUTTON_OID));
         }
 
@@ -2546,7 +2544,7 @@ public void test429DeleteAccountMorgan() throws Exception {
                     null, task, result).asObjectable();
             Assert.fail("Expected exception ObjectNotFoundException, but haven't got one.");
         } catch (ObjectNotFoundException ex) {
-            System.out.println("Catched ObjectNotFoundException.");
+            displayExpectedException(ex);
             assertNull(objType);
         }
 
diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDjNegative.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDjNegative.java
index 9d7039376e3..4bc255ff639 100644
--- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDjNegative.java
+++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDjNegative.java
@@ -158,8 +158,7 @@ public void test110GetObjectNoShadow() throws Exception {
 
             AssertJUnit.fail("getObject succeeded unexpectedly");
         } catch (ObjectNotFoundException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         result.computeStatus();
@@ -181,10 +180,8 @@ public void test111GetObjectShadow() throws Exception {
                     null, taskManager.createTaskInstance(), result).asObjectable();
 
             AssertJUnit.fail("getObject succeeded unexpectedly");
-//        } catch (CommunicationException e) {
         } catch (ConfigurationException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         result.computeStatus();
@@ -203,8 +200,7 @@ public void test120ListResourceObjects() throws Exception {
 
             AssertJUnit.fail("listResourceObjects succeeded unexpectedly");
         } catch (ConfigurationException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         result.computeStatus();
@@ -228,8 +224,7 @@ public void test121SearchAccounts() throws Exception {
 
             AssertJUnit.fail("searchObjectsIterative succeeded unexpectedly");
         } catch (ConfigurationException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         result.computeStatus();
@@ -263,8 +258,7 @@ public boolean handle(PrismObject<ObjectType> prismObject, OperationResult paren
 
             AssertJUnit.fail("searchObjectsIterative succeeded unexpectedly");
         } catch (ConfigurationException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         result.computeStatus();
@@ -286,8 +280,7 @@ public void test130AddAccountWill() throws Exception {
 
             AssertJUnit.fail("addObject succeeded unexpectedly");
         } catch (ConfigurationException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         result.computeStatus();
@@ -305,8 +298,7 @@ public void test140AddDeleteAccountSparrow() throws Exception {
 
             AssertJUnit.fail("addObject succeeded unexpectedly");
         } catch (ConfigurationException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         result.computeStatus();
@@ -330,8 +322,7 @@ public void test150ModifyObject() throws Exception {
 
             AssertJUnit.fail("addObject succeeded unexpectedly");
         } catch (ConfigurationException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         result.computeStatus();
@@ -353,8 +344,7 @@ public void test190Synchronize() throws Exception {
 
             AssertJUnit.fail("addObject succeeded unexpectedly");
         } catch (CommunicationException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         result.computeStatus();
@@ -397,8 +387,7 @@ public void test510GetObjectNoShadow() throws Exception {
 
             AssertJUnit.fail("getObject succeeded unexpectedly");
         } catch (ObjectNotFoundException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         result.computeStatus();
@@ -448,8 +437,7 @@ public void test520ListResourceObjects() throws Exception {
 
             AssertJUnit.fail("listResourceObjects succeeded unexpectedly");
         } catch (CommunicationException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         assertFailure(result);
@@ -473,8 +461,7 @@ public void test521SearchAccounts() throws SchemaException, ObjectNotFoundExcept
 
             AssertJUnit.fail("searchObjectsIterative succeeded unexpectedly");
         } catch (CommunicationException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         result.computeStatus();
@@ -506,8 +493,7 @@ public boolean handle(PrismObject<ObjectType> prismObject, OperationResult paren
 
             AssertJUnit.fail("searchObjectsIterative succeeded unexpectedly");
         } catch (CommunicationException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         assertFailure(result);
@@ -549,7 +535,7 @@ public void test530AddAccountWill() throws Exception {
 
             assertNotReached();
         } catch (GenericConnectorException e) {
-            displayException("expected exception", e);
+            displayExpectedException(e);
         }
 
         Collection<SelectorOptions<GetOperationOptions>> options = SelectorOptions.createCollection(GetOperationOptions.createPointInTimeType(PointInTimeType.FUTURE));
@@ -653,8 +639,7 @@ public void test590Synchronize() throws Exception {
 
             AssertJUnit.fail("addObject succeeded unexpectedly");
         } catch (CommunicationException e) {
-            // This is expected
-            displayException("Expected exception", e);
+            displayExpectedException(e);
         }
 
         assertFailure(result);
diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestServiceAccounts.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestServiceAccounts.java
index 20a451fa14c..aaacb439532 100644
--- a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestServiceAccounts.java
+++ b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestServiceAccounts.java
@@ -150,9 +150,8 @@ serviceAccountShadowOid, getDummyResourceController().getAttributeFullnamePath()
             assertNotReached();
 
         } catch (UnsupportedOperationException e) {
-            // THEN
             then();
-            displayException("expected exception", e);
+            displayExpectedException(e);
         }
 
         assertFailure(result);
@@ -195,9 +194,8 @@ public void test104DeleteServiceAccount() throws Exception {
             assertNotReached();
 
         } catch (UnsupportedOperationException e) {
-            // THEN
             then();
-            displayException("expected exception", e);
+            displayExpectedException(e);
         }
 
         assertFailure(result);
@@ -371,9 +369,8 @@ public void test140CreateServiceAccount() throws Exception {
             assertNotReached();
 
         } catch (UnsupportedOperationException e) {
-            // THEN
             then();
-            displayException("expected exception", e);
+            displayExpectedException(e);
         }
 
         assertFailure(result);
diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java
index c4e58ea5f1d..eddfac505d9 100644
--- a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java
+++ b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java
@@ -1447,8 +1447,7 @@ public void test300AddUserCapsizeUnixFail() throws Exception {
 
             AssertJUnit.fail("Unexpected success");
         } catch (ExpressionEvaluationException e) {
-            displayException("Expected exception", e);
-            // this is expected
+            displayExpectedException(e);
         }
 
         // THEN