diff --git a/server/api_test.go b/server/api_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..6f72c835a5b69b82887cabd565d7dce029baf162
--- /dev/null
+++ b/server/api_test.go
@@ -0,0 +1,75 @@
+package server_test
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/privacybydesign/irmago"
+	"github.com/privacybydesign/irmago/server"
+	"github.com/stretchr/testify/require"
+	"testing"
+)
+
+func TestParseSessionRequest(t *testing.T) {
+	requestJson := `{"@context":"https://irma.app/ld/request/disclosure/v2","context":"AQ==","nonce":"M3LYmTr3CZDYZkMNK2uCCg==","protocolVersion":"2.5","disclose":[[["irma-demo.RU.studentCard.studentID"]]],"labels":{"0":null}}`
+	requestorRequestJson := fmt.Sprintf(`{"request": %s}`, requestJson)
+	t.Run("valid json string", func(t *testing.T) {
+		res, err := server.ParseSessionRequest(requestJson)
+		require.NoError(t, err)
+		require.Equal(t,
+			"irma-demo.RU.studentCard.studentID",
+			res.SessionRequest().Disclosure().Disclose[0][0][0].Type.String())
+	})
+
+	t.Run("valid byte array", func(t *testing.T) {
+		res, err := server.ParseSessionRequest([]byte(requestJson))
+		require.NoError(t, err)
+		require.Equal(t,
+			"irma-demo.RU.studentCard.studentID",
+			res.SessionRequest().Disclosure().Disclose[0][0][0].Type.String())
+	})
+
+	t.Run("valid struct", func(t *testing.T) {
+		request := &irma.DisclosureRequest{}
+		require.NoError(t, json.Unmarshal([]byte(requestJson), request))
+		res, err := server.ParseSessionRequest(request)
+		require.NoError(t, err)
+		require.Equal(t,
+			"irma-demo.RU.studentCard.studentID",
+			res.SessionRequest().Disclosure().Disclose[0][0][0].Type.String())
+	})
+
+	t.Run("requestor request string", func(t *testing.T) {
+		res, err := server.ParseSessionRequest(requestorRequestJson)
+		require.NoError(t, err)
+		require.Equal(t,
+			"irma-demo.RU.studentCard.studentID",
+			res.SessionRequest().Disclosure().Disclose[0][0][0].Type.String())
+	})
+
+	t.Run("requestor request struct", func(t *testing.T) {
+		request := &irma.DisclosureRequest{}
+		require.NoError(t, json.Unmarshal([]byte(requestJson), request))
+		sessionRequest := &irma.ServiceProviderRequest{
+			Request:              request,
+		}
+
+		res, err := server.ParseSessionRequest(sessionRequest)
+		require.NoError(t, err)
+		require.Equal(t,
+			"irma-demo.RU.studentCard.studentID",
+			res.SessionRequest().Disclosure().Disclose[0][0][0].Type.String())
+		req, ok := res.(*irma.ServiceProviderRequest)
+		require.True(t, ok)
+		require.Equal(t, request, req.Request)
+	})
+
+	t.Run("invalid type", func(t *testing.T) {
+		_, err := server.ParseSessionRequest(42)
+		require.Error(t, err)
+	})
+
+	t.Run("invalid string", func(t *testing.T) {
+		_, err := server.ParseSessionRequest(`{"foo": "bar"}`)
+		require.Error(t, err)
+	})
+}