diff --git a/Client/src/test/resources/testng.xml b/Client/src/test/resources/testng.xml
index 3e4c0b65d5..d4102ae357 100644
--- a/Client/src/test/resources/testng.xml
+++ b/Client/src/test/resources/testng.xml
@@ -1,4 +1,854 @@
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
 
 <suite name="oxAuthClient" parallel="false">
+
+    <test name="JsonApplier Client test" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.json.JsonApplierTest"/>
+        </classes>
+    </test>
+    <test name="RegisterRequest Client test" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.client.RegisterRequestTest"/>
+        </classes>
+    </test>
+
+    <!-- Address claims test -->
+    <test name="Address claims test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.AddressClaimsTest"/>
+        </classes>
+    </test>
+
+    <!-- Application Type Restriction test -->
+    <test name="Application Type Restriction (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.ApplicationTypeRestrictionHttpTest"/>
+        </classes>
+    </test>
+
+    <!-- Token binding -->
+
+    <test name="Token Binding test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.TokenBindingHttpTest"/>
+        </classes>
+    </test>
+
+    <!-- Access Token as JWT -->
+    <test name="Access Token as JWT test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.AccessTokenAsJwtHttpTest"/>
+        </classes>
+    </test>
+
+    <!-- Spontaneous scopes tests -->
+    <test name="Spontaneous Scope test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.SpontaneousScopeHttpTest"/>
+        </classes>
+    </test>
+    <test name="UMA Spontaneous Scope test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.uma.UmaSpontaneousScopeHttpTest"/>
+        </classes>
+    </test>
+
+    <test name="Select Account test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.SelectAccountHttpTest"/>
+        </classes>
+    </test>
+
+    <!-- Authorization Code Flow test -->
+    <test name="Authorization Code Flow test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.AuthorizationCodeFlowHttpTest"/>
+        </classes>
+    </test>
+
+    <!-- Authorization Response Custom Header test -->
+    <test name="Authorization Response Custom Header test" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.AuthorizationResponseCustomHeaderTest"/>
+        </classes>
+    </test>
+
+    <!-- Authorization Response Mode -->
+    <test name="Authorization Response Mode (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.AuthorizationResponseModeHttpTest"/>
+        </classes>
+    </test>
+
+    <!-- Authorize test -->
+    <test name="Authorize test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.AuthorizeRestWebServiceHttpTest"/>
+        </classes>
+    </test>
+
+    <!-- Authorize test -->
+    <test name="Authorize session id test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.AuthorizeSessionIdRestWebServiceHttpTest"/>
+        </classes>
+    </test>
+
+    <!-- Client Authentication Filter test -->
+    <test name="Client Authentication Filter test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.ClientAuthenticationFilterHttpTest"/>
+        </classes>
+    </test>
+
+    <!-- Client Credentials Grant test -->
+    <test name="Client Credentials Grant test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.ClientCredentialsGrantHttpTest"/>
+        </classes>
+    </test>
+
+    <!-- Client Info test  -->
+    <test name="Client Info test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.ClientInfoRestWebServiceHttpTest"/>
+        </classes>
+    </test>
+
+    <!-- Client Secret Basic test -->
+    <test name="Client Secret Basic test" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.ClientSecretBasicTest"/>
+        </classes>
+    </test>
+
+    <!-- Client Specific Access Token Expiration -->
+    <test name="Client Specific Access Token Expiration" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.ClientSpecificAccessTokenExpiration"/>
+        </classes>
+    </test>
+
+    <!-- Client White List Black List Redirect Uris -->
+    <test name="Client White List Black List Redirect Uris" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.ClientWhiteListBlackListRedirectUris"/>
+        </classes>
+    </test>
+
+    <!-- Configuration test -->
+    <test name="Configuration test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.ConfigurationRestWebServiceHttpTest"/>
+        </classes>
+    </test>
+
+    <test name="Enable Client to restrict JavaScript Origins" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.EnableClientToRestrictJavascriptOrigin"/>
+        </classes>
+    </test>
+
+    <test name="Encode claims in state parameter" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.EncodeClaimsInStateParameter"/>
+        </classes>
+    </test>
+
+    <!-- End Session test -->
+    <test name="End Session test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.EndSessionRestWebServiceHttpTest"/>
+        </classes>
+    </test>
+
+    <test name="Grant Types Restriction (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.GrantTypesRestrictionHttpTest"/>
+        </classes>
+    </test>
+
+    <test name="Individual Claims Requests test" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.IndividualClaimsRequestsTest"/>
+        </classes>
+    </test>
+
+    <!-- JWK test -->
+    <test name="JWK test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.JwkRestWebServiceHttpTest"/>
+        </classes>
+    </test>
+
+    <test name="Multivalued claims" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.MultivaluedClaims"/>
+        </classes>
+    </test>
+
+    <!-- OpenID Request Object test -->
+    <test name="OpenID Request Object test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.OpenIDRequestObjectHttpTest"/>
+        </classes>
+    </test>
+
+    <!-- PersistClientAuthorizationsHttpTest -->
+    <test name="Persist Client Authorizations test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.PersistClientAuthorizationsHttpTest"/>
+        </classes>
+    </test>
+
+    <!-- Register test -->
+    <test name="Register test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.RegistrationRestWebServiceHttpTest"/>
+        </classes>
+    </test>
+
+    <!-- Registration test with Software Statement -->
+    <test name="Registration test with Software Statement" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.RegistrationWithSoftwareStatement"/>
+        </classes>
+    </test>
+
+    <!-- Sector Identifier URL Verification test -->
+    <test name="Sector Identifier URL Verification (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.SectorIdentifierUrlVerificationHttpTest"/>
+        </classes>
+    </test>
+
+    <!-- SSO with Multiple Backend Services test -->
+    <test name="SSO with Multiple Backend Services test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.SSOWithMultipleBackendServicesHttpTest"/>
+        </classes>
+    </test>
+
+    <!-- OpenID Connect Discovery test -->
+    <test name="OpenID Connect Discovery test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.OpenIDConnectDiscoveryHttpTest"/>
+        </classes>
+    </test>
+
+    <!-- Token Endpoint Auth Method Restriction test -->
+    <test name="Token Endpoint Auth Method Restriction (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.TokenEndpointAuthMethodRestrictionHttpTest"/>
+        </classes>
+    </test>
+
+    <!-- Token test -->
+    <test name="Token test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.TokenRestWebServiceHttpTest"/>
+        </classes>
+    </test>
+
+    <!-- Token revocation -->
+    <test name="Token revocation test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.TokenRevocationTest"/>
+        </classes>
+    </test>
+
+    <!-- Token Signatures test -->
+    <test name="Token Signatures test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.TokenSignaturesHttpTest"/>
+        </classes>
+    </test>
+
+    <!-- Token Encryption test -->
+    <test name="Token Encryption test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.TokenEncryptionHttpTest"/>
+        </classes>
+    </test>
+
+    <!-- User Authentication Filter test -->
+    <test name="User Authentication Filter test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.UserAuthenticationFilterHttpTest"/>
+        </classes>
+    </test>
+
+    <!-- User Info test -->
+    <test name="User Info test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.UserInfoRestWebServiceHttpTest"/>
+        </classes>
+    </test>
+
+    <test name="Validate Id Token Hashes test" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.ValidateIdTokenHashesTest"/>
+        </classes>
+    </test>
+
+    <test name="Web Keys Test" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.WebKeysTest"/>
+        </classes>
+    </test>
+
+    <!-- Dev tests-->
+    <test name="Custom token issuing test via session" enabled="false">
+        <classes>
+            <class name="org.gluu.oxauth.dev.TestSessionWorkflow"/>
+        </classes>
+    </test>
+
+    <!-- UMA tests -->
+    <test name="UMA : Getting UMA meta data configuration (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.uma.MetaDataFlowHttpTest"/>
+        </classes>
+    </test>
+
+    <test name="UMA : Obtain PAT token test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.uma.ObtainPatTokenFlowHttpTest"/>
+        </classes>
+    </test>
+
+    <test name="UMA : Register resource test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.uma.RegisterResourceFlowHttpTest"/>
+        </classes>
+    </test>
+
+    <test name="Response Types Restriction (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.ResponseTypesRestrictionHttpTest"/>
+        </classes>
+    </test>
+
+    <test name="UMA : Register UMA permissions test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.uma.UmaRegisterPermissionFlowHttpTest"/>
+        </classes>
+    </test>
+
+    <test name="UMA : Test for getting access to UMA protected resource (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.uma.AccessProtectedResourceFlowHttpTest"/>
+        </classes>
+    </test>
+
+    <test name="UMA : Test for getting UMA scopes (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.uma.ScopeHttpTest"/>
+        </classes>
+    </test>
+
+    <test name="Client authentication by Access Token" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.uma.ClientAuthenticationByAccessTokenHttpTest"/>
+        </classes>
+    </test>
+
+    <test name="Introspection test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.IntrospectionWsHttpTest"/>
+        </classes>
+    </test>
+
+    <test name="PKCE test (HTTP)" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.PkceHttpTest"/>
+        </classes>
+    </test>
+
+    <!-- OIC Interop Tests -->
+    <test name="OC5. FeatureTest-Accept Request Without redirect uri when One Registered" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.AcceptRequestWithoutRedirectUriWhenOneRegistered"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Accept Valid Asymmetric ID Token Signature" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.AcceptValidAsymmetricIdTokenSignature"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Accept Valid Symmetric ID Token Signature" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.AcceptValidSymmetricIdTokenSignature"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Can Discover Identifiers using E-Mail Syntax" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.CanDiscoverIdentifiersUsingEMailSyntax"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Can Discover Identifiers using URL Syntax" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.CanDiscoverIdentifiersUsingUrlSyntax"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Can Make Access Token Request with client secret basic Authentication" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.CanMakeAccessTokenRequestWithClientSecretBasicAuthentication"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Can Make Access Token Request with client secret jwt Authentication" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.CanMakeAccessTokenRequestWithClientSecretJwtAuthentication"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Can Make Access Token Request with client secret post Authentication" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.CanMakeAccessTokenRequestWithClientSecretPostAuthentication"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Can Make Access Token Request with private key jwt Authentication" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.CanMakeAccessTokenRequestWithPrivateKeyJwtAuthentication"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Can Provide Encrypted ID Token Response" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.CanProvideEncryptedIdTokenResponse"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Can Provide Encrypted UserInfo Response" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.CanProvideEncryptedUserInfoResponse"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Can Provide Signed UserInfo Response" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.CanProvideSignedUserInfoResponse"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Can Request and Use Claims in id token" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.CanRequestAndUseClaimsInIdToken"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Can Request and Use Encrypted ID Token Response" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.CanRequestAndUseEncryptedIdTokenResponse"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Can Request and Use Signed UserInfo Response" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.CanRequestAndUseSignedUserInfoResponse"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Displays Logo in Login Page" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.DisplaysLogoInLoginPage"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Displays Policy in Login Page" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.DisplaysPolicyUriInLoginPage"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Support WebFinger Discovery" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportWebFingerDiscovery"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Enables Dynamic Registration" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.EnablesDynamicRegistration"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Ignores Extra Query Component in Request" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.IgnoresExtraQueryComponentInRequest"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Includes at hash in ID Token when Implicit Flow Used" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.IncludesAtHashInIdTokenWhenImplicitFlowUsed"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Includes c hash in ID Token when Code Flow Used" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.IncludesCHashInIdTokenWhenCodeFlowUsed"/>
+        </classes>
+    </test>
+    <test name="OPRegistrationJwks" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.OPRegistrationJwks"/>
+        </classes>
+    </test>
+    <test name="ProvidingAcrValues" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.ProvidingAcrValues"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Providing ID Token with Essential auth time Claim" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.ProvidingIdTokenWithEssentialAuthTimeClaim"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Providing ID Token with max age Restriction" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.ProvidingIdTokenWithMaxAgeRestriction"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Providing Individually Requested Essential and Voluntary Claims" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.ProvidingIndividuallyRequestedEssentialAndVoluntaryClaims"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Providing Individually Requested Essential Claims" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.ProvidingIndividuallyRequestedEssentialClaims"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Providing Individually Requested Voluntary Claims" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.ProvidingIndividuallyRequestedVoluntaryClaims"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Publish openid-configuration Discovery Information" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.PublishOpenIdConfigurationDiscoveryInformation"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Reject Invalid Asymmetric ID Token Signature" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.RejectInvalidAsymmetricIdTokenSignature"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Reject Invalid Symmetric ID Token Signature" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.RejectInvalidSymmetricIdTokenSignature"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Reject redirect uri Not Matching a Registered redirect uri" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.RejectRedirectUriNotMatchingARegisteredRedirectUri"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Reject Registration of redirect uri with Fragment" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.RejectRegistrationOfRedirectUriWithFragment"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Reject Requests Without nonce Using Implicit Flow" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.RejectRequestsWithoutNonceUsingImplicitFlow"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Reject Request Without redirect uri when Multiple Registered" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.RejectRequestWithoutRedirectUriWhenMultipleRegistered"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Reject Request Without response type" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.RejectRequestWithoutResponseType"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Rejects Incorrect at hash when Implicit Flow Used" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.RejectsIncorrectAtHashWhenImplicitFlowUsed"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Rejects Incorrect c hash when Code Flow Used" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.RejectsIncorrectCHashWhenCodeFlowUsed"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Rejects redirect uri when Query Parameter Does Not Match" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.RejectsRedirectUriWhenQueryParameterDoesNotMatch"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Rejects Second Use of Access Code" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.RejectsSecondUseOfAccessCode"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Rejects Sector Identifier Not Containing Registered redirect uri Values"
+          enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.RejectsSectorIdentifierNotContainingRegisteredRedirectUriValues"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Requesting UserInfo Claims with OpenID Request Object" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.RequestingUserInfoClaimsWithOpenIdRequestObject"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Requesting UserInfo Claims with scope Values" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.RequestingUserInfoClaimsWithScopeValues"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Second Use of Access Code Revokes Previously Issued Access Token" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SecondUseOfAccessCodeRevokesPreviouslyIssuedAccessToken"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Support Authentication to Token Endpoint using Form-Encoded Client Credentials in POST Body"
+          enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportAuthenticationToTokenEndpointUsingFormEncodedClientCredentialsInPostBody"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Support Authentication to Token Endpoint using HTTP Basic with POST" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportAuthenticationToTokenEndpointUsingHttpBasicWithPost"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Support Authentication to Token Endpoint with Asymmetrically Signed JWTs"
+          enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportAuthenticationToTokenEndpointWithAsymmetricallySignedJWTs"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Support Authentication to Token Endpoint with Symmetrically Signed JWTs"
+          enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportAuthenticationToTokenEndpointWithSymmetricallySignedJWTs"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Support code Response Type" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportCodeResponseType"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Support Combination of code id token token Response Types" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportCombinationOfCodeIdTokenTokenResponseTypes"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Support Combination of code token Response Types" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportCombinationOfCodeTokenResponseTypes"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Support Combination of id token code Response Types" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportCombinationOfIdTokenCodeResponseTypes"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Support Combination of id token token Response Types" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportCombinationOfIdTokenTokenResponseTypes"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Support display value page" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportDisplayValuePage"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Support display value popup" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportDisplayValuePopup"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Support id token Response Type" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportIdTokenResponseType"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Support prompt value login" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportPromptValueLogin"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Support prompt value none" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportPromptValueNone"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Support Registration Read" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportRegistrationRead"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Support Request File" enabled="false">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportRequestFile"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Support claims Request Specifying sub Value" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportClaimsRequestSpecifyingSubValue"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Support Requests Containing nonce" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportRequestsContainingNonce"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Support Requests Without nonce" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportRequestsWithoutNonce"/>
+        </classes>
+    </test>
+    <test name="OP-3rd_party-init-login" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.Supports3rdPartyInitLogin"/>
+        </classes>
+    </test>
+    <test name="OP-3rd_party-init-login-nohttps" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.Supports3rdPartyInitLoginNoHttps"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Supports Combining Claims Requested with scope and Request Object" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportsCombiningClaimsRequestedWithScopeAndRequestObject"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Support scope Requesting address Claims" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportScopeRequestingAddressClaims"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Support scope Requesting All Basic Claims" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportScopeRequestingAllBasicClaims"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Support scope Requesting email Claims" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportScopeRequestingEmailClaims"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Support scope Requesting No Specific Claims" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportScopeRequestingNoSpecificClaims"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Support scope Requesting phone Claims" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportScopeRequestingPhoneClaims"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Support scope Requesting profile Claims" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportScopeRequestingProfileClaims"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Supports Returning Claims in ID Token" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportsReturningClaimsInIdToken"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Supports Returning Different Claims in ID Token and UserInfo Endpoint" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportsReturningDifferentClaimsInIdTokenAndUserInfoEndpoint"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Support token Response Type" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.SupportTokenResponseType"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-UserInfo Endpoint" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.UserInfoEndpoint"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-UserInfo Endpoint Access with Form-Encoded Body Method" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.UserInfoEndpointAccessWithFormEncodedBodyMethod"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-UserInfo Endpoint Access with Header Method" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.UserInfoEndpointAccessWithHeaderMethod"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Uses Asymmetric ID Token Signatures" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.UsesAsymmetricIdTokenSignatures"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Uses Discovery" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.UsesDiscovery"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Uses Dynamic Registration" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.UsesDynamicRegistration"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Uses Symmetric ID Token Signatures" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.UsesSymmetricIdTokenSignatures"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Verifies Correct at hash when Implicit Flow Used" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.VerifiesCorrectAtHashWhenImplicitFlowUsed"/>
+        </classes>
+    </test>
+    <test name="OC5. FeatureTest-Verifies Correct c hash when Code Flow Used" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.interop.VerifiesCorrectCHashWhenCodeFlowUsed"/>
+        </classes>
+    </test>
+
+    <!-- CIBA -->
+    <test name="CIBA Configuration Test" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ciba.ConfigurationTest"/>
+        </classes>
+    </test>
+    <test name="CIBA Dynamic Client Registration Test" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ciba.RegistrationTest"/>
+        </classes>
+    </test>
+    <test name="CIBA Ping Mode" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ciba.BackchannelAuthenticationPingMode"></class>
+        </classes>
+    </test>
+    <test name="CIBA Poll Mode" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ciba.BackchannelAuthenticationPollMode"></class>
+        </classes>
+    </test>
+    <test name="CIBA Push Mode" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ciba.BackchannelAuthenticationPushMode"></class>
+        </classes>
+    </test>
+    <test name="CIBA Expired Requests" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ciba.BackchannelAuthenticationExpiredRequestsTests"></class>
+        </classes>
+    </test>
+    <test name="CIBA Ping Mode JWT Requests" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ciba.CibaPingModeJwtAuthRequestTests"></class>
+        </classes>
+    </test>
+    <test name="CIBA Poll Mode JWT Requests" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ciba.CibaPollModeJwtAuthRequestTests"></class>
+        </classes>
+    </test>
+
+    <!-- Device authorization tests -->
+    <test name="Tests for Device Authz WS" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.deviceauthz.DeviceAuthzRequestRegistrationTest"></class>
+        </classes>
+    </test>
+    <test name="Tests for Device Authz flow" enabled="true">
+        <classes>
+            <class name="org.gluu.oxauth.ws.rs.deviceauthz.DeviceAuthzFlowHttpTest"></class>
+        </classes>
+    </test>
+
 </suite>