diff --git a/src/main/java/org/springframework/data/redis/repository/cdi/CdiBean.java b/src/main/java/org/springframework/data/redis/repository/cdi/CdiBean.java
index a10478ba5..7c80f4f37 100644
--- a/src/main/java/org/springframework/data/redis/repository/cdi/CdiBean.java
+++ b/src/main/java/org/springframework/data/redis/repository/cdi/CdiBean.java
@@ -34,8 +34,8 @@ import javax.enterprise.inject.spi.BeanManager;
 import javax.enterprise.inject.spi.InjectionPoint;
 import javax.enterprise.inject.spi.PassivationCapable;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -47,7 +47,7 @@ import org.springframework.util.StringUtils;
  */
 public abstract class CdiBean<T> implements Bean<T>, PassivationCapable {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(CdiBean.class);
+	private final Log log = LogFactory.getLog(getClass());
 
 	protected final BeanManager beanManager;
 
@@ -155,8 +155,8 @@ public abstract class CdiBean<T> implements Bean<T>, PassivationCapable {
 	 */
 	public void destroy(T instance, CreationalContext<T> creationalContext) {
 
-		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug(String.format("Destroying bean instance %s for repository type '%s'.", instance.toString(),
+		if (log.isDebugEnabled()) {
+			log.debug(String.format("Destroying bean instance %s for repository type '%s'.", instance.toString(),
 					beanClass.getName()));
 		}
 
diff --git a/src/main/java/org/springframework/data/redis/repository/cdi/RedisRepositoryExtension.java b/src/main/java/org/springframework/data/redis/repository/cdi/RedisRepositoryExtension.java
index 67f7cbcb3..3a09c7f22 100644
--- a/src/main/java/org/springframework/data/redis/repository/cdi/RedisRepositoryExtension.java
+++ b/src/main/java/org/springframework/data/redis/repository/cdi/RedisRepositoryExtension.java
@@ -31,8 +31,8 @@ import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
 import javax.enterprise.inject.spi.ProcessBean;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.data.keyvalue.core.KeyValueOperations;
 import org.springframework.data.redis.core.RedisKeyValueAdapter;
 import org.springframework.data.redis.core.RedisKeyValueTemplate;
@@ -50,14 +50,13 @@ import org.springframework.data.repository.cdi.CdiRepositoryExtensionSupport;
  */
 public class RedisRepositoryExtension extends CdiRepositoryExtensionSupport {
 
-	private static final Logger LOG = LoggerFactory.getLogger(RedisRepositoryExtension.class);
-
+	private final Log log = LogFactory.getLog(RedisRepositoryExtension.class);
 	private final Map<Set<Annotation>, Bean<RedisKeyValueAdapter>> redisKeyValueAdapters = new HashMap<>();
 	private final Map<Set<Annotation>, Bean<KeyValueOperations>> redisKeyValueTemplates = new HashMap<>();
 	private final Map<Set<Annotation>, Bean<RedisOperations<?, ?>>> redisOperations = new HashMap<>();
 
 	public RedisRepositoryExtension() {
-		LOG.info("Activating CDI extension for Spring Data Redis repositories.");
+		log.info("Activating CDI extension for Spring Data Redis repositories.");
 	}
 
 	/**
@@ -79,8 +78,8 @@ public class RedisRepositoryExtension extends CdiRepositoryExtensionSupport {
 			}
 
 			if (beanType instanceof Class<?> && RedisKeyValueTemplate.class.isAssignableFrom((Class<?>) beanType)) {
-				if (LOG.isDebugEnabled()) {
-					LOG.debug(String.format("Discovered %s with qualifiers %s.", RedisKeyValueTemplate.class.getName(),
+				if (log.isDebugEnabled()) {
+					log.debug(String.format("Discovered %s with qualifiers %s.", RedisKeyValueTemplate.class.getName(),
 							bean.getQualifiers()));
 				}
 
@@ -89,8 +88,8 @@ public class RedisRepositoryExtension extends CdiRepositoryExtensionSupport {
 			}
 
 			if (beanType instanceof Class<?> && RedisKeyValueAdapter.class.isAssignableFrom((Class<?>) beanType)) {
-				if (LOG.isDebugEnabled()) {
-					LOG.debug(String.format("Discovered %s with qualifiers %s.", RedisKeyValueAdapter.class.getName(),
+				if (log.isDebugEnabled()) {
+					log.debug(String.format("Discovered %s with qualifiers %s.", RedisKeyValueAdapter.class.getName(),
 							bean.getQualifiers()));
 				}
 
@@ -99,8 +98,8 @@ public class RedisRepositoryExtension extends CdiRepositoryExtensionSupport {
 			}
 
 			if (beanType instanceof Class<?> && RedisOperations.class.isAssignableFrom((Class<?>) beanType)) {
-				if (LOG.isDebugEnabled()) {
-					LOG.debug(String.format("Discovered %s with qualifiers %s.", RedisOperations.class.getName(),
+				if (log.isDebugEnabled()) {
+					log.debug(String.format("Discovered %s with qualifiers %s.", RedisOperations.class.getName(),
 							bean.getQualifiers()));
 				}
 
@@ -122,8 +121,8 @@ public class RedisRepositoryExtension extends CdiRepositoryExtensionSupport {
 			// Create the bean representing the repository.
 			CdiRepositoryBean<?> repositoryBean = createRepositoryBean(repositoryType, qualifiers, beanManager);
 
-			if (LOG.isInfoEnabled()) {
-				LOG.info(String.format("Registering bean for %s with qualifiers %s.", repositoryType.getName(), qualifiers));
+			if (log.isInfoEnabled()) {
+				log.info(String.format("Registering bean for %s with qualifiers %s.", repositoryType.getName(), qualifiers));
 			}
 
 			// Register the bean to the container.
@@ -147,8 +146,8 @@ public class RedisRepositoryExtension extends CdiRepositoryExtensionSupport {
 			Set<Annotation> qualifiers = entry.getValue();
 
 			if (!redisKeyValueAdapters.containsKey(qualifiers)) {
-				if (LOG.isInfoEnabled()) {
-					LOG.info(String.format("Registering bean for %s with qualifiers %s.", RedisKeyValueAdapter.class.getName(),
+				if (log.isInfoEnabled()) {
+					log.info(String.format("Registering bean for %s with qualifiers %s.", RedisKeyValueAdapter.class.getName(),
 							qualifiers));
 				}
 				RedisKeyValueAdapterBean redisKeyValueAdapterBean = createRedisKeyValueAdapterBean(qualifiers, beanManager);
@@ -157,8 +156,8 @@ public class RedisRepositoryExtension extends CdiRepositoryExtensionSupport {
 			}
 
 			if (!redisKeyValueTemplates.containsKey(qualifiers)) {
-				if (LOG.isInfoEnabled()) {
-					LOG.info(String.format("Registering bean for %s with qualifiers %s.", RedisKeyValueTemplate.class.getName(),
+				if (log.isInfoEnabled()) {
+					log.info(String.format("Registering bean for %s with qualifiers %s.", RedisKeyValueTemplate.class.getName(),
 							qualifiers));
 				}
 
diff --git a/src/test/java/org/springframework/data/redis/repository/cdi/CdiExtensionIntegrationTests.java b/src/test/java/org/springframework/data/redis/repository/cdi/CdiExtensionIntegrationTests.java
index 57317831c..bee6706ed 100644
--- a/src/test/java/org/springframework/data/redis/repository/cdi/CdiExtensionIntegrationTests.java
+++ b/src/test/java/org/springframework/data/redis/repository/cdi/CdiExtensionIntegrationTests.java
@@ -29,8 +29,6 @@ import javax.enterprise.inject.spi.Bean;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Integration tests for Spring Data Redis CDI extension.
@@ -39,8 +37,6 @@ import org.slf4j.LoggerFactory;
  */
 public class CdiExtensionIntegrationTests {
 
-	private static Logger LOGGER = LoggerFactory.getLogger(CdiExtensionIntegrationTests.class);
-
 	static SeContainer container;
 
 	@BeforeClass
@@ -50,8 +46,6 @@ public class CdiExtensionIntegrationTests {
 				.disableDiscovery() //
 				.addPackages(RepositoryConsumer.class) //
 				.initialize();
-
-		LOGGER.debug("CDI container bootstrapped!");
 	}
 
 	@AfterClass