diff --git a/8.0-runbot/Dockerfile b/8.0-runbot/Dockerfile
new file mode 100644
index 0000000..e3a9c20
--- /dev/null
+++ b/8.0-runbot/Dockerfile
@@ -0,0 +1,7 @@
+FROM quay.io/opusvl/odoo:testing_improvements
+MAINTAINER Peter Alabaster <peter.alabaster@opusvl.com>
+
+# Install missing system & pip dependencies for runbot module
+RUN apt-get update && apt-get install -y \
+    libfreetype6-dev libpng12-dev libxft-dev python-dev python-pip && \
+        pip install matplotlib
diff --git a/8.0-runbot/entrypoint.sh b/8.0-runbot/entrypoint.sh
new file mode 100755
index 0000000..22fc0fb
--- /dev/null
+++ b/8.0-runbot/entrypoint.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -e
+
+# set odoo database host, port, user and password
+: ${PGHOST:=$DB_PORT_5432_TCP_ADDR}
+: ${PGPORT:=$DB_PORT_5432_TCP_PORT}
+: ${PGUSER:=${DB_ENV_POSTGRES_USER:='postgres'}}
+: ${PGPASSWORD:=$DB_ENV_POSTGRES_PASSWORD}
+export PGHOST PGPORT PGUSER PGPASSWORD
+
+case "$1" in
+    --)
+	shift
+	exec gosu odoo openerp-server "$@"
+	;;
+    -*)
+	exec gosu odoo openerp-server "$@"
+	;;
+    openerp-server)
+	exec gosu odoo "$@"
+	;;
+    *)
+	exec "$@"
+esac
+
+exit 1
diff --git a/8.0-runbot/openerp-server.conf b/8.0-runbot/openerp-server.conf
new file mode 100644
index 0000000..0a1a0ed
--- /dev/null
+++ b/8.0-runbot/openerp-server.conf
@@ -0,0 +1,38 @@
+[options]
+addons_path = /mnt/extra-addons,/usr/lib/python2.7/dist-packages/openerp/addons
+data_dir = /var/lib/odoo
+auto_reload = True
+; admin_passwd = admin
+; csv_internal_sep = ,
+; db_maxconn = 64
+; db_name = False
+; db_template = template1
+; dbfilter = .*
+; debug_mode = False
+; email_from = False
+; limit_memory_hard = 2684354560
+; limit_memory_soft = 2147483648
+; limit_request = 8192
+; limit_time_cpu = 60
+; limit_time_real = 120
+; list_db = True
+; log_db = False
+; log_handler = [':INFO']
+; log_level = info
+; logfile = None
+; longpolling_port = 8072
+; max_cron_threads = 2
+; osv_memory_age_limit = 1.0
+; osv_memory_count_limit = False
+; smtp_password = False
+; smtp_port = 25
+; smtp_server = localhost
+; smtp_ssl = False
+; smtp_user = False
+; workers = 0
+; xmlrpc = True
+; xmlrpc_interface = 
+; xmlrpc_port = 8069
+; xmlrpcs = True
+; xmlrpcs_interface = 
+; xmlrpcs_port = 8071