diff --git a/.travis.yml b/.travis.yml
index 058f8ca7f..9c5b35465 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ env:
   matrix:
   - KAFKA_VERSION=0.8.1.1
   - KAFKA_VERSION=0.8.2.2
+  - KAFKA_VERSION=0.9.0.0
 
 before_install:
 - export REPOSITORY_ROOT=${TRAVIS_BUILD_DIR}
diff --git a/functional_offset_manager_test.go b/functional_offset_manager_test.go
index 76756f5a6..7cc9ba8e9 100644
--- a/functional_offset_manager_test.go
+++ b/functional_offset_manager_test.go
@@ -1,11 +1,16 @@
 package sarama
 
 import (
+	"os"
 	"testing"
 )
 
 func TestFuncOffsetManager(t *testing.T) {
 	checkKafkaVersion(t, "0.8.2")
+	if os.Getenv("KAFKA_VERSION") == "0.9.0.0" {
+		t.Skip("Offset manager is broken with kafka 0.9 at the moment.")
+	}
+
 	setupFunctionalTest(t)
 	defer teardownFunctionalTest(t)
 
diff --git a/functional_test.go b/functional_test.go
index 7b697b68c..846eb29f9 100644
--- a/functional_test.go
+++ b/functional_test.go
@@ -129,6 +129,8 @@ func (kv kafkaVersion) satisfies(other kafkaVersion) bool {
 
 		if v < ov {
 			return false
+		} else if v > ov {
+			return true
 		}
 	}
 	return true
diff --git a/vagrant/provision.sh b/vagrant/provision.sh
index d044ca0bf..b1e429fb3 100755
--- a/vagrant/provision.sh
+++ b/vagrant/provision.sh
@@ -7,7 +7,7 @@ yes | apt-get install default-jre
 
 export KAFKA_INSTALL_ROOT=/opt
 export KAFKA_HOSTNAME=192.168.100.67
-export KAFKA_VERSION=0.8.2.2
+export KAFKA_VERSION=0.9.0.0
 export REPOSITORY_ROOT=/vagrant
 
 sh /vagrant/vagrant/install_cluster.sh
diff --git a/vagrant/server.properties b/vagrant/server.properties
index 40b558bf1..ca6e604cd 100644
--- a/vagrant/server.properties
+++ b/vagrant/server.properties
@@ -18,6 +18,7 @@
 
 # The id of the broker. This must be set to a unique integer for each broker.
 broker.id=KAFKAID
+reserved.broker.max.id=10000
 
 ############################# Socket Server Settings #############################