diff --git a/Makefile b/Makefile
index 7761244..5aba88b 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,5 @@ tx-push:
 	cd user_sessions; django-admin.py makemessages -l en
 	tx push -s
 
-geoip:
-	wget http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz
-	gunzip GeoLite2-City.mmdb.gz
+download-geoip:
+	if [ ! -f GeoLite2-City.mmdb ]; then wget http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz; gunzip GeoLite2-City.mmdb.gz; fi
diff --git a/tests/settings.py b/tests/settings.py
index e008ba4..f07d6f9 100644
--- a/tests/settings.py
+++ b/tests/settings.py
@@ -63,8 +63,7 @@
     },
 ]
 
-GEOIP_PATH = os.path.join(os.path.dirname(BASE_DIR),
-                          'example', 'GeoLiteCity.dat')
+GEOIP_PATH = os.path.join(os.path.dirname(BASE_DIR), 'GeoLite2-City.mmdb')
 SESSION_ENGINE = 'user_sessions.backends.db'
 
 LOGIN_URL = '/admin/'
diff --git a/tests/tests.py b/tests/tests.py
index 2761843..c6ed2fb 100644
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -36,12 +36,17 @@
     from unittest import skipUnless
 
 try:
-    from django.contrib.gis.geoip import GeoIP
-    geoip = GeoIP()
+    from django.contrib.gis.geoip2 import GeoIP2
+    geoip = GeoIP2()
     geoip_msg = None
-except Exception as e:
-    geoip = None
-    geoip_msg = str(e)
+except Exception as error_geoip2:
+    try:
+        from django.contrib.gis.geoip import GeoIP
+        geoip = GeoIP()
+        geoip_msg = None
+    except Exception as error_geoip:
+        geoip = None
+        geoip_msg = str(error_geoip2) + " and " + str(error_geoip)
 
 
 class MiddlewareTest(TestCase):
diff --git a/tox.ini b/tox.ini
index e2ac766..ea6714b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,15 +13,17 @@ unignore_outcomes = True
 [travis:env]
 DJANGO =
     1.8: dj18
-    1.9: dj19
     1.10: dj110
     1.11: dj111
     master: djmaster
 
 [testenv]
-commands = make coverage
+commands = 
+    make download-geoip
+    make coverage
 deps =
     coverage
+    geoip2
     py27: mock
     dj18: Django<1.9
     dj110: Django<1.11