diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/ImmutableAggregateTemplateHsqlIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/ImmutableAggregateTemplateHsqlIntegrationTests.java
index f6cff1796..481e7d1f4 100644
--- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/ImmutableAggregateTemplateHsqlIntegrationTests.java
+++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/ImmutableAggregateTemplateHsqlIntegrationTests.java
@@ -15,12 +15,12 @@
  */
 package org.springframework.data.jdbc.core;
 
-import static java.util.Collections.singletonList;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.tuple;
+import static java.util.Collections.*;
+import static org.assertj.core.api.Assertions.*;
 
 import lombok.Value;
 import lombok.experimental.Wither;
+
 import org.assertj.core.api.SoftAssertions;
 import org.junit.ClassRule;
 import org.junit.Rule;
@@ -44,6 +44,7 @@ import org.springframework.transaction.annotation.Transactional;
  * Integration tests for {@link JdbcAggregateTemplate} and it's handling of immutable entities.
  *
  * @author Jens Schauder
+ * @author Salim Achouche
  */
 @ContextConfiguration
 @Transactional
diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryCrossAggregateHsqlIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryCrossAggregateHsqlIntegrationTests.java
index 2ff16e81e..7b654486c 100644
--- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryCrossAggregateHsqlIntegrationTests.java
+++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryCrossAggregateHsqlIntegrationTests.java
@@ -44,6 +44,8 @@ import org.springframework.transaction.annotation.Transactional;
  * Very simple use cases for creation and usage of JdbcRepositories.
  *
  * @author Jens Schauder
+ * @author Salim Achouche
+ * @author Salim Achouche
  */
 @ContextConfiguration
 @Transactional
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 5eaccd85d..ebbefa01f 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
@@ -49,6 +49,7 @@ import org.springframework.test.context.ActiveProfiles;
  *
  * @author Kazuki Shimizu
  * @author Jens Schauder
+ * @author Salim Achouche
  */
 @ActiveProfiles("hsql")
 public class EnableJdbcAuditingHsqlIntegrationTests {
@@ -193,10 +194,8 @@ public class EnableJdbcAuditingHsqlIntegrationTests {
 
 		return (Consumer<R> test) -> {
 
-			try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext()) {
-                context.getEnvironment().setActiveProfiles("hsql");
-                context.register(configurationClasses);
-                context.refresh();
+			try (ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(configurationClasses)) {
+
 				test.accept(context.getBean(repositoryType));
 
 				softly.assertAll();
@@ -238,7 +237,6 @@ public class EnableJdbcAuditingHsqlIntegrationTests {
 
 	@ComponentScan("org.springframework.data.jdbc.testing")
 	@EnableJdbcRepositories(considerNestedRepositories = true)
-	@ActiveProfiles("hsql")
 	static class TestConfiguration {
 
 		@Bean