diff --git a/surveil/api/controllers/v2/auth/__init__.py b/surveil/api/controllers/v2/auth/__init__.py
index 2fda30f..b7458e3 100644
--- a/surveil/api/controllers/v2/auth/__init__.py
+++ b/surveil/api/controllers/v2/auth/__init__.py
@@ -14,8 +14,8 @@
 
 from pecan import rest
 
-from surveil.api.controllers.v2.auth import login
+from surveil.api.controllers.v2.auth import tokens as v2_login
 
 
 class AuthController(rest.RestController):
-    login = login.LoginController()
+    tokens = v2_login.TokensController()
diff --git a/surveil/api/controllers/v2/auth/login.py b/surveil/api/controllers/v2/auth/tokens.py
similarity index 96%
rename from surveil/api/controllers/v2/auth/login.py
rename to surveil/api/controllers/v2/auth/tokens.py
index 8c0599d..3bddd4a 100644
--- a/surveil/api/controllers/v2/auth/login.py
+++ b/surveil/api/controllers/v2/auth/tokens.py
@@ -18,7 +18,7 @@ import pecan
 from pecan import rest
 
 
-class LoginController(rest.RestController):
+class TokensController(rest.RestController):
 
     @pecan.expose()
     def post(self):
diff --git a/surveil/tests/api/controllers/v2/auth/test_auth.py b/surveil/tests/api/controllers/v2/auth/test_auth.py
index 6f1c6ef..4f3df3e 100644
--- a/surveil/tests/api/controllers/v2/auth/test_auth.py
+++ b/surveil/tests/api/controllers/v2/auth/test_auth.py
@@ -30,7 +30,7 @@ class TestAuthController(functionalTest.FunctionalTest):
             }
         }
 
-        response = self.app.post_json('/v2/auth/login', params=auth)
+        response = self.app.post_json('/v2/auth/tokens', params=auth)
 
         expected = {
             "access": {
diff --git a/tox.ini b/tox.ini
index f4325aa..884f9b5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,6 @@ usedevelop = True
 install_command = pip install -U --force-reinstall {opts} {packages}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-       git+https://github.com/reazem/shinken.git@setup_py#egg=shinken
 
 commands = python setup.py testr --slowest --testr-args='{posargs}'