diff --git a/swift/common/db.py b/swift/common/db.py
index 5c2caab32c..725292b306 100644
--- a/swift/common/db.py
+++ b/swift/common/db.py
@@ -274,8 +274,8 @@ class DatabaseBroker(object):
         partition_path = os.path.dirname(prefix_path)
         dbs_path = os.path.dirname(partition_path)
         device_path = os.path.dirname(dbs_path)
-        quar_path = os.path.join(device_path, 'quarantined', self.db_type,
-                                 os.path.basename(self.db_dir))
+        quar_path = os.path.join(device_path, 'quarantined',
+            self.db_type + 's', os.path.basename(self.db_dir))
         try:
             renamer(self.db_dir, quar_path)
         except OSError, e:
diff --git a/test/unit/common/test_db.py b/test/unit/common/test_db.py
index 5f4428dc47..10d854fe20 100644
--- a/test/unit/common/test_db.py
+++ b/test/unit/common/test_db.py
@@ -206,9 +206,9 @@ class TestDatabaseBroker(unittest.TestCase):
             qpath = os.path.dirname(os.path.dirname(os.path.dirname(
                 os.path.dirname(self.testdir))))
             if qpath:
-                qpath += '/quarantined/test/db'
+                qpath += '/quarantined/tests/db'
             else:
-                qpath = 'quarantined/test/db'
+                qpath = 'quarantined/tests/db'
             # Test malformed database
             copy(os.path.join(os.path.dirname(__file__),
                               'malformed_example.db'),