diff --git a/docker/Dockerfile.testing b/docker/Dockerfile.testing
deleted file mode 100644
index 4e90628..0000000
--- a/docker/Dockerfile.testing
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM golang:1.6.2-alpine
-
-MAINTAINER Bo-Yi Wu <appleboy.tw@gmail.com>
-
-RUN apk update \
-  && apk add git make && rm -rf /var/cache/apk/*
-
-# install glide package management.
-RUN go get github.com/Masterminds/glide && cd $GOPATH/src/github.com/Masterminds/glide && make install
-RUN mkdir -p $GOPATH/src/github.com/appleboy/gorush
-RUN git clone https://github.com/appleboy/gorush.git $GOPATH/src/github.com/appleboy/gorush/
-WORKDIR $GOPATH/src/github.com/appleboy/gorush
-RUN sed -i"" -e "s/localhost/redis/g" config/config.yml
-RUN sed -i"" -e "s/localhost/redis/g" gorush/status_test.go
-RUN sed -i"" -e "s/localhost/redis/g" storage/redis/redis_test.go
-RUN make bundle
diff --git a/docker/docker-compose.testing.yml b/docker/docker-compose.testing.yml
index 13bf5ac..5d755b7 100644
--- a/docker/docker-compose.testing.yml
+++ b/docker/docker-compose.testing.yml
@@ -1,14 +1,15 @@
 gorush:
-  build: "."
-  dockerfile: Dockerfile.testing
+  build: ./golang
   links:
     - redis
   privileged: true
   environment:
     - ANDROID_API_KEY
     - ANDROID_TEST_TOKEN
-  command: /bin/sh -c "make test"
+  volumes:
+    - ../:/go/src/github.com/appleboy/gorush
+  command: /bin/sh -c './docker/testing.sh'
 
 redis:
-  image: redis:alpine
+  build: ./redis
   privileged: true
diff --git a/docker/golang/Dockerfile b/docker/golang/Dockerfile
new file mode 100644
index 0000000..282b7fc
--- /dev/null
+++ b/docker/golang/Dockerfile
@@ -0,0 +1,11 @@
+FROM golang:1.6.2-alpine
+
+MAINTAINER Bo-Yi Wu <appleboy.tw@gmail.com>
+
+RUN apk update \
+  && apk add git make && rm -rf /var/cache/apk/*
+
+# install glide package management.
+RUN go get github.com/Masterminds/glide && cd $GOPATH/src/github.com/Masterminds/glide && make install
+
+WORKDIR $GOPATH/src/github.com/appleboy/gorush
diff --git a/docker/redis/Dockerfile b/docker/redis/Dockerfile
new file mode 100644
index 0000000..1192e28
--- /dev/null
+++ b/docker/redis/Dockerfile
@@ -0,0 +1,7 @@
+FROM redis:alpine
+
+MAINTAINER Bo-Yi Wu <appleboy.tw@gmail.com>
+
+CMD [ "redis-server" ]
+
+EXPOSE 6379
diff --git a/docker/testing.sh b/docker/testing.sh
new file mode 100755
index 0000000..c6e7240
--- /dev/null
+++ b/docker/testing.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+cd /go/src/github.com/appleboy/gorush
+sed -i"" -e "s/localhost/redis/g" config/config.yml
+sed -i"" -e "s/localhost/redis/g" gorush/status_test.go
+sed -i"" -e "s/localhost/redis/g" storage/redis/redis_test.go
+make bundle && make test