diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java
index b523a2fd..3f8b2c0d 100644
--- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java
+++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java
@@ -134,7 +134,7 @@ public class EnableJdbcAuditingHsqlIntegrationTests {
 
 							entity = repository.save(entity);
 
-							assertThat(repository.findById(entity.id).get()).isEqualTo(entity);
+							assertThat(repository.findById(entity.id)).contains(entity);
 						});
 	}
 
@@ -192,7 +192,6 @@ public class EnableJdbcAuditingHsqlIntegrationTests {
 							AuditingAnnotatedDummyEntity entity = repository.save(new AuditingAnnotatedDummyEntity());
 
 							assertThat(entity.id).isNotNull();
-
 						});
 	}
 
diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/domain/support/RelationalAuditingEventListener.java b/spring-data-relational/src/main/java/org/springframework/data/relational/domain/support/RelationalAuditingEventListener.java
index 6e0882e8..82e9ca6a 100644
--- a/spring-data-relational/src/main/java/org/springframework/data/relational/domain/support/RelationalAuditingEventListener.java
+++ b/spring-data-relational/src/main/java/org/springframework/data/relational/domain/support/RelationalAuditingEventListener.java
@@ -35,8 +35,8 @@ import org.springframework.data.relational.core.mapping.event.BeforeSaveEvent;
 public class RelationalAuditingEventListener implements ApplicationListener<BeforeSaveEvent>, Ordered {
 
 	/**
-	 * The order used for this {@link org.springframework.context.event.EventListener}. This ensures that it will run
-	 * before other listeners without a specified priority.
+	 * The order used for this {@link org.springframework.context.event.EventListener}. Ordering ensures that this
+	 * {@link ApplicationListener} will run before other listeners without a specified priority.
 	 *
 	 * @see org.springframework.core.annotation.Order
 	 * @see Ordered
@@ -47,7 +47,7 @@ public class RelationalAuditingEventListener implements ApplicationListener<Befo
 
 	/**
 	 * {@inheritDoc}
-	 * 
+	 *
 	 * @param event a notification event for indicating before save
 	 */
 	@Override
@@ -55,6 +55,10 @@ public class RelationalAuditingEventListener implements ApplicationListener<Befo
 		handler.markAudited(event.getEntity());
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.core.Ordered#getOrder()
+	 */
 	@Override
 	public int getOrder() {
 		return AUDITING_ORDER;