diff --git a/Dockerfile b/Dockerfile
index 4c2faba2..5b682535 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
 FROM fedora:24
 
 # so we don't have to compile those when fetched from PyPI
-RUN dnf install -y python-pip python2-setuptools python2-cffi python2-zmq python2-cryptography koji python2-pdc-client python-m2ext fedmsg-relay && \
+RUN dnf install -y python-pip python2-setuptools python2-cffi python2-zmq python2-cryptography koji python2-pdc-client python-m2ext fedmsg-relay python-mock && \
     dnf autoremove -y && dnf clean all && \
-    mkdir /opt/module_build_service/
+    mkdir /opt/module_build_service/ && mkdir /etc/module_build_service
 WORKDIR /opt/module_build_service/
 COPY ./requirements.txt /opt/module_build_service/
 RUN pip install --user -r ./requirements.txt
@@ -13,5 +13,7 @@ COPY copr.conf /etc/module_build_service/
 
 COPY . /opt/module_build_service/
 
+ENV PYTHONPATH=/opt/module_build_service/.
+
 RUN python2 ./manage.py upgradedb && python2 manage.py generatelocalhostcert
 CMD ["python2", "manage.py", "runssl"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 105485b0..459183f6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,7 +15,8 @@ services:
       - module_build_service_daemon
       - fedmsg-relay
     volumes:
-      - ./module_build_service/:/opt/module_build_service/module_build_service/:Z  # module_build_service sources are bind-mounted, so you don't have to rebuild
+      # module_build_service sources are bind-mounted, so you don't have to rebuild
+      - ./module_build_service/:/opt/module_build_service/module_build_service/:Z
       - ~/.fedora.cert:/root/.fedora.cert:Z   # koji credentials are mounted inside
       - ~/.fedora-server-ca.cert:/root/.fedora-server-ca.cert:Z
       - ~/.fedora-upload-ca.cert:/root/.fedora-upload-ca.cert:Z
@@ -28,4 +29,5 @@ services:
       - module_build_service_daemon
       - fedmsg-relay
     volumes:
+      # module_build_service sources are bind-mounted, so you don't have to rebuild
       - ./module_build_service/:/opt/module_build_service/module_build_service/:Z