diff --git a/lib/locking.py b/lib/locking.py
index d89388cdd01ccd10106989a2213b8cfe79557134..934638f4600786a565fbb1bf012e407b5ff5b592 100644
--- a/lib/locking.py
+++ b/lib/locking.py
@@ -1367,7 +1367,7 @@ class GanetiLockManager:
   """
   _instance = None
 
-  def __init__(self, nodes=None, instances=None):
+  def __init__(self, nodes, instances):
     """Constructs a new GanetiLockManager object.
 
     There should be only a GanetiLockManager object at any time, so this
diff --git a/test/ganeti.locking_unittest.py b/test/ganeti.locking_unittest.py
index 9c85886be17aa825f0e87febf13c856c2d89ceed..b6416aab6db7aedb0a0281037ddba294d42885f0 100755
--- a/test/ganeti.locking_unittest.py
+++ b/test/ganeti.locking_unittest.py
@@ -1419,8 +1419,7 @@ class TestGanetiLockManager(_ThreadedTestCase):
     _ThreadedTestCase.setUp(self)
     self.nodes=['n1', 'n2']
     self.instances=['i1', 'i2', 'i3']
-    self.GL = locking.GanetiLockManager(nodes=self.nodes,
-                                        instances=self.instances)
+    self.GL = locking.GanetiLockManager(self.nodes, self.instances)
 
   def tearDown(self):
     # Don't try this at home...
@@ -1435,7 +1434,7 @@ class TestGanetiLockManager(_ThreadedTestCase):
       self.assertEqual(i, locking.LEVELS[i])
 
   def testDoubleGLFails(self):
-    self.assertRaises(AssertionError, locking.GanetiLockManager)
+    self.assertRaises(AssertionError, locking.GanetiLockManager, [], [])
 
   def testLockNames(self):
     self.assertEqual(self.GL._names(locking.LEVEL_CLUSTER), set(['BGL']))