diff --git a/lib/pathutils.py b/lib/pathutils.py
index ca78ea8c45f257271bf16a2c34ea9fab51bd6582..9570831b7124b57abfb42a5a7fa60455dcd9c11e 100644
--- a/lib/pathutils.py
+++ b/lib/pathutils.py
@@ -88,6 +88,10 @@ USER_SCRIPTS_DIR = CONF_DIR + "/scripts"
 VNC_PASSWORD_FILE = CONF_DIR + "/vnc-cluster-password"
 HOOKS_BASE_DIR = CONF_DIR + "/hooks"
 FILE_STORAGE_PATHS_FILE = CONF_DIR + "/file-storage-paths"
+REMOTE_COMMANDS_DIR = CONF_DIR + "/remote-commands"
+
+#: Locked in exclusive mode while noded verifies a remote command
+REMOTE_COMMANDS_LOCK_FILE = LOCK_DIR + "/ganeti-remote-commands.lock"
 
 #: Lock file for watcher, locked in shared mode by watcher; lock in exclusive
 # mode to block watcher (see L{cli._RunWhileClusterStoppedHelper.Call}
diff --git a/test/ganeti.bdev_unittest.py b/test/ganeti.bdev_unittest.py
index d58ee226f4beeb30ad4c4dfc6283b3a199f31ab5..00347f683cbdd09b2a5b2ad1db327c250f97aa0c 100755
--- a/test/ganeti.bdev_unittest.py
+++ b/test/ganeti.bdev_unittest.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 #
 
-# Copyright (C) 2006, 2007, 2010 Google Inc.
+# Copyright (C) 2006, 2007, 2010, 2012 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -29,6 +29,7 @@ from ganeti import bdev
 from ganeti import errors
 from ganeti import constants
 from ganeti import utils
+from ganeti import pathutils
 
 import testutils
 
@@ -391,6 +392,10 @@ class TestComputeWrongFileStoragePathsInternal(unittest.TestCase):
     self.assertEqual(vfsp(["/usr/sbin/vim", "/srv/file-storage"]),
                      ["/usr/sbin/vim"])
 
+    self.assertTrue(vfsp([pathutils.REMOTE_COMMANDS_DIR]),
+                    msg=("Remote commands directory should never be valid"
+                         "for file storage"))
+
 
 class TestComputeWrongFileStoragePaths(testutils.GanetiTestCase):
   def test(self):