diff --git a/fstest/test_all/config.go b/fstest/test_all/config.go
index 8f15a9b58..2fe0b7a6f 100644
--- a/fstest/test_all/config.go
+++ b/fstest/test_all/config.go
@@ -18,6 +18,7 @@ import (
 type Test struct {
 	Path       string // path to the source directory
 	FastList   bool   // if it is possible to add -fast-list to tests
+	Short      bool   // if it is possible to run the test with -short
 	AddBackend bool   // set if Path needs the current backend appending
 	NoRetries  bool   // set if no retries should be performed
 	NoBinary   bool   // set to not build a binary in advance
@@ -31,6 +32,7 @@ type Backend struct {
 	Backend  string   // name of the backend directory
 	Remote   string   // name of the test remote
 	FastList bool     // set to test with -fast-list
+	Short    bool     // set to test with -short
 	OneOnly  bool     // set to run only one backend test at once
 	Ignore   []string // test names to ignore the failure of
 	Tests    []string // paths of tests to run, blank for all
@@ -75,6 +77,7 @@ func (b *Backend) MakeRuns(t *Test) (runs []*Run) {
 			Backend:   b.Backend,
 			Path:      t.Path,
 			FastList:  fastlist,
+			Short:     (b.Short && t.Short),
 			NoRetries: t.NoRetries,
 			OneOnly:   b.OneOnly,
 			NoBinary:  t.NoBinary,
diff --git a/fstest/test_all/config.yaml b/fstest/test_all/config.yaml
index f5c653670..d6d2ef5af 100644
--- a/fstest/test_all/config.yaml
+++ b/fstest/test_all/config.yaml
@@ -2,6 +2,7 @@ tests:
  - path: backend
    addbackend: true
    nobinary:   true
+   short:      true
  - path: fs/operations
    fastlist: true
  - path: fs/sync
diff --git a/fstest/test_all/run.go b/fstest/test_all/run.go
index 141d7e135..45ddb973b 100644
--- a/fstest/test_all/run.go
+++ b/fstest/test_all/run.go
@@ -39,6 +39,7 @@ type Run struct {
 	Backend   string // name of the backend
 	Path      string // path to the source directory
 	FastList  bool   // add -fast-list to tests
+	Short     bool   // add -short
 	NoRetries bool   // don't retry if set
 	OneOnly   bool   // only run test for this backend at once
 	NoBinary  bool   // set to not build a binary
@@ -335,6 +336,9 @@ func (r *Run) Init() {
 	if r.FastList {
 		r.cmdLine = append(r.cmdLine, "-fast-list")
 	}
+	if r.Short {
+		r.cmdLine = append(r.cmdLine, "-short")
+	}
 	r.cmdString = toShell(r.cmdLine)
 }