diff --git a/.travis.yml b/.travis.yml
index 2fad2c196..dd0715ba5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,24 +7,13 @@ env:
   matrix:
     - PROFILE=ci
     - PROFILE=ci CASSANDRA_DRIVER_VERSION=3.0.3
-    - PROFILE=ci CASSANDRA_DRIVER_VERSION=3.1.0
-    - PROFILE=ci CASSANDRA_DRIVER_VERSION=3.1.1
-    - PROFILE=spring41-next
     - PROFILE=spring42
-    - PROFILE=spring42-next
     - PROFILE=spring43
     - PROFILE=spring43-next
     - PROFILE=spring5-next
     - PROFILE=external-cassandra CASSANDRA_VERSION=2.2.8
-    - PROFILE=external-cassandra CASSANDRA_VERSION=3.0.9
-    - PROFILE=external-cassandra CASSANDRA_VERSION=3.1.1
+    - PROFILE=external-cassandra CASSANDRA_VERSION=3.0.10
     - PROFILE=external-cassandra CASSANDRA_VERSION=3.2.1
-    - PROFILE=external-cassandra CASSANDRA_VERSION=3.3
-    - PROFILE=external-cassandra CASSANDRA_VERSION=3.4
-    - PROFILE=external-cassandra CASSANDRA_VERSION=3.5
-    - PROFILE=external-cassandra CASSANDRA_VERSION=3.6
-    - PROFILE=external-cassandra CASSANDRA_VERSION=3.7
-    - PROFILE=external-cassandra CASSANDRA_VERSION=3.8
     - PROFILE=external-cassandra CASSANDRA_VERSION=3.9
 
 addons:
@@ -42,6 +31,12 @@ sudo: false
 before_install:
   - sed -i.bak -e 's|https://nexus.codehaus.org/snapshots/|https://oss.sonatype.org/content/repositories/codehaus-snapshots/|g' ~/.m2/settings.xml
 
-install: if [ ! -z ${CASSANDRA_VERSION} ]; then ./setup-cassandra.sh; fi;
+install: if [ ! -z ${CASSANDRA_VERSION+x} ]; then ./setup-cassandra.sh; fi;
 
-script: mvn clean install -P${PROFILE} -Dcassandra-driver.version=${CASSANDRA_DRIVER_VERSION:-3.1.1} -Dmaven.javadoc.skip=true
+script:
+  - |
+    if [ ! -z ${CASSANDRA_DRIVER_VERSION+x} ]; then
+      mvn clean install -P${PROFILE} -Dcassandra-driver.version=${CASSANDRA_DRIVER_VERSION} -Dmaven.javadoc.skip=true
+    else
+      mvn clean install -P${PROFILE} -Dmaven.javadoc.skip=true
+    fi
diff --git a/pom.xml b/pom.xml
index a820ff644..b6bbe560d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
 		<build.cassandra.ssl_storage_port>17001</build.cassandra.ssl_storage_port>
 		<build.cassandra.storage_port>17000</build.cassandra.storage_port>
 		<cassandra.version>3.9</cassandra.version>
-		<cassandra-driver.version>3.1.1</cassandra-driver.version>
+		<cassandra-driver.version>3.1.2</cassandra-driver.version>
 		<dist.id>spring-data-cassandra</dist.id>
 		<el.version>1.0</el.version>
 		<failsafe.version>2.16</failsafe.version>