diff --git a/.travis.yml b/.travis.yml
index 12d9230..b696430 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,19 +19,8 @@ go:
   - 1.9.x
 
 script:
-  # build test for supported platforms
-  - GOOS=linux go build
-  - GOOS=darwin go build
-  - GOOS=freebsd go build
-  - GOOS=windows go build
-  - GOARCH=386 go build
-
-  # run tests on a standard platform
   - go test -v ./...
 
-  # run tests with the race detector as well
-  - go test -race -v ./...
-
 env:
   global:
     secure: "v/F0oI9zE9mcpEp4AVdHzSSHbe5ZFtH6B0i/BiUXKdQRQ10+JMPDOFRJQti7yxjMwltyd/QSFmR50Fl108sQYpo4xdlEXMHp2Y6OAN6crrp6PuHbLYgDWu3df/cH7/BqDyIq1uX8KZEeQssnygYN8hN4tpJCUg+NIb40Lm57Zsodt8DVjjyDWQQFDL7soNyAwGwQIqEyJsn+NUieXWEB1Qnt0xUtPIReuLlrwXR8wC1nLEjG9yz4ftDHHQdhVbO2b+xGWyaJ7QB5ixztaQP8Jnny6kSW9j6zEhJVuzdZ6d3xz23ibCbzSXBHdIUEI9u6ifQj8BYXr8fFS0FB3++IxgAYSs3ybZ+qEwuAxSBBm6YNW+3FrfDknVwTQscjKqnXPisjUqaRC9b31hke0tXzBq1488hE+wxMXeDM4LwWT5IMEO2gz0WGQXxmdVit72DIjCZxJkf1TvZZ0YH7Y//6wJTYYP9xulsy4gqu8CuFdWiF3fiGc3p5DTIS75nJ/Yy76Sa1pRPASKCujfLxtHE6Mt0XKvSolIXklYIzBkjN6vn80N6JIrqtqlimBGPW/Ec6+dwbmRe2AcOKRl4y7pZsGYhJhqdue1mucUYO/e2QeBZJGkqqG+zF5AW0v8x29BHvMwViAonc8o9eelkJ8khYzc/Qeq05pZnR/N/Pqfc+68k="
@@ -43,11 +32,47 @@ jobs:
   allow_failures:
     - go: tip
   include:
+    - stage: cross compilation
+      os:
+        - linux
+      go:
+        - 1.14.x
+      script:
+        - GOOS=linux go build
+        - GOOS=darwin go build
+        - GOOS=freebsd go build
+        - GOOS=windows go build
+        - GOARCH=386 go build
+    - stage: cross compilation
+      os:
+        - osx
+      go:
+        - 1.14.x
+      script:
+        - GOOS=linux go build
+        - GOOS=darwin go build
+        - GOOS=freebsd go build
+        - GOOS=windows go build
+        - GOARCH=386 go build
+    - stage: race detector
+      os:
+        - linux
+      go:
+        - 1.14.x
+      script:
+        - go test -race -v ./...
+    - stage: race detector
+      os:
+        - osx
+      go:
+        - 1.14.x
+      script:
+        - go test -race -v ./...
     - stage: fuzzit.dev
       os:
         - linux
       go:
-        - 1.14
+        - 1.14.x
       script:
         - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ./fuzzit.sh fuzzing; fi
         - if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then ./fuzzit.sh local-regression; fi
diff --git a/server_test.go b/server_test.go
index cff408e..9381cb4 100644
--- a/server_test.go
+++ b/server_test.go
@@ -949,7 +949,7 @@ func TestServerTLSReadTimeout(t *testing.T) {
 	keyFile := "./ssl-cert-snakeoil.key"
 
 	s := &Server{
-		ReadTimeout: time.Millisecond * 50,
+		ReadTimeout: time.Millisecond * 100,
 		Logger:      &testLogger{}, // Ignore log output.
 		Handler: func(ctx *RequestCtx) {
 		},
@@ -982,7 +982,7 @@ func TestServerTLSReadTimeout(t *testing.T) {
 
 	select {
 	case err = <-r:
-	case <-time.After(time.Millisecond * 100):
+	case <-time.After(time.Millisecond * 200):
 	}
 
 	if err == nil {