diff --git a/pom.xml b/pom.xml
index 9d60cefa32..de75f44161 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-redis</artifactId>
-	<version>2.2.0.BUILD-SNAPSHOT</version>
+	<version>2.2.0.DATAREDIS-575-SNAPSHOT</version>
 
 	<name>Spring Data Redis</name>
 
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java
index ea83951d00..4a93314991 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java
@@ -427,10 +427,12 @@ protected JedisCluster createCluster(RedisClusterConfiguration clusterConfig, Ge
 
 		int connectTimeout = getConnectTimeout();
 		int readTimeout = getReadTimeout();
+		String password = getPassword();
+		String clientName = getClientName();
 
-		return StringUtils.hasText(getPassword())
-				? new JedisCluster(hostAndPort, connectTimeout, readTimeout, redirects, getPassword(), poolConfig)
-				: new JedisCluster(hostAndPort, connectTimeout, readTimeout, redirects, poolConfig);
+		return new JedisCluster(hostAndPort, connectTimeout, readTimeout, redirects,
+				StringUtils.hasText(password) ? password : null, StringUtils.hasText(clientName) ? clientName : null,
+				poolConfig);
 	}
 
 	/*
diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactoryIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactoryIntegrationTests.java
index fd9798135e..54e509b896 100644
--- a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactoryIntegrationTests.java
+++ b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactoryIntegrationTests.java
@@ -15,14 +15,15 @@
  */
 package org.springframework.data.redis.connection.jedis;
 
-import static org.hamcrest.core.IsEqual.*;
-import static org.junit.Assert.*;
+import static org.assertj.core.api.Assertions.*;
 
 import redis.clients.jedis.JedisShardInfo;
 
 import org.junit.After;
 import org.junit.Test;
+
 import org.springframework.data.redis.SettingsUtils;
+import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
 
 /**
@@ -52,17 +53,30 @@ public void shardInfoShouldOverrideFactorySettings() {
 		factory.setPort(1234);
 		factory.afterPropertiesSet();
 
-		assertThat(factory.getConnection().ping(), equalTo("PONG"));
+		assertThat(factory.getConnection().ping()).isEqualTo("PONG");
 	}
 
 	@Test // DATAREDIS-574
-	public void shouldInitiaizeWithStandaloneConfiguration() {
+	public void shouldInitializeWithStandaloneConfiguration() {
 
 		factory = new JedisConnectionFactory(
 				new RedisStandaloneConfiguration(SettingsUtils.getHost(), SettingsUtils.getPort()),
 				JedisClientConfiguration.defaultConfiguration());
 		factory.afterPropertiesSet();
 
-		assertThat(factory.getConnection().ping(), equalTo("PONG"));
+		assertThat(factory.getConnection().ping()).isEqualTo("PONG");
+	}
+
+	@Test // DATAREDIS-575
+	public void connectionAppliesClientName() {
+
+		factory = new JedisConnectionFactory(
+				new RedisStandaloneConfiguration(SettingsUtils.getHost(), SettingsUtils.getPort()),
+				JedisClientConfiguration.builder().clientName("clientName").build());
+		factory.afterPropertiesSet();
+
+		RedisConnection connection = factory.getConnection();
+
+		assertThat(connection.getClientName()).isEqualTo("clientName");
 	}
 }