diff --git a/cmd/aws-lambda-rie/http.go b/cmd/aws-lambda-rie/http.go
index be4002d..5c8696b 100644
--- a/cmd/aws-lambda-rie/http.go
+++ b/cmd/aws-lambda-rie/http.go
@@ -9,13 +9,15 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-func startHTTPServer(ipport string, sandbox Sandbox) {
+func startHTTPServer(ipport string, sandbox Sandbox, funcName string) {
 	srv := &http.Server{
 		Addr: ipport,
 	}
 
+	url := "/2015-03-31/functions/" + funcName + "/invocations"
+
 	// Pass a channel
-	http.HandleFunc("/2015-03-31/functions/function/invocations", func(w http.ResponseWriter, r *http.Request) {
+	http.HandleFunc(url, func(w http.ResponseWriter, r *http.Request) {
 		InvokeHandler(w, r, sandbox)
 	})
 
diff --git a/cmd/aws-lambda-rie/main.go b/cmd/aws-lambda-rie/main.go
index a151ae7..4abb840 100644
--- a/cmd/aws-lambda-rie/main.go
+++ b/cmd/aws-lambda-rie/main.go
@@ -41,7 +41,8 @@ func main() {
 	go sandbox.Create()
 
 	testAPIipport := "0.0.0.0:8080"
-	startHTTPServer(testAPIipport, sandbox)
+	funcName := GetenvWithDefault("AWS_LAMBDA_FUNCTION_NAME", "function")
+	startHTTPServer(testAPIipport, sandbox, funcName)
 }
 
 func getCLIArgs() (options, []string) {
diff --git a/test/integration/local_lambda/end-to-end-test.py b/test/integration/local_lambda/end-to-end-test.py
index 27d0e07..06cb85a 100644
--- a/test/integration/local_lambda/end-to-end-test.py
+++ b/test/integration/local_lambda/end-to-end-test.py
@@ -80,7 +80,7 @@ def test_lambda_function_arn_exists_with_defining_custom_name(self):
         # sleep 1s to give enough time for the endpoint to be up to curl
         time.sleep(SLEEP_TIME)
 
-        r = requests.post("http://localhost:9000/2015-03-31/functions/function/invocations", json={})
+        r = requests.post("http://localhost:9000/2015-03-31/functions/MyCoolName/invocations", json={})
         self.assertEqual(b'"My lambda ran succesfully"', r.content)
 
 
@@ -190,7 +190,7 @@ def test_function_name_is_overriden(self):
         # sleep 1s to give enough time for the endpoint to be up to curl
         time.sleep(SLEEP_TIME)
 
-        r = requests.post("http://localhost:9009/2015-03-31/functions/function/invocations", json={})
+        r = requests.post("http://localhost:9009/2015-03-31/functions/MyCoolName/invocations", json={})
         self.assertEqual(b'"My lambda ran succesfully"', r.content)