diff --git a/.travis.yml b/.travis.yml
index f83253b99..e6b50101b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,32 @@
 language: python
 python:
 - '3.4'
+
 cache:
   directories:
     - $HOME/.cache/pip
+
 env:
 - DJANGO=Django>=1.9
 sudo: false
+addons:
+  postgresql: '9.4'
+
 install:
-- pip install coveralls -r requirements.txt --use-mirrors
+- pip install --upgrade pip
+- pip install coveralls -r requirements.txt
+
 before_script:
 - psql template1 -c 'create extension hstore;'
 - psql template1 -c 'create extension postgis;'
-script: py.test
-addons:
-  postgresql: '9.4'
-services:
-  - elasticsearch
+
+script: py.test events
+
+before_cache:
+- rm -f $HOME/.cache/pip/log/debug.log
+
 notifications:
   slack:
     secure: Hxh7X9ckorBlD2MRiSh/TE6nC0kyEZrEmegx3FHQgwOm5tNCZcJUoJprmEXA82SMxlbl12XcNLhFZaeQd6Gt2AF5AvTjbJLsLZBRebbKA6We1dCSpyHSGXy+GGWRD0J1OYstk2jg5fWmsscusLZ0MFbybg8qwmsv7/LOG+QoX6M=
+
 after_success: coveralls
diff --git a/linkedevents/settings.py b/linkedevents/settings.py
index d93d1d067..52dc88839 100644
--- a/linkedevents/settings.py
+++ b/linkedevents/settings.py
@@ -12,17 +12,6 @@
 import os
 BASE_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.contrib.gis.db.backends.postgis',
-        'NAME': 'linkedevents',
-        'USER': 'linkedevents',
-        'PASSWORD': 'linkedevents',
-        'HOST': 'localhost',
-        'PORT': '',
-    }
-}
-
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/
 
@@ -87,7 +76,12 @@
 # Database
 # https://docs.djangoproject.com/en/1.6/ref/settings/#databases
 
-DATABASES = {}
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.contrib.gis.db.backends.postgis',
+        'NAME': 'linkedevents',
+    }
+}
 
 ATOMIC_REQUESTS = True
 
diff --git a/plain-requirements.txt b/plain-requirements.txt
index a61337370..bd5c83810 100644
--- a/plain-requirements.txt
+++ b/plain-requirements.txt
@@ -30,3 +30,4 @@ django-haystack
 elasticsearch
 raven
 -e git+https://github.com/City-of-Helsinki/django-helusers#egg=django-helusers
+pytest-django
diff --git a/requirements.txt b/requirements.txt
index a35fdac29..96f1cd6f2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,6 @@
 Django==1.9
 Markdown==2.6.5
 PyYAML==3.11
-South==1.0.2
 django-cors-headers==1.1.0
 django-filter==0.11.0
 django-modeltranslation==0.11rc2
@@ -31,14 +30,16 @@ django-haystack==2.4.1
 elasticsearch==2.1.0
 raven==5.9.2
 -e git+https://github.com/City-of-Helsinki/django-helusers@94b0d3db73e76ba5387c7dc0db3c6315ccbbb079#egg=django_helusers-master
+pytest-django==2.9.1
 ## The following requirements were added by pip freeze:
 astroid==1.4.1
 colorama==0.3.5
 contextlib2==0.4.0
 html5lib==0.9999999
 lazy-object-proxy==1.2.1
+py==1.4.31
 PyJWT==1.4.0
 pyparsing==2.0.6
+pytest==2.8.5
 urllib3==1.13
-wheel==0.24.0
 wrapt==1.10.6