diff --git a/tests/fuzz/grant-authcode.yml b/tests/fuzz/grant-authcode.yml
deleted file mode 100644
index e4df2d68..00000000
--- a/tests/fuzz/grant-authcode.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-url: 'http://localhost:8000/authcode_grant.php/authorize?client_id=testclient&redirect_uri=http%3A%2F%2Fexample.com%2Fredirect&response_type=code&scope=basic'
-request:
-    method: GET
-response:
-    statusCode: 200
-    headers:
-        -
-            key: Location
-            valueRegex: /http:\/\/example.com\/redirect\?code=([a-zA-Z0-9]*)/
diff --git a/tests/fuzz/grant-client-credentials.yml b/tests/fuzz/grant-client-credentials.yml
deleted file mode 100644
index 47b9f566..00000000
--- a/tests/fuzz/grant-client-credentials.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-url: 'http://localhost:8000/other_grants.php/access_token'
-request:
-    method: POST
-    body:
-        -
-            key: client_id
-            value: testclient
-            missing:
-                response.statusCode: 400
-                headers.content-type: "application/json"
-                body.error: invalid_request
-                body.message: "The request is missing a required parameter, includes an invalid parameter value, includes a parameter more than once, or is otherwise malformed. Check the \"client_id\" parameter."
-            invalid:
-                response.statusCode: 401
-                headers.content-type: "application/json"
-                body.error: invalid_client
-                body.message: "Client authentication failed."
-        -
-            key: client_secret
-            value: secret
-            missing:
-                response.statusCode: 400
-                headers.content-type: "application/json"
-                body.error: invalid_request
-                body.message: "The request is missing a required parameter, includes an invalid parameter value, includes a parameter more than once, or is otherwise malformed. Check the \"client_secret\" parameter."
-            invalid:
-                response.statusCode: 401
-                headers.content-type: "application/json"
-                body.error: invalid_client
-                body.message: "Client authentication failed."
-        -
-            key: grant_type
-            value: client_credentials
-            missing:
-                response.statusCode: 400
-                headers.content-type: "application/json"
-                body.error: invalid_request
-                body.message: "The request is missing a required parameter, includes an invalid parameter value, includes a parameter more than once, or is otherwise malformed. Check the \"grant_type\" parameter."
-            invalid:
-                response.statusCode: 400
-                headers.content-type: "application/json"
-                body.error: unsupported_grant_type
-                #body.message: "The authorization grant type XXX is not supported by the authorization server."
-        -
-            key: scope
-            value: "basic"
-            invalid:
-                response.statusCode: 400
-                headers.content-type: "application/json"
-                body.error: invalid_scope
-                border.message: fooooooooo
-response:
-    statusCode: 200
-    headers:
-        -
-            key: Content-type
-            value: application/json
-    body:
-        -
-            key: expires_in
-            valueType: integer
-        -
-            key: access_token
-            valueRegex: /([a-zA-Z0-9]*)/
-        -
-            key: token_type
-            value: Bearer
diff --git a/tests/fuzz/grant-password.yml b/tests/fuzz/grant-password.yml
deleted file mode 100644
index e0f95827..00000000
--- a/tests/fuzz/grant-password.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-url: 'http://localhost:8000/other_grants.php/access_token'
-request:
-    method: POST
-    body:
-        -
-            key: client_id
-            value: testclient
-            missing:
-                response.statusCode: 400
-                headers.content-type: "application/json"
-                body.error: invalid_request
-                body.message: "The request is missing a required parameter, includes an invalid parameter value, includes a parameter more than once, or is otherwise malformed. Check the \"client_id\" parameter."
-            invalid:
-                response.statusCode: 401
-                headers.content-type: "application/json"
-                body.error: invalid_client
-                body.message: "Client authentication failed."
-        -
-            key: client_secret
-            value: secret
-            missing:
-                response.statusCode: 400
-                headers.content-type: "application/json"
-                body.error: invalid_request
-                body.message: "The request is missing a required parameter, includes an invalid parameter value, includes a parameter more than once, or is otherwise malformed. Check the \"client_secret\" parameter."
-            invalid:
-                response.statusCode: 401
-                headers.content-type: "application/json"
-                body.error: invalid_client
-                body.message: "Client authentication failed."
-        -
-            key: username
-            value: alexbilbie
-            missing:
-                response.statusCode: 400
-                headers.content-type: "application/json"
-                body.error: invalid_request
-                body.message: "The request is missing a required parameter, includes an invalid parameter value, includes a parameter more than once, or is otherwise malformed. Check the \"username\" parameter."
-            invalid:
-                response.statusCode: 401
-                headers.content-type: "application/json"
-                body.error: invalid_credentials
-                body.message: "The user credentials were incorrect."
-        -
-            key: password
-            value: whisky
-            missing:
-                response.statusCode: 400
-                headers.content-type: "application/json"
-                body.error: invalid_request
-                body.message: "The request is missing a required parameter, includes an invalid parameter value, includes a parameter more than once, or is otherwise malformed. Check the \"password\" parameter."
-            invalid:
-                response.statusCode: 401
-                headers.content-type: "application/json"
-                body.error: invalid_credentials
-                body.message: "The user credentials were incorrect."
-        -
-            key: grant_type
-            value: password
-            missing:
-                response.statusCode: 400
-                headers.content-type: "application/json"
-                body.error: invalid_request
-                body.message: "The request is missing a required parameter, includes an invalid parameter value, includes a parameter more than once, or is otherwise malformed. Check the \"grant_type\" parameter."
-            invalid:
-                response.statusCode: 400
-                headers.content-type: "application/json"
-                body.error: unsupported_grant_type
-                #body.message: "The authorization grant type XXX is not supported by the authorization server."
-response:
-    statusCode: 200
-    headers:
-        -
-            key: Content-type
-            value: application/json
-    body:
-        -
-            key: expires_in
-            valueType: integer
-        -
-            key: access_token
-            valueRegex: /([a-zA-Z0-9]*)/
-        -
-            key: refresh_token
-            valueRegex: /([a-zA-Z0-9]*)/
-        -
-            key: token_type
-            value: Bearer
diff --git a/tests/fuzz/tokeninfo-no-access-token.yml b/tests/fuzz/tokeninfo-no-access-token.yml
deleted file mode 100644
index 253d29e9..00000000
--- a/tests/fuzz/tokeninfo-no-access-token.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-url: 'http://localhost:8000/api.php/tokeninfo'
-request:
-    method: GET
-response:
-    statusCode: 400
-    headers:
-        -
-            key: Content-type
-            value: application/json
-    body:
-        -
-            key: error
-            value: "invalid_request"
-        -
-            key: message
-            value: "The request is missing a required parameter, includes an invalid parameter value, includes a parameter more than once, or is otherwise malformed. Check the \"access token\" parameter."
diff --git a/tests/fuzz/tokeninfo-no-invalid-token-query-string.yml b/tests/fuzz/tokeninfo-no-invalid-token-query-string.yml
deleted file mode 100644
index 2606eb05..00000000
--- a/tests/fuzz/tokeninfo-no-invalid-token-query-string.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-url: 'http://localhost:8000/api.php/tokeninfo?access_token=foobar'
-request:
-    method: GET
-response:
-    statusCode: 401
-    headers:
-        -
-            key: Content-type
-            value: application/json
-    body:
-        -
-            key: error
-            value: "access_denied"
-        -
-            key: message
-            value: "The resource owner or authorization server denied the request."
diff --git a/tests/fuzz/tokeninfo-no-invalid-token.yml b/tests/fuzz/tokeninfo-no-invalid-token.yml
deleted file mode 100644
index eab58240..00000000
--- a/tests/fuzz/tokeninfo-no-invalid-token.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-url: 'http://localhost:8000/api.php/tokeninfo'
-request:
-    method: GET
-    headers:
-        -
-            key: Authorization
-            value: Bearer foobar
-response:
-    statusCode: 401
-    headers:
-        -
-            key: Content-type
-            value: application/json
-    body:
-        -
-            key: error
-            value: "access_denied"
-        -
-            key: message
-            value: "The resource owner or authorization server denied the request."
diff --git a/tests/fuzz/tokeninfo-valid-token-header.yml b/tests/fuzz/tokeninfo-valid-token-header.yml
deleted file mode 100644
index 67f74d69..00000000
--- a/tests/fuzz/tokeninfo-valid-token-header.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-url: 'http://localhost:8000/api.php/tokeninfo'
-request:
-    method: GET
-    headers:
-        -
-            key: Authorization
-            value: "Bearer iamgod"
-response:
-    statusCode: 200
-    headers:
-        -
-            key: Content-type
-            value: application/json
-    body:
-        -
-            key: owner_id
-            value: testclient
-        -
-            key: owner_type
-            value: client
-        -
-            key: access_token
-            value: iamgod
-        -
-            key: client_id
-            value: testclient
diff --git a/tests/fuzz/tokeninfo-valid-token.yml b/tests/fuzz/tokeninfo-valid-token.yml
deleted file mode 100644
index d76def84..00000000
--- a/tests/fuzz/tokeninfo-valid-token.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-url: 'http://localhost:8000/api.php/tokeninfo?access_token=iamgod'
-request:
-    method: GET
-response:
-    statusCode: 200
-    headers:
-        -
-            key: Content-type
-            value: application/json
-    body:
-        -
-            key: owner_id
-            value: testclient
-        -
-            key: owner_type
-            value: client
-        -
-            key: access_token
-            value: iamgod
-        -
-            key: client_id
-            value: testclient
diff --git a/tests/fuzz/users-token-iamalex.yml b/tests/fuzz/users-token-iamalex.yml
deleted file mode 100644
index 43086f3e..00000000
--- a/tests/fuzz/users-token-iamalex.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-url: 'http://localhost:8000/api.php/users'
-request:
-    method: GET
-    headers:
-        -
-            key: Authorization
-            value: Bearer iamalex
-response:
-    statusCode: 200
-    headers:
-        -
-            key: Content-type
-            value: application/json
-    body:
-        -
-            key: 0.username
-            value: alexbilbie
-        -
-            key: 0.name
-            value: Alex Bilbie
-        -
-            key: 0.photo
-            valueType: string
-        -
-            key: 1.username
-            value: philsturgeon
-        -
-            key: 1.name
-            value: Phil Sturgeon
-        -
-            key: 1.photo
-            valueType: string
diff --git a/tests/fuzz/users-token-iamphil.yml b/tests/fuzz/users-token-iamphil.yml
deleted file mode 100644
index 98d8e982..00000000
--- a/tests/fuzz/users-token-iamphil.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-url: 'http://localhost:8000/api.php/users'
-request:
-    method: GET
-    headers:
-        -
-            key: Authorization
-            value: Bearer iamphil
-response:
-    statusCode: 200
-    headers:
-        -
-            key: Content-type
-            value: application/json
-    body:
-        -
-            key: 0.username
-            value: alexbilbie
-        -
-            key: 0.name
-            value: Alex Bilbie
-        -
-            key: 0.email
-            valueType: string
-        -
-            key: 1.username
-            value: philsturgeon
-        -
-            key: 1.name
-            value: Phil Sturgeon
-        -
-            key: 1.email
-            valueType: string