diff --git a/docker-compose.yml b/docker-compose.yml
index f2916c4..86f81f8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,7 +27,7 @@ services:
             - ./example_config/intelmq/etc:/opt/intelmq/etc
             - ./example_config/intelmq-manager:/opt/intelmq-manager/config
             - ./intelmq_logs:/opt/intelmq/var/log
-            - ./example_config/intelmq/var/lib:/opt/intelmq/var/lib
+            - ./example_config/intelmq/var/lib/bot:/opt/intelmq/var/lib/bot
         ports: 
             - 127.0.0.1:1337:8080/tcp
         depends_on: 
@@ -47,4 +47,5 @@ networks:
     intelmq-network:
         driver: bridge
     intelmq-database:
-        driver: bridge
\ No newline at end of file
+        driver: bridge
+        
\ No newline at end of file
diff --git a/entrypoint.sh b/entrypoint.sh
index 138dd4b..cecb44e 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 if [[ $1 == "selftest" ]]
 then
-    cd /opt/intelmq && nosetests3
+    nosetests3 /opt/intelmq/intelmq/tests
 else
     hug -f /opt/intelmq-manager/intelmq_manager/serve.py -p8080
 fi
\ No newline at end of file