diff --git a/api/Dockerfile b/api/Dockerfile
index 5d4e858574a0063b756a168f48b529e904bc427b..a9aa33e3ce22f9eb36b5c094949df0583768ee68 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -5,7 +5,11 @@ ENV PYTHONUNBUFFERED 1
 # Requirements have to be pulled and installed here, otherwise caching won't work
 RUN echo 'deb http://httpredir.debian.org/debian/ jessie-backports main' > /etc/apt/sources.list.d/ffmpeg.list
 COPY ./requirements.apt /requirements.apt
-RUN apt-get update -qq && grep "^[^#;]" requirements.apt | xargs apt-get install -y
+RUN apt-get update; \
+    grep "^[^#;]" requirements.apt | \
+    grep -Fv "python3-dev" | \
+    xargs apt-get install -y --no-install-recommends; \
+    rm -rf /usr/share/doc/* /usr/share/locale/*
 RUN curl -L https://github.com/acoustid/chromaprint/releases/download/v1.4.2/chromaprint-fpcalc-1.4.2-linux-x86_64.tar.gz | tar -xz -C /usr/local/bin --strip 1
 COPY ./requirements/base.txt /requirements/base.txt
 RUN pip install -r /requirements/base.txt
diff --git a/api/docker/Dockerfile.test b/api/docker/Dockerfile.test
index 069b89c2f83de1628d485374545f908fe52ec93c..032b2842f37628d6f14b8cbadf95e2289cf93fb7 100644
--- a/api/docker/Dockerfile.test
+++ b/api/docker/Dockerfile.test
@@ -1,13 +1,16 @@
 FROM python:3.5
 
 ENV PYTHONUNBUFFERED 1
-ENV PYTHONDONTWRITEBYTECODE 1
 
 # Requirements have to be pulled and installed here, otherwise caching won't work
 RUN echo 'deb http://httpredir.debian.org/debian/ jessie-backports main' > /etc/apt/sources.list.d/ffmpeg.list
 COPY ./requirements.apt /requirements.apt
-COPY ./install_os_dependencies.sh /install_os_dependencies.sh
-RUN bash install_os_dependencies.sh install
+RUN apt-get update; \
+    grep "^[^#;]" requirements.apt | \
+    grep -Fv "python3-dev" | \
+    xargs apt-get install -y --no-install-recommends; \
+    rm -rf /usr/share/doc/* /usr/share/locale/*
+
 RUN curl -L https://github.com/acoustid/chromaprint/releases/download/v1.4.2/chromaprint-fpcalc-1.4.2-linux-x86_64.tar.gz | tar -xz -C /usr/local/bin --strip 1
 
 RUN mkdir /requirements
diff --git a/api/requirements.apt b/api/requirements.apt
index 462a5a705c75b319636449490c6e3c29b089a7f1..224ff955ae45daaf7677d9297bf7c0ee8aba3a84 100644
--- a/api/requirements.apt
+++ b/api/requirements.apt
@@ -1,11 +1,8 @@
 build-essential
-gettext
-zlib1g-dev
+curl
+ffmpeg
 libjpeg-dev
-zlib1g-dev
+libmagic-dev
 libpq-dev
 postgresql-client
-libmagic-dev
-ffmpeg
 python3-dev
-curl