diff --git a/api/server/router/runner_test.go b/api/server/router/runner_test.go
index 7ef135b39..98d0817bd 100644
--- a/api/server/router/runner_test.go
+++ b/api/server/router/runner_test.go
@@ -1 +1,75 @@
 package router
+
+import (
+	"bytes"
+	"net/http"
+	"strings"
+	"testing"
+
+	"github.com/iron-io/functions/api/models"
+)
+
+func TestRouteRunnerGet(t *testing.T) {
+	router := testRouter()
+
+	for i, test := range []struct {
+		path          string
+		body          string
+		expectedCode  int
+		expectedError error
+	}{
+		{"/route", "", http.StatusNotFound, models.ErrRunnerRouteNotFound},
+		{"/r/app/route", "", http.StatusNotFound, models.ErrRunnerRouteNotFound},
+		{"/route?payload=test", "", http.StatusBadRequest, models.ErrInvalidJSON},
+		{"/r/app/route?payload=test", "", http.StatusBadRequest, models.ErrInvalidJSON},
+	} {
+		_, rec := routerRequest(t, router, "GET", test.path, nil)
+
+		if rec.Code != test.expectedCode {
+			t.Errorf("Test %d: Expected status code to be %d but was %d",
+				i, test.expectedCode, rec.Code)
+		}
+
+		if test.expectedError != nil {
+			resp := getErrorResponse(t, rec)
+
+			if !strings.Contains(resp.Error.Message, test.expectedError.Error()) {
+				t.Errorf("Test %d: Expected error message to have `%s`",
+					i, test.expectedError.Error())
+			}
+		}
+	}
+}
+
+func TestRouteRunnerPost(t *testing.T) {
+	router := testRouter()
+
+	for i, test := range []struct {
+		path          string
+		body          string
+		expectedCode  int
+		expectedError error
+	}{
+		{"/route", `payload`, http.StatusBadRequest, models.ErrInvalidJSON},
+		{"/r/app/route", `payload`, http.StatusBadRequest, models.ErrInvalidJSON},
+		{"/route", `{ "payload": "" }`, http.StatusNotFound, models.ErrRunnerRouteNotFound},
+		{"/r/app/route", `{ "payload": "" }`, http.StatusNotFound, models.ErrRunnerRouteNotFound},
+	} {
+		body := bytes.NewBuffer([]byte(test.body))
+		_, rec := routerRequest(t, router, "POST", test.path, body)
+
+		if rec.Code != test.expectedCode {
+			t.Errorf("Test %d: Expected status code to be %d but was %d",
+				i, test.expectedCode, rec.Code)
+		}
+
+		if test.expectedError != nil {
+			resp := getErrorResponse(t, rec)
+
+			if !strings.Contains(resp.Error.Message, test.expectedError.Error()) {
+				t.Errorf("Test %d: Expected error message to have `%s`",
+					i, test.expectedError.Error())
+			}
+		}
+	}
+}