diff --git a/integration/common_test.go b/integration/common_test.go
index 921557ba7..275c3654f 100644
--- a/integration/common_test.go
+++ b/integration/common_test.go
@@ -81,6 +81,9 @@ func (p *syncthingProcess) stop() {
 }
 
 func (p *syncthingProcess) get(path string) (*http.Response, error) {
+	client := &http.Client{
+		Timeout: 2 * time.Second,
+	}
 	req, err := http.NewRequest("GET", fmt.Sprintf("http://127.0.0.1:%d%s", p.port, path), nil)
 	if err != nil {
 		return nil, err
@@ -91,7 +94,7 @@ func (p *syncthingProcess) get(path string) (*http.Response, error) {
 	if p.csrfToken != "" {
 		req.Header.Add("X-CSRF-Token", p.csrfToken)
 	}
-	resp, err := http.DefaultClient.Do(req)
+	resp, err := client.Do(req)
 	if err != nil {
 		return nil, err
 	}
diff --git a/integration/httpstress_test.go b/integration/httpstress_test.go
new file mode 100644
index 000000000..1b9e4c271
--- /dev/null
+++ b/integration/httpstress_test.go
@@ -0,0 +1,102 @@
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// All rights reserved. Use of this source code is governed by an MIT-style
+// license that can be found in the LICENSE file.
+
+// +build integration
+
+package integration_test
+
+import (
+	"bytes"
+	"crypto/tls"
+	"errors"
+	"io/ioutil"
+	"log"
+	"net/http"
+	"os"
+	"sync"
+	"testing"
+	"time"
+)
+
+func TestStressHTTP(t *testing.T) {
+	log.Println("Cleaning...")
+	err := removeAll("s2", "h2/index")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	os.Setenv("STNORESTART", "1")
+
+	log.Println("Starting up...")
+	sender := syncthingProcess{ // id1
+		log:    "2.out",
+		argv:   []string{"-home", "h2"},
+		port:   8082,
+		apiKey: apiKey,
+	}
+	ver, err := sender.start()
+	if err != nil {
+		t.Fatal(err)
+	}
+	log.Println(ver)
+
+	tc := &tls.Config{InsecureSkipVerify: true}
+	tr := &http.Transport{
+		TLSClientConfig: tc,
+	}
+	client := &http.Client{
+		Transport: tr,
+		Timeout:   2 * time.Second,
+	}
+	var wg sync.WaitGroup
+	t0 := time.Now()
+
+	var counter int
+	var lock sync.Mutex
+
+	errChan := make(chan error, 2)
+	for i := 0; i < 50; i++ {
+		i := i
+		wg.Add(1)
+		go func() {
+			for time.Since(t0).Seconds() < 30 {
+				proto := "http"
+				if i%2 == 0 {
+					proto = "https"
+				}
+				resp, err := client.Get(proto + "://localhost:8082/")
+				if err != nil {
+					errChan <- err
+					return
+				}
+				bs, _ := ioutil.ReadAll(resp.Body)
+				resp.Body.Close()
+				if !bytes.Contains(bs, []byte("</html>")) {
+					log.Printf("%s", bs)
+					errChan <- errors.New("Incorrect response")
+					return
+				}
+
+				lock.Lock()
+				counter++
+				lock.Unlock()
+			}
+			wg.Done()
+		}()
+	}
+
+	go func() {
+		wg.Wait()
+		errChan <- nil
+	}()
+
+	err = <-errChan
+
+	t.Logf("%.01f reqs/sec", float64(counter)/time.Since(t0).Seconds())
+
+	sender.stop()
+	if err != nil {
+		t.Error(err)
+	}
+}