diff --git a/watchdog/requesthandler_test.go b/watchdog/requesthandler_test.go
index 6285cd67755d14951b67a959dbeb81c27ba8be18..5da4919617f7e987e867d7e2934c6feee5e2f8e1 100644
--- a/watchdog/requesthandler_test.go
+++ b/watchdog/requesthandler_test.go
@@ -26,6 +26,45 @@ func TestHandler_make(t *testing.T) {
 	}
 }
 
+func TestHandler_TransferEncodingPassedToFunction(t *testing.T) {
+	rr := httptest.NewRecorder()
+
+	body := "Message"
+	req, err := http.NewRequest(http.MethodPost, "/", bytes.NewBufferString(body))
+	req.TransferEncoding = []string{
+		"chunked",
+	}
+	req.ContentLength = -1
+
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	config := WatchdogConfig{
+		faasProcess: "env",
+		cgiHeaders:  true,
+	}
+	handler := makeRequestHandler(&config)
+	handler(rr, req)
+
+	required := http.StatusOK
+	if status := rr.Code; status != required {
+		t.Errorf("handler returned wrong status code - got: %v, want: %v",
+			status, required)
+	}
+
+	read, _ := ioutil.ReadAll(rr.Body)
+	val := string(read)
+	if !strings.Contains(val, `Http_ContentLength=-1`) {
+		t.Errorf(config.faasProcess+" should print: Http_ContentLength=-1, got: %s\n", val)
+	}
+
+	if !strings.Contains(val, "Http_Transfer_Encoding") {
+		t.Errorf(config.faasProcess+" should print: Http_Transfer_Encoding=chunked, got: %s\n", val)
+	}
+
+}
+
 func TestHandler_HasCustomHeaderInFunction_WithCgi_Mode(t *testing.T) {
 	rr := httptest.NewRecorder()