diff --git a/src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java b/src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java
index 93a848798..e434051b2 100644
--- a/src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java
+++ b/src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java
@@ -631,6 +631,7 @@ public class SrpConnection implements RedisConnection {
 		try {
 			if (isPipelined()) {
 				pipeline(pipeline.select(dbIndex));
+				return;
 			}
 			client.select(dbIndex);
 		} catch (Exception ex) {
diff --git a/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java
index 0f735970f..8a41a39a7 100644
--- a/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java
+++ b/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java
@@ -107,6 +107,11 @@ public abstract class AbstractConnectionIntegrationTests {
 		connection.close();
 		connection = null;
 	}
+	
+	public void testSelect() {
+		// Make sure this doesn't throw Exception
+		connection.select(1);
+	}
 
 	@Test
 	@IfProfileValue(name = "runLongTests", value = "true")
diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionPipelineIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionPipelineIntegrationTests.java
index b86c308e0..386f0ea9f 100644
--- a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionPipelineIntegrationTests.java
+++ b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionPipelineIntegrationTests.java
@@ -235,6 +235,11 @@ public class JedisConnectionPipelineIntegrationTests extends
 	public void testZRevRangeByScoreWithScoresOffsetCount() {
 		super.testZRevRangeByScoreWithScoresOffsetCount();
 	}
+	
+	@Test(expected = UnsupportedOperationException.class)
+	public void testSelect() {
+		super.testSelect();
+	}
 
 	@Test(expected=UnsupportedOperationException.class)
 	public void testHIncrByDouble() {
diff --git a/src/test/java/org/springframework/data/redis/connection/jredis/JRedisConnectionIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/jredis/JRedisConnectionIntegrationTests.java
index 08aba3e96..ba26a3a8d 100644
--- a/src/test/java/org/springframework/data/redis/connection/jredis/JRedisConnectionIntegrationTests.java
+++ b/src/test/java/org/springframework/data/redis/connection/jredis/JRedisConnectionIntegrationTests.java
@@ -294,6 +294,11 @@ public class JRedisConnectionIntegrationTests extends AbstractConnectionIntegrat
 	public void testZRevRangeByScoreWithScoresOffsetCount() {
 		super.testZRevRangeByScoreWithScoresOffsetCount();
 	}
+	
+	@Test(expected = UnsupportedOperationException.class)
+	public void testSelect() {
+		super.testSelect();
+	}
 
 	@Test(expected=UnsupportedOperationException.class)
 	public void testPExpire() {
diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionIntegrationTests.java
index e1aed6f21..4edb7bb8a 100644
--- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionIntegrationTests.java
+++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionIntegrationTests.java
@@ -203,7 +203,7 @@ public class LettuceConnectionIntegrationTests extends AbstractConnectionIntegra
 
 	@Test(expected = UnsupportedOperationException.class)
 	public void testSelect() {
-		connection.select(1);
+		super.testSelect();
 	}
 
 	@Test
diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionPipelineIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionPipelineIntegrationTests.java
index 0e87f7202..0e072f522 100644
--- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionPipelineIntegrationTests.java
+++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionPipelineIntegrationTests.java
@@ -67,6 +67,11 @@ public class LettuceConnectionPipelineIntegrationTests extends
 	@Ignore("DATAREDIS-144 Lettuce closePipeline hangs with discarded transaction")
 	public void testMultiDiscard() {
 	}
+	
+	@Test(expected=UnsupportedOperationException.class)
+	public void testSelect() {
+		super.testSelect();
+	}
 
 	// Overrides, usually due to return values being Long vs Boolean or Set vs
 	// List