diff --git a/test/common_test.go b/test/common_test.go
index 108ba8bf8..088353370 100644
--- a/test/common_test.go
+++ b/test/common_test.go
@@ -149,7 +149,7 @@ func (p *syncthingProcess) get(path string) (*http.Response, error) {
 
 func (p *syncthingProcess) post(path string, data io.Reader) (*http.Response, error) {
 	client := &http.Client{
-		Timeout: 2 * time.Second,
+		Timeout: 600 * time.Second,
 		Transport: &http.Transport{
 			DisableKeepAlives: true,
 		},
diff --git a/test/parallell_scan_test.go b/test/parallell_scan_test.go
new file mode 100644
index 000000000..7e2c62491
--- /dev/null
+++ b/test/parallell_scan_test.go
@@ -0,0 +1,91 @@
+// Copyright (C) 2014 The Syncthing Authors.
+//
+// This program is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the Free
+// Software Foundation, either version 3 of the License, or (at your option)
+// any later version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+// more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program. If not, see <http://www.gnu.org/licenses/>.
+
+// +build integration
+
+package integration_test
+
+import (
+	"io/ioutil"
+	"log"
+	"sync"
+	"testing"
+	"time"
+)
+
+func TestParallellScan(t *testing.T) {
+	log.Println("Cleaning...")
+	err := removeAll("s1", "h1/index")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	log.Println("Generating files...")
+	err = generateFiles("s1", 5000, 18, "../LICENSE")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	log.Println("Generaing .stignore...")
+	err = ioutil.WriteFile("s1/.stignore", []byte("some ignore data\n"), 0644)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	log.Println("Starting up...")
+	st := syncthingProcess{ // id1
+		log:    "1.out",
+		argv:   []string{"-home", "h1"},
+		port:   8081,
+		apiKey: apiKey,
+	}
+	err = st.start()
+	if err != nil {
+		t.Fatal(err)
+	}
+	time.Sleep(5 * time.Second)
+
+	var wg sync.WaitGroup
+	log.Println("Starting scans...")
+	for j := 0; j < 20; j++ {
+		j := j
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			resp, err := st.post("/rest/scan?folder=default", nil)
+			log.Println(j)
+			if err != nil {
+				log.Println(err)
+				t.Fatal(err)
+			}
+			if resp.StatusCode != 200 {
+				t.Fatalf("%d != 200", resp.StatusCode)
+			}
+			resp.Body.Close()
+		}()
+	}
+
+	wg.Wait()
+	log.Println("Scans done")
+	time.Sleep(2 * time.Second)
+
+	// This is where the real test is currently, since stop() checks for data
+	// race output in the log.
+	log.Println("Stopping...")
+	err = st.stop()
+	if err != nil {
+		t.Fatal(err)
+	}
+}