diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..3c32c65
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,23 @@
+language: python
+
+cache: pip
+
+addons:
+    apt:
+         packages:
+             - libpq5
+
+
+python:
+    - "3.3"
+    - "3.4"
+    - "3.5"
+    - "nightly"
+
+install:
+    - pip install -r REQUIREMENTS
+
+script:
+    - pushd bin
+    - ./misp-modules.py -t
+    - popd
diff --git a/REQUIREMENTS b/REQUIREMENTS
index 65df17d..93189e2 100644
--- a/REQUIREMENTS
+++ b/REQUIREMENTS
@@ -5,3 +5,4 @@ urlarchiver
 passivetotal
 PyPDNS
 pypssl
+psycopg2
diff --git a/bin/misp-modules.py b/bin/misp-modules.py
index 088a195..16452cb 100755
--- a/bin/misp-modules.py
+++ b/bin/misp-modules.py
@@ -93,4 +93,7 @@ if __name__ == '__main__':
     application = tornado.web.Application(service)
     log.info('MISP modules server started on TCP port {0}'.format(port))
     application.listen(port)
+    if sys.argv[1] == '-t':
+        log.info('MISP modules started in test-mode, quitting immediately.')
+        sys.exit()
     tornado.ioloop.IOLoop.instance().start()