diff --git a/optional-requirements.txt b/optional-requirements.txt
new file mode 100644
index 00000000..79cf844f
--- /dev/null
+++ b/optional-requirements.txt
@@ -0,0 +1,20 @@
+bottle
+requests
+batinfo
+zeroconf
+netifaces
+pymdstat
+influxdb
+elasticsearch
+potsdb
+statsd
+pystache
+docker-py
+pysnmp
+pika
+py-cpuinfo
+bernhard
+cassandra-driver
+scandir
+couchdb
+pyzmq
diff --git a/unitest-all.sh b/unitest-all.sh
new file mode 100755
index 00000000..5c2426f3
--- /dev/null
+++ b/unitest-all.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+set -ev
+./unitest.py && ./unitest-restful.py && ./unitest-xmlrpc.py