diff --git a/kallithea/lib/paster_commands/make_index.py b/kallithea/lib/paster_commands/make_index.py
--- a/kallithea/lib/paster_commands/make_index.py
+++ b/kallithea/lib/paster_commands/make_index.py
@@ -57,8 +57,7 @@ class Command(BasePasterCommand):
         from kallithea.lib.pidlock import LockHeld, DaemonLock
         from kallithea.lib.indexers.daemon import WhooshIndexingDaemon
         try:
-            l = DaemonLock(file_=os.path.join(dirname(dirname(index_location)),
-                                              'make_index.lock'))
+            l = DaemonLock(file_=os.path.join(index_location, 'make_index.lock'))
             WhooshIndexingDaemon(index_location=index_location,
                                  repo_location=repo_location,
                                  repo_list=repo_list,
diff --git a/kallithea/tests/fixture.py b/kallithea/tests/fixture.py
--- a/kallithea/tests/fixture.py
+++ b/kallithea/tests/fixture.py
@@ -411,7 +411,7 @@ def create_test_index(repo_location, con
     if not os.path.exists(index_location):
         os.makedirs(index_location)
 
-    l = DaemonLock(file_=os.path.join(dirname(index_location), 'make_index.lock'))
+    l = DaemonLock(file_=os.path.join(index_location, 'make_index.lock'))
     WhooshIndexingDaemon(index_location=index_location,
                          repo_location=repo_location) \
         .run(full_index=full_index)