diff --git a/core/spring-cloud-stream-integration-tests/src/test/java/org/springframework/cloud/stream/binder/tck/ContentTypeTckTests.java b/core/spring-cloud-stream-integration-tests/src/test/java/org/springframework/cloud/stream/binder/tck/ContentTypeTckTests.java
index b3c987534a..28a089b781 100644
--- a/core/spring-cloud-stream-integration-tests/src/test/java/org/springframework/cloud/stream/binder/tck/ContentTypeTckTests.java
+++ b/core/spring-cloud-stream-integration-tests/src/test/java/org/springframework/cloud/stream/binder/tck/ContentTypeTckTests.java
@@ -742,7 +742,7 @@ public AlwaysStringKryoMessageConverter kryoOverrideMessageConverter() {
 
 		/**
 		 * Even though this MessageConverter has nothing to do with Kryo it still shows
-		 * how Kryo conversion can be customized/overriden since it simply overriding a
+		 * how Kryo conversion can be customized/overridden since it simply overriding a
 		 * converter for contentType 'application/x-java-object'.
 		 *
 		 */
diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/MessageConverterTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/MessageConverterTests.java
index 1cb6362dac..3cbe6dda85 100644
--- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/MessageConverterTests.java
+++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/MessageConverterTests.java
@@ -26,7 +26,7 @@
 import org.springframework.messaging.support.GenericMessage;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 /**
  * @author Gary Russell
@@ -127,14 +127,8 @@ void headerEmbeddingMissingHeader() throws Exception {
 	void badDecode() throws Exception {
 		byte[] bytes = new byte[] { (byte) 0xff, 99 };
 		Message<byte[]> message = new GenericMessage<>(bytes);
-		try {
-			EmbeddedHeaderUtils.extractHeaders(message, false);
-			fail("Exception expected");
-		}
-		catch (Exception e) {
-			String s = EmbeddedHeaderUtils.decodeExceptionMessage(message);
-			assertThat(e).isInstanceOf(BufferUnderflowException.class);
-		}
+		assertThatThrownBy(() -> EmbeddedHeaderUtils.extractHeaders(message, false))
+				.isInstanceOf(BufferUnderflowException.class);
 	}
 
 }