diff --git a/swift/common/middleware/recon.py b/swift/common/middleware/recon.py
index 6212c9f1fd..26839d8101 100644
--- a/swift/common/middleware/recon.py
+++ b/swift/common/middleware/recon.py
@@ -41,7 +41,7 @@ class ReconMiddleware(object):
 
     def __init__(self, app, conf, *args, **kwargs):
         self.app = app
-        self.devices = conf.get('devices', '/srv/node/')
+        self.devices = conf.get('devices', '/srv/node')
         swift_dir = conf.get('swift_dir', '/etc/swift')
         self.logger = get_logger(conf, log_route='recon')
         self.recon_cache_path = conf.get('recon_cache_path',
diff --git a/swift/container/server.py b/swift/container/server.py
index f177f4ebfa..3aecff5efa 100644
--- a/swift/container/server.py
+++ b/swift/container/server.py
@@ -54,7 +54,7 @@ class ContainerController(object):
 
     def __init__(self, conf, logger=None):
         self.logger = logger or get_logger(conf, log_route='container-server')
-        self.root = conf.get('devices', '/srv/node/')
+        self.root = conf.get('devices', '/srv/node')
         self.mount_check = config_true_value(conf.get('mount_check', 'true'))
         self.node_timeout = int(conf.get('node_timeout', 3))
         self.conn_timeout = float(conf.get('conn_timeout', 0.5))
diff --git a/swift/obj/diskfile.py b/swift/obj/diskfile.py
index ae2ccd1b89..c9e5c7ccb8 100644
--- a/swift/obj/diskfile.py
+++ b/swift/obj/diskfile.py
@@ -376,7 +376,7 @@ class DiskFileManager(object):
     """
     def __init__(self, conf, logger):
         self.logger = logger
-        self.devices = conf.get('devices', '/srv/node/')
+        self.devices = conf.get('devices', '/srv/node')
         self.disk_chunk_size = int(conf.get('disk_chunk_size', 65536))
         self.keep_cache_size = int(conf.get('keep_cache_size', 5242880))
         self.bytes_per_sync = int(conf.get('mb_per_sync', 512)) * 1024 * 1024
diff --git a/test/unit/common/middleware/test_recon.py b/test/unit/common/middleware/test_recon.py
index 6d690ca6fb..5cdd2edf40 100644
--- a/test/unit/common/middleware/test_recon.py
+++ b/test/unit/common/middleware/test_recon.py
@@ -568,7 +568,7 @@ class TestReconSuccess(TestCase):
         self.mockos.ls_output = ['fakeone', 'faketwo']
         self.mockos.ismount_output = False
         rv = self.app.get_unmounted()
-        self.assertEquals(self.mockos.listdir_calls, [(('/srv/node/',), {})])
+        self.assertEquals(self.mockos.listdir_calls, [(('/srv/node',), {})])
         self.assertEquals(rv, unmounted_resp)
 
     def test_get_unmounted_everything_normal(self):
@@ -576,7 +576,7 @@ class TestReconSuccess(TestCase):
         self.mockos.ls_output = ['fakeone', 'faketwo']
         self.mockos.ismount_output = True
         rv = self.app.get_unmounted()
-        self.assertEquals(self.mockos.listdir_calls, [(('/srv/node/',), {})])
+        self.assertEquals(self.mockos.listdir_calls, [(('/srv/node',), {})])
         self.assertEquals(rv, unmounted_resp)
 
     def test_get_unmounted_checkmount_fail(self):
@@ -584,7 +584,7 @@ class TestReconSuccess(TestCase):
         self.mockos.ls_output = ['fakeone']
         self.mockos.ismount_output = OSError('brokendrive')
         rv = self.app.get_unmounted()
-        self.assertEquals(self.mockos.listdir_calls, [(('/srv/node/',), {})])
+        self.assertEquals(self.mockos.listdir_calls, [(('/srv/node',), {})])
         self.assertEquals(self.mockos.ismount_calls,
                           [(('/srv/node/fakeone',), {})])
         self.assertEquals(rv, unmounted_resp)
@@ -598,7 +598,7 @@ class TestReconSuccess(TestCase):
         self.mockos.ls_output = []
         self.mockos.ismount_output = False
         rv = self.app.get_unmounted()
-        self.assertEquals(self.mockos.listdir_calls, [(('/srv/node/',), {})])
+        self.assertEquals(self.mockos.listdir_calls, [(('/srv/node',), {})])
         self.assertEquals(rv, unmounted_resp)
 
     def test_get_diskusage(self):
@@ -625,7 +625,7 @@ class TestReconSuccess(TestCase):
         self.mockos.ls_output = ['canhazdrive1']
         self.mockos.ismount_output = OSError('brokendrive')
         rv = self.app.get_diskusage()
-        self.assertEquals(self.mockos.listdir_calls, [(('/srv/node/',), {})])
+        self.assertEquals(self.mockos.listdir_calls, [(('/srv/node',), {})])
         self.assertEquals(self.mockos.ismount_calls,
                           [(('/srv/node/canhazdrive1',), {})])
         self.assertEquals(rv, du_resp)