diff --git a/src/test/java/org/kiwiproject/jdbc/UncheckedSQLExceptionTest.java b/src/test/java/org/kiwiproject/jdbc/UncheckedSQLExceptionTest.java
index 676783d1..b94bd72c 100644
--- a/src/test/java/org/kiwiproject/jdbc/UncheckedSQLExceptionTest.java
+++ b/src/test/java/org/kiwiproject/jdbc/UncheckedSQLExceptionTest.java
@@ -17,7 +17,8 @@ void shouldConstructWithMessageAndSQLException() {
 
         assertThat(runtimeSQLEx)
                 .hasMessage("java.sql.SQLException: Illegal syntax or something like that...")
-                .hasCauseReference(sqlEx);
+                .cause()
+                .isSameAs(sqlEx);
     }
 
     @Test
@@ -27,6 +28,7 @@ void shouldConstructWithSQLException() {
 
         assertThat(runtimeSQLEx)
                 .hasMessage("Statement error")
-                .hasCauseReference(sqlEx);
+                .cause()
+                .isSameAs(sqlEx);
     }
 }
diff --git a/src/test/java/org/kiwiproject/xml/UncheckedJAXBExceptionTest.java b/src/test/java/org/kiwiproject/xml/UncheckedJAXBExceptionTest.java
index c3943ad8..817a1ef2 100644
--- a/src/test/java/org/kiwiproject/xml/UncheckedJAXBExceptionTest.java
+++ b/src/test/java/org/kiwiproject/xml/UncheckedJAXBExceptionTest.java
@@ -22,21 +22,24 @@ void setUp() {
     @Test
     void shouldAcceptMessage() {
         assertThat(new UncheckedJAXBException("oops", cause))
-                .hasCauseReference(cause)
-                .hasMessage("oops");
+                .hasMessage("oops")
+                .cause()
+                .isSameAs(cause);
     }
 
     @Test
     void shouldAcceptMessageAndCause() {
         assertThat(new UncheckedJAXBException("bad XML", cause))
                 .hasMessage("bad XML")
-                .hasCauseReference(cause);
+                .cause()
+                .isSameAs(cause);
     }
 
     @Test
     void shouldAcceptCause() {
         assertThat(new UncheckedJAXBException(cause))
                 .hasMessageContaining(CAUSE_MESSAGE)
-                .hasCauseReference(cause);
+                .cause()
+                .isSameAs(cause);
     }
 }
diff --git a/src/test/java/org/kiwiproject/xml/XmlRuntimeExceptionTest.java b/src/test/java/org/kiwiproject/xml/XmlRuntimeExceptionTest.java
index 20e3ce3b..47673885 100644
--- a/src/test/java/org/kiwiproject/xml/XmlRuntimeExceptionTest.java
+++ b/src/test/java/org/kiwiproject/xml/XmlRuntimeExceptionTest.java
@@ -22,7 +22,8 @@ void shouldAcceptMessageAndCause() {
         var cause = new IOException("oops");
         assertThat(new XmlRuntimeException("bad Xml", cause))
                 .hasMessage("bad Xml")
-                .hasCauseReference(cause);
+                .cause()
+                .isSameAs(cause);
     }
 
     @Test
@@ -30,6 +31,7 @@ void shouldAcceptCause() {
         var cause = new IOException("the cause");
         assertThat(new XmlRuntimeException(cause))
                 .hasMessageContaining("the cause")
-                .hasCauseReference(cause);
+                .cause()
+                .isSameAs(cause);
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/kiwiproject/yaml/RuntimeYamlExceptionTest.java b/src/test/java/org/kiwiproject/yaml/RuntimeYamlExceptionTest.java
index 119e2490..f14fef57 100644
--- a/src/test/java/org/kiwiproject/yaml/RuntimeYamlExceptionTest.java
+++ b/src/test/java/org/kiwiproject/yaml/RuntimeYamlExceptionTest.java
@@ -22,7 +22,8 @@ void shouldAcceptMessageAndCause() {
         var cause = new IOException("oops");
         assertThat(new RuntimeYamlException("bad YAML", cause))
                 .hasMessage("bad YAML")
-                .hasCauseReference(cause);
+                .cause()
+                .isSameAs(cause);
     }
 
     @Test
@@ -30,6 +31,7 @@ void shouldAcceptCause() {
         var cause = new IOException("the cause");
         assertThat(new RuntimeYamlException(cause))
                 .hasMessageContaining("the cause")
-                .hasCauseReference(cause);
+                .cause()
+                .isSameAs(cause);
     }
-}
\ No newline at end of file
+}