diff --git a/pom.xml b/pom.xml
index 04e877bd0..72cacd09c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,8 +21,8 @@
 		<module>spring-cloud-stream-binder-kafka</module>
 		<module>spring-cloud-starter-stream-kafka</module>
 		<module>spring-cloud-stream-binder-kafka-docs</module>
-		<module>spring-cloud-stream-binder-kafka-0.9.0.1-test</module>
-		<module>spring-cloud-stream-binder-kafka-0.10.0.1-test</module>
+		<module>spring-cloud-stream-binder-kafka-0.9-test</module>
+		<module>spring-cloud-stream-binder-kafka-0.10.0-test</module>
 	</modules>
 
 	<dependencyManagement>
diff --git a/spring-cloud-stream-binder-kafka-0.10.0.1-test/pom.xml b/spring-cloud-stream-binder-kafka-0.10.0-test/pom.xml
similarity index 95%
rename from spring-cloud-stream-binder-kafka-0.10.0.1-test/pom.xml
rename to spring-cloud-stream-binder-kafka-0.10.0-test/pom.xml
index 8c7505f27..61a235e25 100644
--- a/spring-cloud-stream-binder-kafka-0.10.0.1-test/pom.xml
+++ b/spring-cloud-stream-binder-kafka-0.10.0-test/pom.xml
@@ -6,8 +6,8 @@
 		<artifactId>spring-cloud-stream-binder-kafka-parent</artifactId>
 		<version>1.2.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-cloud-stream-binder-kafka-0.10.0.1-test</artifactId>
-	<description>Spring Cloud Stream Kafka Binder 0.10.0.1 Tests</description>
+	<artifactId>spring-cloud-stream-binder-kafka-0.10.0-test</artifactId>
+	<description>Spring Cloud Stream Kafka Binder 0.10.0 Tests</description>
 	<url>http://projects.spring.io/spring-cloud</url>
 	<organization>
 		<name>Pivotal Software, Inc.</name>
diff --git a/spring-cloud-stream-binder-kafka-0.10.0.1-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka01001BinderTests.java b/spring-cloud-stream-binder-kafka-0.10.0-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka_0_10_0_BinderTests.java
similarity index 92%
rename from spring-cloud-stream-binder-kafka-0.10.0.1-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka01001BinderTests.java
rename to spring-cloud-stream-binder-kafka-0.10.0-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka_0_10_0_BinderTests.java
index 67050befa..34ad2c233 100644
--- a/spring-cloud-stream-binder-kafka-0.10.0.1-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka01001BinderTests.java
+++ b/spring-cloud-stream-binder-kafka-0.10.0-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka_0_10_0_BinderTests.java
@@ -23,6 +23,6 @@ package org.springframework.cloud.stream.binder.kafka;
  *
  * @author Soby Chacko
  */
-public class Kafka01001BinderTests extends Kafka10BinderTests {
+public class Kafka_0_10_0_BinderTests extends Kafka10BinderTests {
 
 }
diff --git a/spring-cloud-stream-binder-kafka-0.9.0.1-test/pom.xml b/spring-cloud-stream-binder-kafka-0.9-test/pom.xml
similarity index 94%
rename from spring-cloud-stream-binder-kafka-0.9.0.1-test/pom.xml
rename to spring-cloud-stream-binder-kafka-0.9-test/pom.xml
index 9a3aca98f..a536435ab 100644
--- a/spring-cloud-stream-binder-kafka-0.9.0.1-test/pom.xml
+++ b/spring-cloud-stream-binder-kafka-0.9-test/pom.xml
@@ -6,8 +6,8 @@
 		<artifactId>spring-cloud-stream-binder-kafka-parent</artifactId>
 		<version>1.2.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-cloud-stream-binder-kafka-0.9.0.1-test</artifactId>
-	<description>Spring Cloud Stream Kafka Binder 0.9.0.1 Tests</description>
+	<artifactId>spring-cloud-stream-binder-kafka-0.9</artifactId>
+	<description>Spring Cloud Stream Kafka Binder 0.9 Tests</description>
 	<url>http://projects.spring.io/spring-cloud</url>
 	<organization>
 		<name>Pivotal Software, Inc.</name>
diff --git a/spring-cloud-stream-binder-kafka-0.9.0.1-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka09TestBinder.java b/spring-cloud-stream-binder-kafka-0.9-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka09TestBinder.java
similarity index 100%
rename from spring-cloud-stream-binder-kafka-0.9.0.1-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka09TestBinder.java
rename to spring-cloud-stream-binder-kafka-0.9-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka09TestBinder.java
diff --git a/spring-cloud-stream-binder-kafka-0.9.0.1-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka09BinderTests.java b/spring-cloud-stream-binder-kafka-0.9-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka_09_BinderTests.java
similarity index 98%
rename from spring-cloud-stream-binder-kafka-0.9.0.1-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka09BinderTests.java
rename to spring-cloud-stream-binder-kafka-0.9-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka_09_BinderTests.java
index 3252f98ba..583387877 100644
--- a/spring-cloud-stream-binder-kafka-0.9.0.1-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka09BinderTests.java
+++ b/spring-cloud-stream-binder-kafka-0.9-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka_09_BinderTests.java
@@ -50,7 +50,7 @@ import org.springframework.retry.RetryOperations;
  * @author Mark Fisher
  * @author Ilayaperumal Gopinathan
  */
-public class Kafka09BinderTests extends KafkaBinderTests {
+public class Kafka_09_BinderTests extends KafkaBinderTests {
 
 	private final String CLASS_UNDER_TEST_NAME = KafkaMessageChannelBinder.class.getSimpleName();
 
diff --git a/spring-cloud-stream-binder-kafka-0.9.0.1-test/src/test/java/org/springframework/cloud/stream/binder/kafka/RawModeKafka09BinderTests.java b/spring-cloud-stream-binder-kafka-0.9-test/src/test/java/org/springframework/cloud/stream/binder/kafka/RawModeKafka09BinderTests.java
similarity index 99%
rename from spring-cloud-stream-binder-kafka-0.9.0.1-test/src/test/java/org/springframework/cloud/stream/binder/kafka/RawModeKafka09BinderTests.java
rename to spring-cloud-stream-binder-kafka-0.9-test/src/test/java/org/springframework/cloud/stream/binder/kafka/RawModeKafka09BinderTests.java
index d61be6c27..2f058733a 100644
--- a/spring-cloud-stream-binder-kafka-0.9.0.1-test/src/test/java/org/springframework/cloud/stream/binder/kafka/RawModeKafka09BinderTests.java
+++ b/spring-cloud-stream-binder-kafka-0.9-test/src/test/java/org/springframework/cloud/stream/binder/kafka/RawModeKafka09BinderTests.java
@@ -40,7 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Gary Russell
  * @author Mark Fisher
  */
-public class RawModeKafka09BinderTests extends Kafka09BinderTests {
+public class RawModeKafka09BinderTests extends Kafka_09_BinderTests {
 
 	@Test
 	@Override