diff --git a/registry/storage/driver/rados/rados.go b/registry/storage/driver/rados/rados.go
index 0ea10a895..b2e6590d7 100644
--- a/registry/storage/driver/rados/rados.go
+++ b/registry/storage/driver/rados/rados.go
@@ -409,7 +409,9 @@ func (d *driver) List(ctx context.Context, dirPath string) ([]string, error) {
 
 	keys := make([]string, 0, len(files))
 	for k := range files {
-		keys = append(keys, path.Join(dirPath, k))
+		if k != dirPath {
+			keys = append(keys, path.Join(dirPath, k))
+		}
 	}
 
 	return keys, nil
@@ -528,7 +530,7 @@ func (d *driver) putOid(objectPath string, oid string) error {
 	}
 
 	// Esure parent virtual directories
-	if createParentReference && directory != "/" {
+	if createParentReference {
 		return d.putOid(directory, "")
 	}
 
@@ -581,7 +583,7 @@ func (d *driver) deleteOid(objectPath string) error {
 		}
 
 		// Remove reference on parent omaps
-		if directory != "/" {
+		if directory != "" {
 			return d.deleteOid(directory)
 		}
 	}
diff --git a/registry/storage/driver/testsuites/testsuites.go b/registry/storage/driver/testsuites/testsuites.go
index 770c428cf..1772560b5 100644
--- a/registry/storage/driver/testsuites/testsuites.go
+++ b/registry/storage/driver/testsuites/testsuites.go
@@ -87,6 +87,14 @@ func (suite *DriverSuite) TearDownTest(c *check.C) {
 	}
 }
 
+// TestRootExists ensures that all storage drivers have a root path by default.
+func (suite *DriverSuite) TestRootExists(c *check.C) {
+	_, err := suite.StorageDriver.List(suite.ctx, "/")
+	if err != nil {
+		c.Fatalf(`the root path "/" should always exist: %v`, err)
+	}
+}
+
 // TestValidPaths checks that various valid file paths are accepted by the
 // storage driver.
 func (suite *DriverSuite) TestValidPaths(c *check.C) {