diff --git a/.travis.yml b/.travis.yml
index f823159..3466dbd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,4 +69,4 @@ jobs:
         - docker run -d -p 127.0.0.1:8080:8080/tcp $IMAGE_NAME:$TRAVIS_COMMIT
         - sleep 10
         - cd tests
-        - pytest --headless -n 8 --reruns 10 --reruns-delay 2
+        - pytest --headless -n 8 --reruns 3 --reruns-delay 2
diff --git a/Dockerfile b/Dockerfile
index 565aa61..ca93b24 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,9 +11,9 @@ RUN apk update \
     && strip -s nitter \
     && nimble scss
 
-FROM alpine
+FROM redis:6.0.4-alpine
 WORKDIR /src/
 RUN apk --no-cache add pcre-dev sqlite-dev
-COPY --from=nim /src/nitter/nitter /src/nitter/nitter.conf ./
+COPY --from=nim /src/nitter/nitter /src/nitter/start.sh /src/nitter/nitter.conf ./
 COPY --from=nim /src/nitter/public ./public
-CMD redis-server & ./nitter
+CMD ./start.sh
diff --git a/start.sh b/start.sh
new file mode 100755
index 0000000..9a1626a
--- /dev/null
+++ b/start.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+
+nohup redis-server &
+./nitter