diff --git a/fstest/test_all/config.yaml b/fstest/test_all/config.yaml
index 4c48c958e..8bc24eeb0 100644
--- a/fstest/test_all/config.yaml
+++ b/fstest/test_all/config.yaml
@@ -75,6 +75,8 @@ backends:
    remote:   "TestChunkerChunk50bBox:"
    fastlist: true
    maxfile:  1k
+   ignore:
+     - TestIntegration/FsMkdir/FsChangeNotify
  - backend:  "chunker"
    remote:   "TestChunkerS3:"
    fastlist: true
@@ -118,6 +120,8 @@ backends:
      - TestFileSetModTime/cache=off,open=false,write=false
      - TestFileSetModTime/cache=off,open=true,write=false
      - TestRWFileHandleWriteNoWrite
+   ignoretests:
+     - cmd/gitannex
  - backend:  "combine"
    remote:   "TestCombine:dir1"
    fastlist: false
@@ -155,12 +159,20 @@ backends:
  - backend:  "filescom"
    remote:   "TestFilesCom:"
    fastlist: false
+   ignoretests:
+     - cmd/bisync
  - backend:  "googlecloudstorage"
    remote:   "TestGoogleCloudStorage:"
    fastlist: true
+   ignoretests:
+     - cmd/bisync
+     - cmd/gitannex
  - backend:  "googlecloudstorage"
    remote:   "TestGoogleCloudStorage,directory_markers:"
    fastlist: true
+   ignoretests:
+     - cmd/bisync
+     - cmd/gitannex
  - backend:  "googlephotos"
    remote:   "TestGooglePhotos:"
    tests:
@@ -171,6 +183,8 @@ backends:
  - backend:  "imagekit"
    remote:   "TestImageKit:"
    fastlist: false
+   ignoretests:
+     - cmd/bisync
  - backend:  "internetarchive"
    remote:   "TestIA:rclone-integration-test"
    fastlist: true
@@ -180,12 +194,16 @@ backends:
  - backend:  "jottacloud"
    remote:   "TestJottacloud:"
    fastlist: true
+   ignoretests:
+     - cmd/bisync
  - backend:  "memory"
    remote:   ":memory:"
    fastlist: true
  - backend:  "netstorage"
    remote:   "TestnStorage:"
    fastlist: true
+   ignoretests:
+     - cmd/bisync
  - backend:  "onedrive"
    remote:   "TestOneDrive:"
    fastlist: false
@@ -205,9 +223,14 @@ backends:
  - backend:  "s3"
    remote:   "TestS3,directory_markers:"
    fastlist: true
+   ignoretests:
+     - cmd/bisync
  - backend:  "s3"
    remote:   "TestS3Rclone:"
    fastlist: true
+   ignoretests:
+     - cmd/bisync
+     - cmd/gitannex
  - backend:  "s3"
    remote:   "TestS3Minio:"
    fastlist: true
@@ -224,6 +247,8 @@ backends:
    fastlist: true
    ignore:
      - TestIntegration/FsMkdir/FsPutFiles/SetTier
+   ignoretests:
+     - cmd/gitannex
  - backend:  "s3"
    remote:   "TestS3Wasabi:"
    fastlist: true
@@ -290,12 +315,19 @@ backends:
  - backend:  "sftp"
    remote:   "TestSFTPOpenssh:"
    fastlist: false
+   ignoretests:
+     - cmd/bisync
+     - cmd/gitannex
  - backend:  "sftp"
    remote:   "TestSFTPRclone:"
    fastlist: false
+   ignoretests:
+     - cmd/gitannex
  - backend:  "sftp"
    remote:   "TestSFTPRcloneSSH:"
    fastlist: false
+   ignoretests:
+     - cmd/gitannex
  - backend:  "sftp"
    remote:   "TestSFTPRsyncNet:"
    fastlist: false
@@ -308,6 +340,8 @@ backends:
      - TestIntegration/FsMkdir/FsEncoding/trailing_dot
      - TestIntegration/FsMkdir/FsEncoding/invalid_UTF-8
      - TestIntegration/FsMkdir/FsEncoding/URL_encoding
+   ignoretests:
+     - cmd/bisync
  - backend:  "sugarsync"
    remote:   "TestSugarSync:Test"
    fastlist: false
@@ -316,12 +350,18 @@ backends:
  - backend:  "swift"
    remote:   "TestSwiftAIO:"
    fastlist: true
+   ignoretests:
+     - cmd/gitannex
  - backend:  "swift"
    remote:   "TestSwiftAIOsegments:"
    fastlist: true
+   ignoretests:
+     - cmd/gitannex
  - backend:  "swift"
    remote:   "TestSwift:"
    fastlist: true
+   ignoretests:
+     - cmd/bisync
  # - backend:  "swift"
  #   remote:   "TestSwiftCeph:"
  #   fastlist: true
@@ -333,15 +373,23 @@ backends:
  - backend:  "ftp"
    remote:   "TestFTPProftpd:"
    fastlist: false
+   ignoretests:
+     - cmd/gitannex
  - backend:  "ftp"
    remote:   "TestFTPPureftpd:"
    fastlist: false
+   ignoretests:
+     - cmd/gitannex
  - backend:  "ftp"
    remote:   "TestFTPVsftpd:"
    fastlist: false
+   ignoretests:
+     - cmd/gitannex
  - backend:  "ftp"
    remote:   "TestFTPRclone:"
    fastlist: false
+   ignoretests:
+     - cmd/gitannex
  - backend:  "box"
    remote:   "TestBox:"
    fastlist: false
@@ -363,11 +411,19 @@ backends:
  - backend:  "azureblob"
    remote:   "TestAzureBlob:"
    fastlist: true
+   ignore:
+     # It just isn't possible to preserve the existing file with azure blob
+     # and make sure we don't leak uncomitted blocks.
+     - TestMultithreadCopyAbort   
  - backend:  "azureblob"
    remote:   "TestAzureBlob,directory_markers:"
    fastlist: true
+   ignoretests:
+     - cmd/bisync
  - backend:  "azurefiles"
    remote:   "TestAzureFiles:"
+   ignoretests:
+     - cmd/bisync
  - backend:  "pcloud"
    remote:   "TestPcloud:"
    fastlist: true
@@ -385,50 +441,68 @@ backends:
     # This test fails with message
     # "share_status_prohibited" (9): Sorry, the sharing service is under maintenance in the current region.
      - TestIntegration/FsMkdir/FsPutFiles/PublicLink
+   ignoretests:
+     - cmd/bisync
+     - cmd/gitannex
  - backend:  "pixeldrain"
    remote: "TestPixeldrain:"
    ignore:
      - TestIntegration/FsMkdir/FsEncoding/invalid_UTF-8
    fastlist: false
+   ignoretests:
+     - cmd/bisync
  - backend:  "webdav"
    remote:   "TestWebdavNextcloud:"
    ignore:
      - TestIntegration/FsMkdir/FsEncoding/punctuation
      - TestIntegration/FsMkdir/FsEncoding/invalid_UTF-8
    fastlist: false
+   ignoretests:
+     - cmd/bisync
+     - cmd/gitannex
  - backend:  "webdav"
    remote:   "TestWebdavOwncloud:"
    ignore:
      - TestIntegration/FsMkdir/FsEncoding/punctuation
      - TestIntegration/FsMkdir/FsEncoding/invalid_UTF-8
    fastlist: false
+   ignoretests:
+     - cmd/bisync
+     - cmd/gitannex
  - backend:  "webdav"
    remote:   "TestWebdavInfiniteScale:"
    ignore:
      - TestIntegration/FsMkdir/FsEncoding/punctuation
      - TestIntegration/FsMkdir/FsEncoding/invalid_UTF-8
    fastlist: false
+   ignoretests:
+     - cmd/bisync
+     - cmd/gitannex
  - backend:  "webdav"
    remote:   "TestWebdavRclone:"
    ignore:
      - TestFileReadAtZeroLength
    fastlist: false
+   ignoretests:
+     - cmd/gitannex
  - backend:  "cache"
    remote:   "TestCache:"
    fastlist: false
    ignoretests:
-     - TestBisyncLocalRemote
-     - TestBisyncRemoteLocal
-     - TestBisyncRemoteRemote
+     - cmd/bisync
  - backend:  "mega"
    remote:   "TestMega:"
    fastlist: false
    ignore:
      - TestIntegration/FsMkdir/FsPutFiles/PublicLink
      - TestDirRename
+   ignoretests:
+     - cmd/bisync
  - backend:  "opendrive"
    remote:   "TestOpenDrive:"
    fastlist: false
+   ignoretests:
+     - cmd/bisync
  - backend:  "union"
    remote:   "TestUnion:"
    fastlist: false
@@ -448,24 +522,34 @@ backends:
      - TestFixCase
      - TestListDirSorted        # Can't upload files starting with . - FIXME fix with encoding
      - TestSyncOverlapWithFilter # Can't upload files starting with . - FIXME fix with encoding
+   ignoretests:
+     - cmd/bisync
+     - cmd/gitannex
  - backend:  "premiumizeme"
    remote:   "TestPremiumizeMe:"
    fastlist: false
  - backend:  "protondrive"
    remote:   "TestProtonDrive:"
    fastlist: false
+   ignoretests:
+     - cmd/bisync
+     - cmd/gitannex
  - backend:  "putio"
    remote:   "TestPutio:"
    fastlist: false
    extratime: 2.0
    ignore:
       - TestIntegration/FsMkdir/FsEncoding/URL_encoding
- - backend:  "sharefile"
-   remote:   "TestSharefile:"
-   fastlist: false
+   ignoretests:
+     - cmd/bisync
+ # - backend:  "sharefile"
+ #   remote:   "TestSharefile:"
+ #   fastlist: false
  - backend:  "sia"
    remote:   "TestSia:"
    fastlist: false
+   ignoretests:
+     - cmd/gitannex
  - backend:  "mailru"
    remote:   "TestMailru:"
    subdir:   false
@@ -478,24 +562,31 @@ backends:
    fastlist: false
    ignore:
      - TestIntegration/FsMkdir/FsPutFiles/FsDirMove
+   ignoretests:
+     - cmd/gitannex
  - backend:  "seafile"
    remote:   "TestSeafile:"
    fastlist: true
+   ignoretests:
+     - cmd/gitannex
  - backend:  "seafile"
    remote:   "TestSeafileEncrypted:"
    fastlist: true
- - backend:  "sia"
-   remote:   "TestSia:"
-   fastlist: false
+   ignoretests:
+     - cmd/gitannex
  - backend:  "smb"
    remote:   "TestSMB:rclone"
    fastlist: false
+   ignoretests:
+     - cmd/gitannex
  - backend:  "smb"
    remote:   "TestSMBKerberos:rclone"
    fastlist: false
  - backend:  "storj"
    remote:   "TestStorj:"
    fastlist: true
+   ignoretests:
+     - cmd/bisync
  - backend:  "zoho"
    remote:   "TestZoho:"
    fastlist: false
@@ -522,17 +613,25 @@ backends:
      - TestIntegration/FsMkdir/FsEncoding/trailing_LF
      - TestIntegration/FsMkdir/FsEncoding/leading_HT
      - TestIntegration/FsMkdir/FsPutFiles/FsPutStream/0
+   ignoretests:
+     - cmd/bisync
+     - cmd/gitannex
  - backend:  "quatrix"
    remote:   "TestQuatrix:"
    fastlist: false
+   ignoretests:
+     - cmd/bisync
  - backend:  "ulozto"
    remote:   "TestUlozto:"
    fastlist: false
- - backend:  "iclouddrive"
-   remote:   "TestICloudDrive:"
-   fastlist: false
+ # - backend:  "iclouddrive"
+ #   remote:   "TestICloudDrive:"
+ #   fastlist: false
  - backend: "filelu"
    remote: "TestFileLu:"
    fastlist: false
    ignore:
      - TestRWFileHandleWriteNoWrite
+   ignoretests:
+     - cmd/bisync
+     - cmd/gitannex