diff --git a/fstest/fstest.go b/fstest/fstest.go
index 6361c6e7e..a562d2e27 100644
--- a/fstest/fstest.go
+++ b/fstest/fstest.go
@@ -468,11 +468,8 @@ func Purge(f fs.Fs) {
 	}
 	if doFallbackPurge {
 		dirs := []string{""}
-		err = walk.Walk(f, "", true, -1, func(dirPath string, entries fs.DirEntries, err error) error {
-			if err != nil {
-				log.Printf("purge walk returned error: %v", err)
-				return nil
-			}
+		err = walk.ListR(f, "", true, -1, walk.ListAll, func(entries fs.DirEntries) error {
+			var err error
 			entries.ForObject(func(obj fs.Object) {
 				fs.Debugf(f, "Purge object %q", obj.Remote())
 				err = obj.Remove()
diff --git a/fstest/run.go b/fstest/run.go
index dda6d4570..5eb8c0335 100644
--- a/fstest/run.go
+++ b/fstest/run.go
@@ -139,13 +139,7 @@ func newRunIndividual(t *testing.T, individual bool) *Run {
 		*r = *oneRun
 		r.cleanRemote = func() {
 			var toDelete []string
-			err := walk.Walk(r.Fremote, "", true, -1, func(dirPath string, entries fs.DirEntries, err error) error {
-				if err != nil {
-					if err == fs.ErrorDirNotFound {
-						return nil
-					}
-					t.Fatalf("Error listing: %v", err)
-				}
+			err := walk.ListR(r.Fremote, "", true, -1, walk.ListAll, func(entries fs.DirEntries) error {
 				for _, entry := range entries {
 					switch x := entry.(type) {
 					case fs.Object: