diff --git a/e2e-tests/oauth-flow/didx509/accesspolicy.json b/e2e-tests/oauth-flow/didx509/accesspolicy.json
new file mode 100644
index 000000000..f6258e83e
--- /dev/null
+++ b/e2e-tests/oauth-flow/didx509/accesspolicy.json
@@ -0,0 +1,75 @@
+{
+  "test": {
+    "organization": {
+      "format": {
+        "jwt_vc": {
+          "alg": [
+            "PS256"
+          ]
+        },
+        "jwt_vp": {
+          "alg": [
+            "PS256"
+          ]
+        }
+      },
+      "id": "pd_care_organization",
+      "input_descriptors": [
+        {
+          "id": "id_x509credential",
+          "constraints": {
+            "fields": [
+              {
+                "path": [
+                  "$.type"
+                ],
+                "filter": {
+                  "type": "string",
+                  "const": "X509Credential"
+                }
+              },
+              {
+                "path": [
+                  "$.issuer"
+                ],
+                "purpose": "Whe can only accept credentials from a trusted issuer",
+                "filter": {
+                  "type": "string",
+                  "pattern": "^did:x509:0:sha256:szqMaTpnD6GN0aRrT98eV4bhAoOgyItEZVyskYyL_Qc::.*$"
+                }
+              },
+              {
+                "id": "organization_name",
+                "path": [
+                  "$.credentialSubject[0].O"
+                ],
+                "filter": {
+                  "type": "string"
+                }
+              },
+              {
+                "id": "organization_ura",
+                "path": [
+                  "$.credentialSubject[0].otherName"
+                ],
+                "filter": {
+                  "type": "string",
+                  "pattern": "^[0-9.]+-\\d+-\\d+-S-(\\d+)-00\\.000-\\d+$"
+                }
+              },
+              {
+                "id": "organization_city",
+                "path": [
+                  "$.credentialSubject[0].L"
+                ],
+                "filter": {
+                  "type": "string"
+                }
+              }
+            ]
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/e2e-tests/oauth-flow/didx509/certs/README.md b/e2e-tests/oauth-flow/didx509/certs/README.md
new file mode 100644
index 000000000..ed75decc2
--- /dev/null
+++ b/e2e-tests/oauth-flow/didx509/certs/README.md
@@ -0,0 +1,5 @@
+These files were generated using https://github.com/nuts-foundation/uzi-did-x509-issuer/tree/main/test_ca:
+
+```shell
+./issue-cert.sh nodeA "Because We Care" "Healthland" 0 00001 0
+```
\ No newline at end of file
diff --git a/e2e-tests/oauth-flow/didx509/certs/nodeA-chain.pem b/e2e-tests/oauth-flow/didx509/certs/nodeA-chain.pem
new file mode 100644
index 000000000..4e4bfcccb
--- /dev/null
+++ b/e2e-tests/oauth-flow/didx509/certs/nodeA-chain.pem
@@ -0,0 +1,40 @@
+-----BEGIN CERTIFICATE-----
+MIIC9jCCAd6gAwIBAgIURFCqPrL3QQdBNOqkwmXWNgx9pdQwDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAwwQRmFrZSBVWkkgUm9vdCBDQTAeFw0yNDExMTExNDE1MTha
+Fw0zNDExMDkxNDE1MThaMBsxGTAXBgNVBAMMEEZha2UgVVpJIFJvb3QgQ0EwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDT5J8gKdyMJNi3cuAmJ+MILrMu
+wrKyTRYhjUUFHHn5rcVaHN0hzB6v5t74Nt40xUXRNaomDcclBIOlwt8f62JA2p/j
+83ENfdLrXvUu9NMThkqZwZ9dzRwK7l3UZBq8NTQUO74W4M2qx8nrXq31eWogxUUI
+Fc1XORh5ecebeL5mUb2E6UlmDmNgm2fGeSmmis8zieI+KKYOhi/hYtyeixrg7rxP
+4v0VRrEstcWAetRgXWQX0ElAxs0Vrsy6/vv3pEtXhx8wb2wi2xY14d9Ih8HdeNI+
++3wIbZz6WVM3fD5QFHV2EZBH+soo0pfKj2tHsaDz3FPMuMzILt6U6PT4ALIdAgMB
+AAGjMjAwMA8GA1UdEwQIMAYBAf8CAQAwHQYDVR0OBBYEFJuxz0XwN7PdeMhyJfcf
+m7py1BK9MA0GCSqGSIb3DQEBCwUAA4IBAQAhlpkz68x2dGpOLX3FzAb8Ee+Y2OV+
+RWFpsME9ZVDU06JETPfPCj02PH82lgUnc4jeR81rPSsIt2ssqm2S4zb02Nip595c
+AqCKvmBfEc9hPPW2ugpNxT8ZRU4LKrqpV4nJ6nBvDqmGuH5uq9Ng9l9SnM3eKmdZ
+tJKc+ZNAPKxVAiueLTdr6W2UbmKoZARQQ0JLkFnZOxnUkr8pQfxUzEIUkHg2dWaa
+I/4wo4Pni7xXggFoPDpVztu/iP33XBLqXJwxxHXhq9nc9JU/kEXDt7j8EgoyJo7J
+jSKcjpRfpGkE5gqqB4Sa8wAsAPUK3jRreuytllAtQUZRbCtHbxclc9yA
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDmTCCAoGgAwIBAgIUFTPO+pUk32QWsYyLYdlLTmlRWVYwDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAwwQRmFrZSBVWkkgUm9vdCBDQTAeFw0yNDEyMTgwOTE0NDZa
+Fw0zNDEyMTYwOTE0NDZaMEsxDjAMBgNVBAMMBW5vZGVBMRgwFgYDVQQKDA9CZWNh
+dXNlIFdlIENhcmUxEzARBgNVBAcMCkhlYWx0aGxhbmQxCjAIBgNVBAUTATAwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0LOkIXmq9QGpQsy+C+evhqMpL
+ZKDpRYIxoKR4Vqp68s2eX+xqBiSaxDkSe3xKKfm0CWsoeQVLXl+9VppH4q5uzyyl
+n/qQQEoErghULP99Ez/aDL0JX1XrEvjIePQ+E2rUfYp+HxQdKXc0kJsCv2fntK+T
+s6stN8ZeojCc4Edx1nxOHZGZXu0n5DMMXyTB4R7DCEOCyqppSv6m6CexxL4Aw4wr
+fHbO1dPmKV/jMxC3Y32SQ8ohJ80y3TnejYuzsAG155CZDm97+Za2G5BcNmwq7Qy7
+aVWhCpEW3fSOX1ZQBOwYFttd7wdcJla5QT6htJnKsWLFBBX4sGYFx1VQPRABAgMB
+AAGjgaQwgaEwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMEAGA1UdEQQ5
+MDegNQYDVQUFoC4MLDIuMTYuNTI4LjEuMTAwNy45OS4yMTEwLTEtMC1TLTAwMDAx
+LTAwLjAwMC0wMB0GA1UdDgQWBBSnq8XA3if+WQhRDgbOceZPm1NQDDAfBgNVHSME
+GDAWgBSbsc9F8Dez3XjIciX3H5u6ctQSvTANBgkqhkiG9w0BAQsFAAOCAQEARp5Y
+U1X34jvzdRzSWShluLN/sUSqgxJUmfhYi66lIZlQ4euaQNRFMzEwlQdzgcEBlJnr
+IZGgB+MhiCrqAb3PbHBq4V4vDqYmSmtWtxyGDQm5POiN2Uzos1CSBusIyeRkXc1e
+rKgXKcY16hzEagYRuJZN8cmeIKCLF0rh34xtEgdFzEw5xV4cWol9W0X9vNJJSVCH
+EBA9jY4ULMxxLQY+cZE4GuCfxQ7OsCQQqusP57zeIRDRLs0c8I8J3vSGp6sA2fG0
+mNVrEgIpktVro29NCVEp3oc+7UBsxH2BS45okCLp1KwVW0TMrDH9UPM7ktdCzSmP
+Xr+fIaVcs9sbT5qwGw==
+-----END CERTIFICATE-----
diff --git a/e2e-tests/oauth-flow/didx509/certs/nodeA.key b/e2e-tests/oauth-flow/didx509/certs/nodeA.key
new file mode 100644
index 000000000..70463bcdb
--- /dev/null
+++ b/e2e-tests/oauth-flow/didx509/certs/nodeA.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC0LOkIXmq9QGpQ
+sy+C+evhqMpLZKDpRYIxoKR4Vqp68s2eX+xqBiSaxDkSe3xKKfm0CWsoeQVLXl+9
+VppH4q5uzyyln/qQQEoErghULP99Ez/aDL0JX1XrEvjIePQ+E2rUfYp+HxQdKXc0
+kJsCv2fntK+Ts6stN8ZeojCc4Edx1nxOHZGZXu0n5DMMXyTB4R7DCEOCyqppSv6m
+6CexxL4Aw4wrfHbO1dPmKV/jMxC3Y32SQ8ohJ80y3TnejYuzsAG155CZDm97+Za2
+G5BcNmwq7Qy7aVWhCpEW3fSOX1ZQBOwYFttd7wdcJla5QT6htJnKsWLFBBX4sGYF
+x1VQPRABAgMBAAECggEABlZdDpPZmWID/n/Ek4AMakth7PoM+3kb917N4ipN0UjF
+VdIZOL2rrG9R8/xr1pgrrDsEYQmB5IQdH6w4sLLm5uCUUrGlLwBssHjzM78ob/ym
+scBiDTIXmmh4Rf7hImZtV8Xs3BSzEN25D5xPFq8aVCjqExEnztpn69y0rO2Dl2im
+xDBnUGPSy1ZCSGtES+BpaNT2GDGieaZmoNOH7TDLXIMYNjgnldeACQOiPvXYG+iQ
+LKNSMGw193rR4hB+haBqaEO++845+2vr3TQKOMdFiP3+6LmxTncujSF6RtWj+7si
+Zz1R7yqQKHsU6oYQrIJmdZg3AIwB3WhgeG27fZPkpQKBgQDXkOxoCSlvKym9e+r1
+M6Jz4ifaBWT4ys0HCOThEf47j8Qn2BwDIUqhrcARLMtVaEFTXhHWU8ceh529Fyoq
+yKe5mpbmzKFd2RH2cyjIq6/e9qVFXDeK7SbypIhxtGjeNv9dGaTSt0Qw2264vMYn
+aXHX7vdUfE4pt2R3RZepWKTOXQKBgQDV+JfwQPYFH8nMo9Juc+gzekUb31hZLn68
+Z6ZnvnxNShgazLslHKmAEZyokum0G1tZbiC5f6wI5a0GmFvPyFy1PklBjOatHVDG
+byXoRAT1jmBdy1+nfdhd+6Ju2r/VU5tvfYYcKkB/11eBHHYdnSWJU3QGQkpi58Da
+vlH2ry7F9QKBgQDEhX+wnOGkUqJb97PNVQR+Ryhzr8VMt35RMn+O3Nt8q2V1uaRY
+CirC2OcoAUFiHIipmzIBxiDaqWJZt9ueY43dPJzjzpwyNaoVlwkQYM0WJJ+paxfL
+1MZUIUGu/303UMZftvg3jhJhxDrdumOgHJZH+LiM0kJj76hswAoyvfiJlQKBgAGh
+Ee8XX4gsdMnlGW4T3dm+fZY3viF3tClVFLRHhATGoqZZlrcyn6vE9o9mBveDGc/1
+gbRH35R1wzqAoHpViTcsETy5iOwahAnuwLgjBHKmMd+k88Z/s80LZHI5oipKp61S
+pFnEjJcsmZL3F4MkNiv0gbamfJCCOTqxJkidjtqdAoGBAKSSTSXbkLo4sZeizzzJ
+mdSN7MKrO+LZ0Btzyl86OIaSPQZ6rn2vqJi8hwUWSGvTFho7lMRLHrIBL4BehEa7
+xinPPrydLR3z4L7VCRvogFddLI6fqW5NnBepjoT4FQI12AJXeIvDrRYVMfrwW5QH
+JCzdoyHTJ2Hk2vIjCctVAf/d
+-----END PRIVATE KEY-----
diff --git a/e2e-tests/oauth-flow/didx509/certs/nodeA.pem b/e2e-tests/oauth-flow/didx509/certs/nodeA.pem
new file mode 100644
index 000000000..4aa6fb043
--- /dev/null
+++ b/e2e-tests/oauth-flow/didx509/certs/nodeA.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDmTCCAoGgAwIBAgIUFTPO+pUk32QWsYyLYdlLTmlRWVYwDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAwwQRmFrZSBVWkkgUm9vdCBDQTAeFw0yNDEyMTgwOTE0NDZa
+Fw0zNDEyMTYwOTE0NDZaMEsxDjAMBgNVBAMMBW5vZGVBMRgwFgYDVQQKDA9CZWNh
+dXNlIFdlIENhcmUxEzARBgNVBAcMCkhlYWx0aGxhbmQxCjAIBgNVBAUTATAwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0LOkIXmq9QGpQsy+C+evhqMpL
+ZKDpRYIxoKR4Vqp68s2eX+xqBiSaxDkSe3xKKfm0CWsoeQVLXl+9VppH4q5uzyyl
+n/qQQEoErghULP99Ez/aDL0JX1XrEvjIePQ+E2rUfYp+HxQdKXc0kJsCv2fntK+T
+s6stN8ZeojCc4Edx1nxOHZGZXu0n5DMMXyTB4R7DCEOCyqppSv6m6CexxL4Aw4wr
+fHbO1dPmKV/jMxC3Y32SQ8ohJ80y3TnejYuzsAG155CZDm97+Za2G5BcNmwq7Qy7
+aVWhCpEW3fSOX1ZQBOwYFttd7wdcJla5QT6htJnKsWLFBBX4sGYFx1VQPRABAgMB
+AAGjgaQwgaEwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMEAGA1UdEQQ5
+MDegNQYDVQUFoC4MLDIuMTYuNTI4LjEuMTAwNy45OS4yMTEwLTEtMC1TLTAwMDAx
+LTAwLjAwMC0wMB0GA1UdDgQWBBSnq8XA3if+WQhRDgbOceZPm1NQDDAfBgNVHSME
+GDAWgBSbsc9F8Dez3XjIciX3H5u6ctQSvTANBgkqhkiG9w0BAQsFAAOCAQEARp5Y
+U1X34jvzdRzSWShluLN/sUSqgxJUmfhYi66lIZlQ4euaQNRFMzEwlQdzgcEBlJnr
+IZGgB+MhiCrqAb3PbHBq4V4vDqYmSmtWtxyGDQm5POiN2Uzos1CSBusIyeRkXc1e
+rKgXKcY16hzEagYRuJZN8cmeIKCLF0rh34xtEgdFzEw5xV4cWol9W0X9vNJJSVCH
+EBA9jY4ULMxxLQY+cZE4GuCfxQ7OsCQQqusP57zeIRDRLs0c8I8J3vSGp6sA2fG0
+mNVrEgIpktVro29NCVEp3oc+7UBsxH2BS45okCLp1KwVW0TMrDH9UPM7ktdCzSmP
+Xr+fIaVcs9sbT5qwGw==
+-----END CERTIFICATE-----
diff --git a/e2e-tests/oauth-flow/didx509/discovery.json b/e2e-tests/oauth-flow/didx509/discovery.json
new file mode 100644
index 000000000..f7d20e147
--- /dev/null
+++ b/e2e-tests/oauth-flow/didx509/discovery.json
@@ -0,0 +1,76 @@
+{
+  "id": "e2e-test",
+  "endpoint": "http://nodeA-backend:8080/discovery/e2e-test",
+  "presentation_max_validity": 36000,
+  "presentation_definition": {
+    "id": "pd_e2e_test",
+    "format": {
+      "jwt_vc": {
+        "alg": [
+          "PS256"
+        ]
+      },
+      "jwt_vp": {
+        "alg": [
+          "PS256"
+        ]
+      }
+    },
+    "input_descriptors": [
+      {
+        "id": "id_x509credential",
+        "constraints": {
+          "fields": [
+            {
+              "path": [
+                "$.type"
+              ],
+              "filter": {
+                "type": "string",
+                "const": "X509Credential"
+              }
+            },
+            {
+              "path": [
+                "$.issuer"
+              ],
+              "purpose": "Whe can only accept credentials from a trusted issuer",
+              "filter": {
+                "type": "string",
+                "pattern": "^did:x509:0:sha256:szqMaTpnD6GN0aRrT98eV4bhAoOgyItEZVyskYyL_Qc::.*$"
+              }
+            },
+            {
+              "id": "organization_name",
+              "path": [
+                "$.credentialSubject[0].O"
+              ],
+              "filter": {
+                "type": "string"
+              }
+            },
+            {
+              "id": "organization_ura",
+              "path": [
+                "$.credentialSubject[0].otherName"
+              ],
+              "filter": {
+                "type": "string",
+                "pattern": "^[0-9.]+-\\d+-\\d+-S-(\\d+)-00\\.000-\\d+$"
+              }
+            },
+            {
+              "id": "organization_city",
+              "path": [
+                "$.credentialSubject[0].L"
+              ],
+              "filter": {
+                "type": "string"
+              }
+            }
+          ]
+        }
+      }
+    ]
+  }
+}
diff --git a/e2e-tests/oauth-flow/didx509/docker-compose.yml b/e2e-tests/oauth-flow/didx509/docker-compose.yml
new file mode 100644
index 000000000..d3b2ed80d
--- /dev/null
+++ b/e2e-tests/oauth-flow/didx509/docker-compose.yml
@@ -0,0 +1,32 @@
+services:
+  nodeA-backend:
+    image: "${IMAGE_NODE_A:-nutsfoundation/nuts-node:master}"
+    ports:
+      - "18081:8081"
+    environment:
+      NUTS_URL: "https://nodeA"
+      NUTS_VERBOSITY: debug
+      NUTS_STRICTMODE: false
+      NUTS_HTTP_INTERNAL_ADDRESS: ":8081"
+      NUTS_AUTH_CONTRACTVALIDATORS: dummy
+      NUTS_POLICY_DIRECTORY: /opt/nuts/policies
+      NUTS_DISCOVERY_DEFINITIONS_DIRECTORY: /nuts/discovery
+      NUTS_DISCOVERY_SERVER_IDS: e2e-test
+      NUTS_VDR_DIDMETHODS: web
+    volumes:
+      # did:web resolver uses the OS CA bundle, but e2e tests use a self-signed CA which can be found in truststore.pem
+      # So we need to mount that file to the OS CA bundle location, otherwise did:web resolving will fail due to untrusted certs.
+      - "../../tls-certs/truststore.pem:/etc/ssl/certs/Nuts_RootCA.pem:ro"
+      - "./accesspolicy.json:/opt/nuts/policies/accesspolicy.json:ro"
+      - "./discovery.json:/nuts/discovery/e2e-test.json:ro"
+    healthcheck:
+      interval: 1s # Make test run quicker by checking health status more often
+  nodeA:
+    image: nginx:1.25.1
+    ports:
+      - "10443:443"
+    volumes:
+      - "../../shared_config/nodeA-http-nginx.conf:/etc/nginx/conf.d/nuts-http.conf:ro"
+      - "../../tls-certs/nodeA-certificate.pem:/etc/nginx/ssl/server.pem:ro"
+      - "../../tls-certs/nodeA-certificate.pem:/etc/nginx/ssl/key.pem:ro"
+      - "../../tls-certs/truststore.pem:/etc/nginx/ssl/truststore.pem:ro"
diff --git a/e2e-tests/oauth-flow/didx509/run-test.sh b/e2e-tests/oauth-flow/didx509/run-test.sh
new file mode 100755
index 000000000..df0d6a0b6
--- /dev/null
+++ b/e2e-tests/oauth-flow/didx509/run-test.sh
@@ -0,0 +1,120 @@
+#!/usr/bin/env bash
+source ../../util.sh
+
+echo "------------------------------------"
+echo "Cleaning up running Docker containers and volumes, and key material..."
+echo "------------------------------------"
+docker compose down --remove-orphans
+docker compose rm -f -v
+
+echo "------------------------------------"
+echo "Starting Docker containers..."
+echo "------------------------------------"
+docker compose up -d
+docker compose up --wait nodeA nodeA-backend
+
+echo "------------------------------------"
+echo "Registering vendors..."
+echo "------------------------------------"
+# Register Vendor A
+REQUEST="{\"subject\":\"vendorA\"}"
+VENDOR_A_DIDDOC=$(echo $REQUEST | curl -X POST --data-binary @- http://localhost:18081/internal/vdr/v2/subject --header "Content-Type: application/json")
+VENDOR_A_DID=$(echo $VENDOR_A_DIDDOC | jq -r .documents[0].id)
+echo Vendor A DID: $VENDOR_A_DID
+
+echo "------------------------------------"
+echo "Issuing X509Credential..."
+echo "------------------------------------"
+CREDENTIAL=$(docker run \
+  -v "$(pwd)/certs/nodeA-chain.pem:/cert-chain.pem:ro" \
+  -v "$(pwd)/certs/nodeA.key:/cert-key.key:ro" \
+  reinkrul/uzi-did-x509-issuer:latest \
+  vc "/cert-chain.pem" "/cert-key.key" "${VENDOR_A_DID}")
+echo $CREDENTIAL
+
+RESPONSE=$(echo "\"${CREDENTIAL}\"" | curl -s -o /dev/null -w "%{http_code}" -X POST --data-binary @- http://localhost:18081/internal/vcr/v2/holder/vendorA/vc -H "Content-Type:application/json")
+if [ $RESPONSE -eq 204 ]; then
+  echo "VC stored in wallet"
+else
+  echo "FAILED: Could not load X509Credential in wallet" 1>&2
+  echo $RESPONSE
+  exitWithDockerLogs 1
+fi
+
+# Register on Discovery Service
+echo "Registering on Discovery Service..."
+REQUEST="{\"registrationParameters\":{\"key\":\"value\"}}"
+RESPONSE=$(echo $REQUEST | curl -s -o /dev/null -w "%{http_code}" -X POST --data-binary @- http://localhost:18081/internal/discovery/v1/e2e-test/vendorA)
+if [ $RESPONSE -eq 200 ]; then
+  echo "Registered on Discovery Service"
+else
+  echo "FAILED: Could not register on Discovery Service" 1>&2
+  echo $RESPONSE
+  exitWithDockerLogs 1
+fi
+
+echo "Searching for registration on Discovery Service..."
+RESPONSE=$(curl -s --insecure http://localhost:18081/internal/discovery/v1/e2e-test?credentialSubject.O=Because*)
+NUM_ITEMS=$(echo $RESPONSE | jq length)
+if [ $NUM_ITEMS -eq 1 ]; then
+  echo "Registration found"
+else
+  echo "FAILED: Could not find registration" 1>&2
+  exitWithDockerLogs 1
+fi
+
+echo "---------------------------------------"
+echo "Perform OAuth 2.0 rfc021 flow..."
+echo "---------------------------------------"
+REQUEST=$(
+cat << EOF
+{
+  "authorization_server": "https://nodeA/oauth2/vendorA",
+  "token_type": "bearer",
+  "scope": "test"
+}
+EOF
+)
+# Request access token
+RESPONSE=$(echo $REQUEST | curl -X POST -s --data-binary @- http://localhost:18081/internal/auth/v2/vendorA/request-service-access-token -H "Content-Type: application/json")
+if echo $RESPONSE | grep -q "access_token"; then
+  ACCESS_TOKEN=$(echo $RESPONSE | jq -r .access_token)
+else
+  echo "FAILED: Could not get access token from node-A" 1>&2
+  echo $RESPONSE
+  exitWithDockerLogs 1
+fi
+echo Access token: $ACCESS_TOKEN
+
+echo "------------------------------------"
+echo "Introspect access token..."
+echo "------------------------------------"
+RESPONSE=$(curl -X POST -s --data "token=$ACCESS_TOKEN" http://localhost:18081/internal/auth/v2/accesstoken/introspect)
+echo Introspection response: $RESPONSE
+
+# Check that it contains the following claims:
+# - "organization_ura":"00001"
+# - "organization_name":"Because We Care"
+# - "organization_city":"Healthland"
+if [ "$(echo $RESPONSE | jq -r .organization_ura)" != "00001" ]; then
+  echo "FAILED: organization_ura claim not found" 1>&2
+  echo $RESPONSE
+  exitWithDockerLogs 1
+fi
+
+if [ "$(echo $RESPONSE | jq -r .organization_name)" != "Because We Care" ]; then
+  echo "FAILED: organization_name claim not found" 1>&2
+  echo $RESPONSE
+  exitWithDockerLogs 1
+fi
+
+if [ "$(echo $RESPONSE | jq -r .organization_city)" != "Healthland" ]; then
+  echo "FAILED: organization_city claim not found" 1>&2
+  echo $RESPONSE
+  exitWithDockerLogs 1
+fi
+
+echo "------------------------------------"
+echo "Stopping Docker containers..."
+echo "------------------------------------"
+docker compose down
\ No newline at end of file
diff --git a/e2e-tests/oauth-flow/run-tests.sh b/e2e-tests/oauth-flow/run-tests.sh
index 5031ab198..93f68d01a 100755
--- a/e2e-tests/oauth-flow/run-tests.sh
+++ b/e2e-tests/oauth-flow/run-tests.sh
@@ -16,6 +16,13 @@ pushd rfc021
 ./run-test.sh
 popd
 
+echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+echo "!! Running test: OAuth flow (rfc021) using X509Credential !!"
+echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+pushd didx509
+./run-test.sh
+popd
+
 echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 echo "!! Running test: OpenID4VP flow !!"
 echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"