diff --git a/docker/bootstrap/dependencies.sh b/docker/bootstrap/dependencies.sh
index c17de485cf..1984bfaf3a 100755
--- a/docker/bootstrap/dependencies.sh
+++ b/docker/bootstrap/dependencies.sh
@@ -35,7 +35,6 @@ pip install sphinx==1.4.9 recommonmark sphinx_rtd_theme
 
 # Redis
 apt-get -y install redis-server
-redis-server & # /etc/init.d/redis-server start doesn't work well
 
 # Minio (S3)
 wget -O /usr/local/bin/minio https://dl.minio.io/server/minio/release/linux-amd64/minio
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 4e653b70ec..5b52621e6d 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -4,6 +4,10 @@ if [ ! -z "$DIGDAG_TEST_POSTGRESQL" ]; then
     /etc/init.d/postgresql start
 fi
 
+if [ ! -z "$DIGDAG_TEST_REDIS" ]; then
+    redis-server &
+fi
+
 export TEST_S3_ACCESS_KEY_ID=$(cat /dev/urandom | LC_CTYPE=C tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1)
 export TEST_S3_SECRET_ACCESS_KEY=$(cat /dev/urandom | LC_CTYPE=C tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1)
 export TEST_S3_ENDPOINT=http://127.0.0.1:9000