diff --git a/docker-compose.develop.yml b/docker-compose.develop.yml
new file mode 100644
index 000000000..4dfdb9357
--- /dev/null
+++ b/docker-compose.develop.yml
@@ -0,0 +1,19 @@
+---
+version: '3'
+services:
+  freqtrade_develop:
+    build:
+      context: .
+      dockerfile: "./Dockerfile"
+    volumes:
+      - ".:/freqtrade"
+
+  pytest:
+    build:
+      context: .
+      dockerfile: "./Dockerfile.develop"
+    volumes:
+      - ".:/freqtrade"
+    command:
+      ["./scripts/pytest.sh"]
+
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
new file mode 100644
index 000000000..cae98c3ee
--- /dev/null
+++ b/docker-compose.prod.yml
@@ -0,0 +1,8 @@
+---
+version: '3'
+services:
+  freqtrade:
+    image: freqtradeorg/freqtrade:master
+    volumes:
+      - "./user_data:/freqtrade/user_data"
+      - "./config.json:/freqtrade/config.json"
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 120000
index 000000000..945318087
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1 @@
+docker-compose.prod.yml
\ No newline at end of file
diff --git a/scripts/pytest.sh b/scripts/pytest.sh
new file mode 100755
index 000000000..e05ff1ad0
--- /dev/null
+++ b/scripts/pytest.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+echo "Running Unit tests"
+
+pytest --random-order --cov=freqtrade --cov-config=.coveragerc freqtrade/tests/