diff --git a/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/redis/RedisServiceConnectorCreatorTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/redis/RedisServiceConnectorCreatorTest.java
index 38ee121..227d638 100644
--- a/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/redis/RedisServiceConnectorCreatorTest.java
+++ b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/redis/RedisServiceConnectorCreatorTest.java
@@ -2,6 +2,7 @@ package org.springframework.cloud.service.redis;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
 import static org.mockito.Mockito.when;
 
 import org.junit.Before;
@@ -59,12 +60,15 @@ public class RedisServiceConnectorCreatorTest {
 			assertEquals(serviceInfo.getHost(), connectionFactory.getHostName());
 			assertEquals(serviceInfo.getPort(), connectionFactory.getPort());
 			assertEquals(serviceInfo.getPassword(), connectionFactory.getPassword());
-		}
-		if (connector instanceof LettuceConnectionFactory) {
+		} else if (connector instanceof LettuceConnectionFactory) {
 			LettuceConnectionFactory connectionFactory = (LettuceConnectionFactory) connector;
 			assertEquals(serviceInfo.getHost(), connectionFactory.getHostName());
 			assertEquals(serviceInfo.getPort(), connectionFactory.getPort());
 			assertEquals(serviceInfo.getPassword(), connectionFactory.getPassword());
+		} else {
+			fail("Expected RedisConnectionFactory of type " +
+					JedisConnectionFactory.class.getName() + " or " + LettuceConnectionFactory.class.getName() +
+					" but was of type " + connector.getClass().getName());
 		}
 	}
 }
diff --git a/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/redis/SpringData1RedisServiceConnectorCreatorTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/redis/SpringData1RedisServiceConnectorCreatorTest.java
index 3c281ee..edaa014 100644
--- a/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/redis/SpringData1RedisServiceConnectorCreatorTest.java
+++ b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/redis/SpringData1RedisServiceConnectorCreatorTest.java
@@ -2,6 +2,7 @@ package org.springframework.cloud.service.redis;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
 import static org.mockito.Mockito.when;
 
 import org.junit.Before;
@@ -11,7 +12,8 @@ import org.mockito.MockitoAnnotations;
 import org.springframework.cloud.service.common.RedisServiceInfo;
 import org.springframework.cloud.service.keyval.SpringData1RedisConnectionFactoryCreator;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.test.util.ReflectionTestUtils;
+import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 
 /**
  *
@@ -53,8 +55,21 @@ public class SpringData1RedisServiceConnectorCreatorTest {
     private void assertConnectorProperties(RedisServiceInfo serviceInfo, RedisConnectionFactory connector) {
         assertNotNull(connector);
 
-        assertEquals(serviceInfo.getHost(), ReflectionTestUtils.getField(connector, "hostName"));
-        assertEquals(serviceInfo.getPort(), ReflectionTestUtils.getField(connector, "port"));
-        assertEquals(serviceInfo.getPassword(), ReflectionTestUtils.getField(connector, "password"));
+        if (connector instanceof JedisConnectionFactory) {
+            JedisConnectionFactory connectionFactory = (JedisConnectionFactory) connector;
+            assertEquals(serviceInfo.getHost(), connectionFactory.getHostName());
+            assertEquals(serviceInfo.getPort(), connectionFactory.getPort());
+            assertEquals(serviceInfo.getPassword(), connectionFactory.getPassword());
+        } else if (connector instanceof LettuceConnectionFactory) {
+            LettuceConnectionFactory connectionFactory = (LettuceConnectionFactory) connector;
+            assertEquals(serviceInfo.getHost(), connectionFactory.getHostName());
+            assertEquals(serviceInfo.getPort(), connectionFactory.getPort());
+            assertEquals(serviceInfo.getPassword(), connectionFactory.getPassword());
+        } else {
+            fail("Expected RedisConnectionFactory of type " +
+                    JedisConnectionFactory.class.getName() + " or " + LettuceConnectionFactory.class.getName() +
+                    " but was of type " + connector.getClass().getName());
+        }
     }
+
 }