diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionFactory.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionFactory.java
index c5e01ab7a..099067bbd 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionFactory.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionFactory.java
@@ -287,7 +287,7 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean,
 	 * @param index database index
 	 */
 	public void setDatabase(int index) {
-		Assert.isTrue(index >= 0 && index < 16, "invalid DB index (needs to be between 0 and 15)");
+		Assert.isTrue(index >= 0, "invalid DB index (a positive index required)");
 		this.dbIndex = index;
 	}
 }
\ No newline at end of file
diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jredis/JredisConnectionFactory.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jredis/JredisConnectionFactory.java
index b833e78da..87ae5c1a5 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jredis/JredisConnectionFactory.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jredis/JredisConnectionFactory.java
@@ -231,7 +231,7 @@ public class JredisConnectionFactory implements InitializingBean, DisposableBean
 	 * @param index database index
 	 */
 	public void setDatabase(int index) {
-		Assert.isTrue(index >= 0 && index < 16, "invalid DB index (needs to be between 0 and 15)");
+		Assert.isTrue(index >= 0, "invalid DB index (a positive index required)");
 		this.dbIndex = index;
 	}
 }
\ No newline at end of file