diff --git a/agent/http_oss_test.go b/agent/http_oss_test.go
index 8627a1dfda..04883d11f6 100644
--- a/agent/http_oss_test.go
+++ b/agent/http_oss_test.go
@@ -2,10 +2,12 @@ package agent
 
 import (
 	"fmt"
+	"net"
 	"net/http"
 	"net/http/httptest"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/hashicorp/consul/logger"
 )
@@ -43,6 +45,18 @@ func includePathInTest(path string) bool {
 	return !ignored
 }
 
+func newHttpClient(timeout time.Duration) *http.Client {
+	return &http.Client{
+		Timeout: timeout,
+		Transport: &http.Transport{
+			Dial: (&net.Dialer{
+				Timeout: timeout,
+			}).Dial,
+			TLSHandshakeTimeout: timeout,
+		},
+	}
+}
+
 func TestHTTPAPI_MethodNotAllowed_OSS(t *testing.T) {
 
 	a := NewTestAgent(t.Name(), `acl_datacenter = "dc1"`)
@@ -50,10 +64,20 @@ func TestHTTPAPI_MethodNotAllowed_OSS(t *testing.T) {
 	defer a.Shutdown()
 
 	all := []string{"GET", "PUT", "POST", "DELETE", "HEAD", "OPTIONS"}
-	client := http.Client{}
+	const testTimeout = 10 * time.Second
+
+	fastClient := newHttpClient(10 * time.Second)
+	slowClient := newHttpClient(30 * time.Second)
 
 	testMethodNotAllowed := func(method string, path string, allowedMethods []string) {
 		t.Run(method+" "+path, func(t *testing.T) {
+			client := fastClient
+			if path == "/v1/agent/leave" {
+				// there are actual sleeps in this code that should take longer
+				client = slowClient
+				t.Logf("Using slow http client for leave tests")
+			}
+
 			uri := fmt.Sprintf("http://%s%s", a.HTTPAddr(), path)
 			req, _ := http.NewRequest(method, uri, nil)
 			resp, err := client.Do(req)