diff --git a/test/test-setup b/test/test-setup
index 763087e42..03b1a3be3 100755
--- a/test/test-setup
+++ b/test/test-setup
@@ -53,8 +53,8 @@ cat $settings_local test/settings_local_test.py > ietf/settings_local.py
 
 # Acquire lock, to prevent running test and database update at the same time
 
-LOCKDIR=$build/test/update-db.lock
-PIDFILE=$build/test/update-db.lock/pid
+LOCKDIR=/var/lock/ietfdb
+PIDFILE=$LOCKDIR/pid
 
 while true; do
     if mkdir $build/test/update-db.lock; then
diff --git a/test/test-teardown b/test/test-teardown
index 95af46b9a..7469b2394 100755
--- a/test/test-teardown
+++ b/test/test-teardown
@@ -21,7 +21,7 @@ fi
 
 # Release database update lock
 
-LOCKDIR=$build/test/update-db.lock
+LOCKDIR=/var/lock/ietfdb
 rm -rf $LOCKDIR
 
 exit $warnings