diff --git a/misc.go b/misc.go
index fc2927461..98e583bc7 100644
--- a/misc.go
+++ b/misc.go
@@ -66,13 +66,12 @@ func (e *RateLimitedError) Retryable() bool {
 }
 
 func fileUploadReq(ctx context.Context, path string, values url.Values, r io.Reader) (*http.Request, error) {
-	req, err := http.NewRequest("POST", path, r)
+	req, err := http.NewRequestWithContext(ctx, "POST", path, r)
 	if err != nil {
 		return nil, err
 	}
 
-	req = req.WithContext(ctx)
-	req.URL.RawQuery = (values).Encode()
+	req.URL.RawQuery = values.Encode()
 	return req, nil
 }
 
@@ -81,14 +80,13 @@ func downloadFile(ctx context.Context, client httpClient, token string, download
 		return fmt.Errorf("received empty download URL")
 	}
 
-	req, err := http.NewRequest("GET", downloadURL, &bytes.Buffer{})
+	req, err := http.NewRequestWithContext(ctx, "GET", downloadURL, &bytes.Buffer{})
 	if err != nil {
 		return err
 	}
 
 	var bearer = "Bearer " + token
 	req.Header.Add("Authorization", bearer)
-	req.WithContext(ctx)
 
 	resp, err := client.Do(req)
 	if err != nil {
@@ -107,8 +105,8 @@ func downloadFile(ctx context.Context, client httpClient, token string, download
 	return err
 }
 
-func formReq(endpoint string, values url.Values) (req *http.Request, err error) {
-	if req, err = http.NewRequest("POST", endpoint, strings.NewReader(values.Encode())); err != nil {
+func formReq(ctx context.Context, endpoint string, values url.Values) (req *http.Request, err error) {
+	if req, err = http.NewRequestWithContext(ctx, "POST", endpoint, strings.NewReader(values.Encode())); err != nil {
 		return nil, err
 	}
 
@@ -116,13 +114,13 @@ func formReq(endpoint string, values url.Values) (req *http.Request, err error)
 	return req, nil
 }
 
-func jsonReq(endpoint string, body interface{}) (req *http.Request, err error) {
+func jsonReq(ctx context.Context, endpoint string, body interface{}) (req *http.Request, err error) {
 	buffer := bytes.NewBuffer([]byte{})
 	if err = json.NewEncoder(buffer).Encode(body); err != nil {
 		return nil, err
 	}
 
-	if req, err = http.NewRequest("POST", endpoint, buffer); err != nil {
+	if req, err = http.NewRequestWithContext(ctx, "POST", endpoint, buffer); err != nil {
 		return nil, err
 	}
 
@@ -184,7 +182,6 @@ func postWithMultipartResponse(ctx context.Context, client httpClient, path, nam
 	}
 	req.Header.Add("Content-Type", wr.FormDataContentType())
 	req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", token))
-	req = req.WithContext(ctx)
 	resp, err := client.Do(req)
 
 	if err != nil {
@@ -206,7 +203,6 @@ func postWithMultipartResponse(ctx context.Context, client httpClient, path, nam
 }
 
 func doPost(ctx context.Context, client httpClient, req *http.Request, parser responseParser, d Debug) error {
-	req = req.WithContext(ctx)
 	resp, err := client.Do(req)
 	if err != nil {
 		return err
@@ -224,7 +220,7 @@ func doPost(ctx context.Context, client httpClient, req *http.Request, parser re
 // post JSON.
 func postJSON(ctx context.Context, client httpClient, endpoint, token string, json []byte, intf interface{}, d Debug) error {
 	reqBody := bytes.NewBuffer(json)
-	req, err := http.NewRequest("POST", endpoint, reqBody)
+	req, err := http.NewRequestWithContext(ctx, "POST", endpoint, reqBody)
 	if err != nil {
 		return err
 	}
@@ -237,7 +233,7 @@ func postJSON(ctx context.Context, client httpClient, endpoint, token string, js
 // post a url encoded form.
 func postForm(ctx context.Context, client httpClient, endpoint string, values url.Values, intf interface{}, d Debug) error {
 	reqBody := strings.NewReader(values.Encode())
-	req, err := http.NewRequest("POST", endpoint, reqBody)
+	req, err := http.NewRequestWithContext(ctx, "POST", endpoint, reqBody)
 	if err != nil {
 		return err
 	}
@@ -246,7 +242,7 @@ func postForm(ctx context.Context, client httpClient, endpoint string, values ur
 }
 
 func getResource(ctx context.Context, client httpClient, endpoint, token string, values url.Values, intf interface{}, d Debug) error {
-	req, err := http.NewRequest("GET", endpoint, nil)
+	req, err := http.NewRequestWithContext(ctx, "GET", endpoint, nil)
 	if err != nil {
 		return err
 	}