diff --git a/test/integration/helpers.bash b/test/integration/helpers.bash
index e17185343e..076b29663e 100644
--- a/test/integration/helpers.bash
+++ b/test/integration/helpers.bash
@@ -98,7 +98,6 @@ function swarm_manage() {
 	local port=$(($SWARM_BASE_PORT + $i))
 	local host=127.0.0.1:$port
 
-	echo "$SWARM_BINARY" -l debug manage -H "$host" --heartbeat=1s $discovery
 	"$SWARM_BINARY" -l debug manage -H "$host" --heartbeat=1s $discovery &
 	SWARM_MANAGE_PID[$i]=$!
 	SWARM_HOSTS[$i]=$host
diff --git a/test/integration/mesos/api/build.bats b/test/integration/mesos/api/build.bats
index 5d74334ea7..3659d7dd7e 100644
--- a/test/integration/mesos/api/build.bats
+++ b/test/integration/mesos/api/build.bats
@@ -11,7 +11,7 @@ function teardown() {
 @test "mesos - docker build" {
 	start_docker 2
 	start_mesos
-	swarm_manage_mesos
+	swarm_manage --cluster-driver mesos-experimental 127.0.0.1:$MESOS_MASTER_PORT
 
 	run docker_swarm images -q
 	[ "$status" -eq 0 ]
diff --git a/test/integration/mesos/api/commit.bats b/test/integration/mesos/api/commit.bats
index 816636e840..3545e1d6a5 100644
--- a/test/integration/mesos/api/commit.bats
+++ b/test/integration/mesos/api/commit.bats
@@ -11,7 +11,7 @@ function teardown() {
 @test "mesos - docker commit" {
 	start_docker_with_busybox 2
 	start_mesos
-	swarm_manage_mesos
+	swarm_manage --cluster-driver mesos-experimental 127.0.0.1:$MESOS_MASTER_PORT
 
 	docker_swarm run -d -m 20m --name test_container busybox sleep 500
 
diff --git a/test/integration/mesos/api/events.bats b/test/integration/mesos/api/events.bats
index 3e8ad6aa45..59a6b68ff6 100644
--- a/test/integration/mesos/api/events.bats
+++ b/test/integration/mesos/api/events.bats
@@ -11,7 +11,7 @@ function teardown() {
 @test "mesos - docker events" {
 	start_docker_with_busybox 2
 	start_mesos
-	swarm_manage_mesos
+	swarm_manage --cluster-driver mesos-experimental 127.0.0.1:$MESOS_MASTER_PORT
 
 	# start events, report real time events to $log_file
 	local log_file=$(mktemp)
diff --git a/test/integration/mesos/api/info.bats b/test/integration/mesos/api/info.bats
index 2395688b30..ed1e843d20 100644
--- a/test/integration/mesos/api/info.bats
+++ b/test/integration/mesos/api/info.bats
@@ -11,7 +11,8 @@ function teardown() {
 @test "mesos - docker info" {
 	start_docker 2
 	start_mesos
-	swarm_manage_mesos
+	swarm_manage --cluster-driver mesos-experimental 127.0.0.1:$MESOS_MASTER_PORT
+
 	run docker_swarm info
 	[ "$status" -eq 0 ]
 	[[ "${output}" == *'Offers: 2'* ]]
diff --git a/test/integration/mesos/api/inspect.bats b/test/integration/mesos/api/inspect.bats
index 9c72589067..cf6e05d6ea 100644
--- a/test/integration/mesos/api/inspect.bats
+++ b/test/integration/mesos/api/inspect.bats
@@ -11,7 +11,8 @@ function teardown() {
 @test "mesos - docker inspect" {
 	start_docker_with_busybox 2
 	start_mesos
-	swarm_manage_mesos
+	swarm_manage --cluster-driver mesos-experimental 127.0.0.1:$MESOS_MASTER_PORT
+
 	# run container
 	docker_swarm run -d -m 20m -e TEST=true -h hostname.test --name test_container busybox sleep 500
 
diff --git a/test/integration/mesos/api/run.bats b/test/integration/mesos/api/run.bats
index 36bb281565..cca9f28afd 100644
--- a/test/integration/mesos/api/run.bats
+++ b/test/integration/mesos/api/run.bats
@@ -11,7 +11,7 @@ function teardown() {
 @test "mesos - docker run" {
 	start_docker_with_busybox 2
 	start_mesos
-	swarm_manage_mesos
+	swarm_manage --cluster-driver mesos-experimental 127.0.0.1:$MESOS_MASTER_PORT
 
 	# make sure no container exist
 	run docker_swarm ps -qa
@@ -31,7 +31,7 @@ function teardown() {
 @test "mesos - docker run no resources" {
 	start_docker 1
 	start_mesos
-	swarm_manage_mesos
+	swarm_manage --cluster-driver mesos-experimental 127.0.0.1:$MESOS_MASTER_PORT
 
 	run docker_swarm run -d busybox ls
 	[ "$status" -ne 0 ]
@@ -41,7 +41,7 @@ function teardown() {
 @test "mesos - docker run big" {
 	start_docker_with_busybox 3
 	start_mesos
-	swarm_manage_mesos
+	swarm_manage --cluster-driver mesos-experimental 127.0.0.1:$MESOS_MASTER_PORT
 
 	for i in `seq 1 100`; do
 	    docker_swarm run -d -m 20m busybox echo $i
diff --git a/test/integration/mesos/mesos_helpers.bash b/test/integration/mesos/mesos_helpers.bash
index 6d5cb11e55..c9bec3e7c5 100644
--- a/test/integration/mesos/mesos_helpers.bash
+++ b/test/integration/mesos/mesos_helpers.bash
@@ -2,7 +2,10 @@
 
 load ../../helpers
 
-MESOS_IMAGE=jimenez/mesos-dev:clang
+export SWARM_MESOS_TASK_TIMEOUT=30s
+export SWARM_MESOS_USER=daemon
+
+MESOS_IMAGE=dockerswarm/mesos:0.23
 MESOS_MASTER_PORT=$(( ( RANDOM % 1000 )  + 10000 ))
 
 # Start mesos master and slave.
@@ -10,7 +13,7 @@ function start_mesos() {
 	local current=${#DOCKER_CONTAINERS[@]}
 	MESOS_MASTER=$(
 	docker_host run -d --name mesos-master --net=host \
-	$MESOS_IMAGE /mesos/build/bin/mesos-master.sh --ip=127.0.0.1 --work_dir=/ --registry=in_memory --port=$MESOS_MASTER_PORT
+	$MESOS_IMAGE mesos-master --ip=127.0.0.1 --work_dir=/ --registry=in_memory --port=$MESOS_MASTER_PORT
 		)
 
 	retry 10 1 eval "docker_host ps | grep 'mesos-master'"
@@ -18,20 +21,12 @@ function start_mesos() {
 	    local docker_port=$(echo ${HOSTS[$i]} | cut -d: -f2)
 	    MESOS_SLAVES[$i]=$(
 		docker_host run --privileged -d --name mesos-slave-$i --volumes-from node-$i -e DOCKER_HOST="${HOSTS[$i]}" -v /sys/fs/cgroup:/sys/fs/cgroup --net=host \
-		$MESOS_IMAGE /mesos/build/bin/mesos-slave.sh --master=127.0.0.1:$MESOS_MASTER_PORT --containerizers=docker --attributes="docker_port:$docker_port" --hostname=127.0.0.1 --port=$(($MESOS_MASTER_PORT + (1 + $i)))
+		$MESOS_IMAGE mesos-slave --master=127.0.0.1:$MESOS_MASTER_PORT --containerizers=docker --attributes="docker_port:$docker_port" --hostname=127.0.0.1 --port=$(($MESOS_MASTER_PORT + (1 + $i))) --docker=/usr/local/bin/docker --executor_environment_variables="{\"DOCKER_HOST\":\"${HOSTS[$i]}\"}"
 		       )
 	    retry 10 1 eval "docker_host ps | grep 'mesos-slave-$i'"
 	done
 }
 
-# Start the swarm manager in background.
-function swarm_manage_mesos() {
-	local current=${#DOCKER_CONTAINERS[@]}
-	"$SWARM_BINARY" -l debug manage -H "$SWARM_HOST" --cluster-driver mesos-experimental --cluster-opt mesos.user=daemon 127.0.0.1:$MESOS_MASTER_PORT &
-	SWARM_PID=$!
-	retry 10 1 eval "docker_swarm info | grep 'Offers: $current'"
-}
-
 # Stop mesos master and slave.
 function stop_mesos() {
 	echo "Stopping $MESOS_MASTER"
diff --git a/test/integration/test_runner.sh b/test/integration/test_runner.sh
index 65a2c7b316..faedb97a89 100755
--- a/test/integration/test_runner.sh
+++ b/test/integration/test_runner.sh
@@ -12,7 +12,7 @@ function execute() {
 }
 
 # Tests to run. Defaults to all.
-TESTS=${@:-. discovery api}
+TESTS=${@:-. discovery api mesos/api}
 
 # Generate a temporary binary for the tests.
 export SWARM_BINARY=`mktemp`