diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000000..eba35f8bc1
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,8 @@
+image: kaedroho/django-base
+script:
+ - pip3.4 install mock python-dateutil pytz elasticsearch
+ - python3.4 setup.py install
+ - python3.4 runtests.py
+services:
+ - postgres
+ - dockerfile/elasticsearch
diff --git a/wagtail/tests/settings.py b/wagtail/tests/settings.py
index 461b61fa60..57fd9c101a 100644
--- a/wagtail/tests/settings.py
+++ b/wagtail/tests/settings.py
@@ -16,6 +16,8 @@ DATABASES = {
         'TEST_NAME': os.environ.get('DATABASE_NAME', 'test_wagtaildemo'),
         'USER': os.environ.get('DATABASE_USER', 'postgres'),
         'PASSWORD': os.environ.get('DATABASE_PASS', None),
+        'HOST': os.environ.get('POSTGRES_PORT_5432_TCP_ADDR', None),
+        'PORT': os.environ.get('POSTGRES_PORT_5432_TCP_PORT', None),
     }
 }
 
@@ -121,6 +123,13 @@ try:
         'TIMEOUT': 10,
         'max_retries': 1,
     }
+
+    # Check if we're running in Drone
+    if 'ELASTICSEARCH_PORT_9200_TCP_PORT' in os.environ:
+        ip = os.environ.get('ELASTICSEARCH_PORT_9200_TCP_ADDR')
+        port = os.environ.get('ELASTICSEARCH_PORT_9200_TCP_PORT')
+
+        WAGTAILSEARCH_BACKENDS['elasticsearch']['URLS'] = ['http://%s:%s/' % (ip, port)]
 except ImportError:
     pass