[java-opensaml] branch main updated: GEN-266 - Seal as many jars as practical
Scott Cantor
cantor.2 at osu.edu
Thu Sep 17 18:05:18 UTC 2020
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=570b33064617b74bd5449d77a68c614176cc23eb
The following commit(s) were added to refs/heads/main by this push:
new 570b33064 GEN-266 - Seal as many jars as practical
570b33064 is described below
commit 570b33064617b74bd5449d77a68c614176cc23eb
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Sep 17 14:05:13 2020 -0400
GEN-266 - Seal as many jars as practical
https://issues.shibboleth.net/jira/browse/GEN-266
Rehome various reused test classes.
Seal all opensaml jars
---
.../core/{config => testing}/InitializerBaseTestCase.java | 3 ++-
.../opensaml/core/{ => testing}/OpenSAMLInitBaseTestCase.java | 2 +-
.../opensaml/core/{xml => testing}/XMLObjectBaseTestCase.java | 6 ++++--
.../core/{xml => testing}/XMLObjectProviderBaseTestCase.java | 3 ++-
.../XMLObjectProviderInitializerBaseTestCase.java | 3 +--
.../test/java/org/opensaml/core/xml/AbstractXMLObjectTest.java | 1 +
.../src/test/java/org/opensaml/core/xml/ElementProxyTest.java | 2 +-
.../src/test/java/org/opensaml/core/xml/IDAttributeTest.java | 2 +-
.../src/test/java/org/opensaml/core/xml/MarshallingTest.java | 1 +
.../test/java/org/opensaml/core/xml/NamespaceManagerTest.java | 5 +----
.../java/org/opensaml/core/xml/UnmarshallingSecurityTest.java | 1 +
.../src/test/java/org/opensaml/core/xml/UnmarshallingTest.java | 1 +
.../java/org/opensaml/core/xml/XMLObjectXSIAttribsTest.java | 1 +
.../java/org/opensaml/core/xml/config/ConfigurationTest.java | 3 ---
.../core/xml/config/TestXMLObjectProviderInitializer.java | 2 --
.../core/xml/config/XMLObjectProviderInitializerTest.java | 3 +--
.../core/xml/persist/FilesystemLoadSaveManagerTest.java | 2 +-
.../org/opensaml/core/xml/persist/MapLoadSaveManagerTest.java | 2 +-
.../java/org/opensaml/core/xml/schema/XSBase64BinaryTest.java | 3 +--
.../test/java/org/opensaml/core/xml/schema/XSBooleanTest.java | 2 +-
.../test/java/org/opensaml/core/xml/schema/XSDateTimeTest.java | 3 +--
.../test/java/org/opensaml/core/xml/schema/XSIntegerTest.java | 3 +--
.../test/java/org/opensaml/core/xml/schema/XSQNameTest.java | 3 +--
.../test/java/org/opensaml/core/xml/schema/XSStringTest.java | 3 +--
.../src/test/java/org/opensaml/core/xml/schema/XSURITest.java | 3 +--
.../test/java/org/opensaml/core/xml/util/AttributeMapTest.java | 3 +--
.../core/xml/util/IndexedXMLObjectChildrenListTest.java | 1 -
.../org/opensaml/core/xml/util/XMLObjectChildrenListTest.java | 1 -
.../java/org/opensaml/core/xml/util/XMLObjectSupportTest.java | 2 +-
.../messaging/handler/impl/SchemaValidateXMLMessageTest.java | 2 +-
opensaml-parent/pom.xml | 1 +
.../opensaml/profile/context/ProfileRequestContextTest.java | 1 -
.../profile/{action => testing}/ActionTestingSupport.java | 3 ++-
.../opensaml/profile/{ => testing}/RequestContextBuilder.java | 2 +-
.../org/opensaml/profile/action/impl/DecodeMessageTest.java | 2 +-
.../org/opensaml/profile/action/impl/EncodeMessageTest.java | 2 +-
.../action/impl/PopulateClientTLSValidationParametersTest.java | 6 +++---
.../profile/action/impl/PopulateDecryptionParametersTest.java | 6 +++---
.../action/impl/PopulateSignatureValidationParametersTest.java | 6 +++---
.../saml1/{profile => testing}/SAML1ActionTestingSupport.java | 4 ++--
.../saml2/{profile => testing}/SAML2ActionTestingSupport.java | 4 ++--
.../opensaml/saml/common/BaseComplexSAMLObjectTestCase.java | 2 +-
.../src/test/java/org/opensaml/saml/common/RoundTripTest.java | 2 +-
.../common/binding/artifact/impl/BasicSAMLArtifactMapTest.java | 2 +-
.../impl/StorageServiceSAMLArtifactMapEntryFactoryTest.java | 2 +-
.../artifact/impl/StorageServiceSAMLArtifactMapTest.java | 2 +-
.../binding/impl/AddChannelBindingsHeaderHandlerTest.java | 2 +-
.../common/binding/impl/CheckMessageVersionHandlerTest.java | 6 +++---
.../saml/common/binding/impl/DefaultEndpointResolverTest.java | 2 +-
.../impl/PopulateSignatureSigningParametersHandlerTest.java | 4 ++--
.../impl/SAMLAddAttributeConsumingServiceHandleTest.java | 6 +++---
.../common/binding/impl/SAMLMetadataLookupHandlerTest.java | 6 +++---
.../binding/impl/SAMLOutboundDestinationHandlerTest.java | 2 +-
.../security/impl/EndpointURLSchemeSecurityHandlerTest.java | 2 +-
.../binding/security/impl/InResponseToSecurityHandlerTest.java | 2 +-
.../security/impl/MessageLifetimeSecurityHandlerTest.java | 2 +-
.../security/impl/MessageReplaySecurityHandlerTest.java | 2 +-
.../security/impl/ReceivedEndpointSecurityHandlerTest.java | 2 +-
.../security/impl/SAMLMDClientCertAuthSecurityHandlerTest.java | 2 +-
.../impl/SAMLOutboundProtocolMessageSigningHandlerTest.java | 2 +-
.../SAMLProtocolMessageXMLSignatureSecurityHandlerTest.java | 2 +-
.../common/messaging/context/SAMLMessageInfoContextTest.java | 2 +-
.../profile/impl/AddAudienceRestrictionToAssertionsTest.java | 10 +++++-----
.../common/profile/impl/AddInResponseToToResponseTest.java | 10 +++++-----
.../profile/impl/AddNotBeforeConditionToAssertionsTest.java | 10 +++++-----
.../profile/impl/AddNotOnOrAfterConditionToAssertionsTest.java | 10 +++++-----
.../profile/impl/PopulateSignatureSigningParametersTest.java | 6 +++---
.../opensaml/saml/common/profile/impl/SignAssertionsTest.java | 10 +++++-----
.../saml/common/profile/impl/VerifyChannelBindingsTest.java | 6 +++---
.../common/profile/logic/EntityAttributesPredicateTest.java | 2 +-
.../common/profile/logic/EntityGroupNamePredicateTest.java | 2 +-
.../saml/config/impl/XMLObjectProviderInitializerTest.java | 2 +-
.../opensaml/saml/ext/idpdisco/impl/DiscoveryResponseTest.java | 2 +-
.../saml/ext/reqattr/impl/RequestedAttributesTest.java | 2 +-
.../java/org/opensaml/saml/ext/saml1md/impl/SourceIDTest.java | 2 +-
.../org/opensaml/saml/ext/saml2alg/impl/DigestMethodTest.java | 2 +-
.../org/opensaml/saml/ext/saml2alg/impl/SigningMethodTest.java | 2 +-
.../org/opensaml/saml/ext/saml2aslo/impl/AsynchronousTest.java | 2 +-
.../opensaml/saml/ext/saml2cb/impl/ChannelBindingsTest.java | 2 +-
.../opensaml/saml/ext/saml2delrestrict/impl/DelegateTest.java | 2 +-
.../saml2delrestrict/impl/DelegationRestrictionTypeTest.java | 2 +-
.../saml/ext/saml2mdattr/impl/EntityAttributesTest.java | 2 +-
.../saml/ext/saml2mdreqinit/impl/RequestInitiatorTest.java | 2 +-
.../opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoTest.java | 2 +-
.../opensaml/saml/ext/saml2mdrpi/impl/PublicationPathTest.java | 2 +-
.../org/opensaml/saml/ext/saml2mdrpi/impl/PublicationTest.java | 2 +-
.../saml/ext/saml2mdrpi/impl/RegistrationInfoTest.java | 2 +-
.../saml/ext/saml2mdrpi/impl/RegistrationPolicyTest.java | 2 +-
.../org/opensaml/saml/ext/saml2mdrpi/impl/UsagePolicyTest.java | 2 +-
.../org/opensaml/saml/ext/saml2mdui/impl/DescriptionTest.java | 3 +--
.../org/opensaml/saml/ext/saml2mdui/impl/DiscoHintsTest.java | 3 +--
.../org/opensaml/saml/ext/saml2mdui/impl/DisplayNameTest.java | 3 +--
.../org/opensaml/saml/ext/saml2mdui/impl/DomainHintTest.java | 3 +--
.../opensaml/saml/ext/saml2mdui/impl/GeolocationHintTest.java | 3 +--
.../java/org/opensaml/saml/ext/saml2mdui/impl/IPHintTest.java | 3 +--
.../opensaml/saml/ext/saml2mdui/impl/InformationURLTest.java | 3 +--
.../org/opensaml/saml/ext/saml2mdui/impl/KeywordsTest.java | 2 +-
.../java/org/opensaml/saml/ext/saml2mdui/impl/LogoTest.java | 3 +--
.../saml/ext/saml2mdui/impl/PrivacyStatementURLTest.java | 3 +--
.../java/org/opensaml/saml/ext/saml2mdui/impl/UIInfoTest.java | 3 +--
.../java/org/opensaml/saml/ext/samlec/impl/EncTypeTest.java | 2 +-
.../org/opensaml/saml/ext/samlec/impl/GeneratedKeyTest.java | 2 +-
.../java/org/opensaml/saml/ext/samlec/impl/SessionKeyTest.java | 2 +-
.../metadata/resolver/filter/impl/AlgorithmFilterTest.java | 2 +-
.../filter/impl/BasicDynamicTrustedNamesStrategyTest.java | 2 +-
.../resolver/filter/impl/ByReferenceMetadataFilterTest.java | 2 +-
.../filter/impl/EntitiesDescriptorNameProcessorTest.java | 2 +-
.../resolver/filter/impl/EntityAttributesFilterTest.java | 2 +-
.../metadata/resolver/filter/impl/EntityRoleFilterTest.java | 2 +-
.../metadata/resolver/filter/impl/NameIDFormatFilterTest.java | 2 +-
.../resolver/filter/impl/NodeProcessingMetadataFilterTest.java | 2 +-
.../metadata/resolver/filter/impl/PredicateFilterTest.java | 2 +-
.../metadata/resolver/filter/impl/RequiredValidUntilTest.java | 2 +-
.../resolver/filter/impl/SchemaValidationFilterTest.java | 2 +-
.../metadata/resolver/filter/impl/ScriptedFunctionTest.java | 2 +-
.../filter/impl/SignatureValidationFilterExplicitKeyTest.java | 2 +-
.../filter/impl/SignatureValidationFilterPKIXTest.java | 2 +-
.../resolver/impl/AbstractDynamicHTTPMetadataResolverTest.java | 2 +-
.../resolver/impl/AbstractDynamicMetadataResolverTest.java | 2 +-
.../metadata/resolver/impl/ChainingMetadataResolverTest.java | 2 +-
.../saml/metadata/resolver/impl/DOMMetadataResolverTest.java | 2 +-
.../resolver/impl/FileBackedHTTPMetadataResolverTest.java | 2 +-
.../metadata/resolver/impl/FilesystemMetadataResolverTest.java | 2 +-
.../impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java | 2 +-
.../saml/metadata/resolver/impl/HTTPMetadataResolverTest.java | 2 +-
.../resolver/impl/LocalDynamicMetadataResolverTest.java | 2 +-
.../saml/metadata/resolver/impl/PredicateFilteringTest.java | 2 +-
.../resolver/impl/PredicateRoleDescriptorResolverTest.java | 2 +-
.../resolver/impl/ResourceBackedMetadataResolverTest.java | 2 +-
.../resolver/index/impl/EndpointMetadataIndexTest.java | 2 +-
.../resolver/index/impl/FunctionDrivenMetadataIndexTest.java | 2 +-
.../metadata/resolver/index/impl/MetadataIndexManagerTest.java | 2 +-
.../metadata/resolver/index/impl/MetadataIndexStoreTest.java | 2 +-
.../metadata/resolver/index/impl/MetadataIndexingTest.java | 2 +-
.../metadata/resolver/index/impl/RoleMetadataIndexTest.java | 2 +-
.../resolver/index/impl/SAMLArtifactMetadataIndexTest.java | 2 +-
.../support/AttributeConsumingServiceSelectorTest.java | 2 +-
.../saml/saml1/binding/decoding/impl/HTTPPostDecoderTest.java | 2 +-
.../saml1/binding/decoding/impl/HTTPSOAP11DecoderTest.java | 2 +-
.../saml/saml1/binding/encoding/impl/HTTPPostEncoderTest.java | 2 +-
.../saml1/binding/encoding/impl/HTTPSOAP11EncoderTest.java | 2 +-
.../binding/impl/SAML1ArtifactRequestIssuerHandlerTest.java | 4 ++--
.../test/java/org/opensaml/saml/saml1/core/ResponseTest.java | 2 +-
.../java/org/opensaml/saml/saml1/core/impl/ActionTest.java | 2 +-
.../java/org/opensaml/saml/saml1/core/impl/AdviceTest.java | 2 +-
.../opensaml/saml/saml1/core/impl/AssertionArtifactTest.java | 2 +-
.../saml/saml1/core/impl/AssertionIDReferenceTest.java | 2 +-
.../java/org/opensaml/saml/saml1/core/impl/AssertionTest.java | 2 +-
.../opensaml/saml/saml1/core/impl/AttributeDesignatorTest.java | 2 +-
.../org/opensaml/saml/saml1/core/impl/AttributeQueryTest.java | 2 +-
.../opensaml/saml/saml1/core/impl/AttributeStatementTest.java | 2 +-
.../java/org/opensaml/saml/saml1/core/impl/AttributeTest.java | 2 +-
.../saml/saml1/core/impl/AudienceRestrictionConditionTest.java | 2 +-
.../java/org/opensaml/saml/saml1/core/impl/AudienceTest.java | 2 +-
.../opensaml/saml/saml1/core/impl/AuthenticationQueryTest.java | 2 +-
.../saml/saml1/core/impl/AuthenticationStatementTest.java | 2 +-
.../opensaml/saml/saml1/core/impl/AuthorityBindingTest.java | 2 +-
.../saml/saml1/core/impl/AuthorizationDecisionQueryTest.java | 2 +-
.../saml1/core/impl/AuthorizationDecisionStatementTest.java | 2 +-
.../java/org/opensaml/saml/saml1/core/impl/ConditionsTest.java | 2 +-
.../opensaml/saml/saml1/core/impl/ConfirmationMethodTest.java | 2 +-
.../opensaml/saml/saml1/core/impl/DoNotCacheConditionTest.java | 2 +-
.../java/org/opensaml/saml/saml1/core/impl/EvidenceTest.java | 2 +-
.../org/opensaml/saml/saml1/core/impl/NameIdentifierTest.java | 2 +-
.../java/org/opensaml/saml/saml1/core/impl/RequestTest.java | 2 +-
.../org/opensaml/saml/saml1/core/impl/RespondWithTest.java | 2 +-
.../java/org/opensaml/saml/saml1/core/impl/ResponseTest.java | 2 +-
.../java/org/opensaml/saml/saml1/core/impl/StatusCodeTest.java | 2 +-
.../org/opensaml/saml/saml1/core/impl/StatusMessageTest.java | 2 +-
.../java/org/opensaml/saml/saml1/core/impl/StatusTest.java | 2 +-
.../opensaml/saml/saml1/core/impl/SubjectConfirmationTest.java | 2 +-
.../org/opensaml/saml/saml1/core/impl/SubjectLocalityTest.java | 2 +-
.../java/org/opensaml/saml/saml1/core/impl/SubjectTest.java | 2 +-
.../profile/AbstractSAML1NameIdentifierGeneratorTest.java | 2 +-
.../profile/impl/AddDoNotCacheConditionToAssertionsTest.java | 8 ++++----
.../saml1/profile/impl/AddNameIdentifierToSubjectsTest.java | 8 ++++----
.../opensaml/saml/saml1/profile/impl/AddResponseShellTest.java | 8 ++++----
.../saml/saml1/profile/impl/AddStatusToResponseTest.java | 8 ++++----
.../profile/impl/AddSubjectConfirmationToSubjectsTest.java | 8 ++++----
.../saml1/profile/impl/CopyNameIdentifierFromRequestTest.java | 8 ++++----
.../opensaml/saml/saml1/profile/impl/ResolveArtifactsTest.java | 8 ++++----
.../saml/saml2/assertion/BaseAssertionValidationTest.java | 4 ++--
.../saml/saml2/binding/decoding/impl/HTTPPostDecoderTest.java | 2 +-
.../binding/decoding/impl/HTTPRedirectDeflateDecoderTest.java | 2 +-
.../saml2/binding/decoding/impl/HTTPSOAP11DecoderTest.java | 2 +-
.../saml/saml2/binding/encoding/impl/HTTPPostEncoderTest.java | 2 +-
.../binding/encoding/impl/HTTPPostSimpleSignEncoderTest.java | 2 +-
.../binding/encoding/impl/HTTPRedirectDeflateEncoderTest.java | 2 +-
.../saml2/binding/encoding/impl/HTTPSOAP11EncoderTest.java | 2 +-
.../saml2/binding/impl/AddConsentToResponseHandlerTest.java | 4 ++--
.../saml2/binding/impl/AddECPResponseHeaderHandlerTest.java | 4 ++--
.../saml2/binding/impl/AddGeneratedKeyHeaderHandlerTest.java | 2 +-
.../saml2/binding/impl/AddRelayStateHeaderHandlerTest.java | 2 +-
.../binding/impl/AddRequestAuthenticatedHeaderHandlerTest.java | 2 +-
.../binding/impl/ExtractConsentFromRequestHandlerTest.java | 4 ++--
.../binding/impl/ExtractProxiedRequestersHandlerTest.java | 4 ++--
.../impl/ExtractChannelBindingsExtensionsHandlerTest.java | 6 +++---
.../impl/ExtractChannelBindingsHeadersHandlerTest.java | 4 ++--
.../impl/SAML2AuthnRequestsSignedSecurityHandlerTest.java | 2 +-
.../impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java | 2 +-
.../SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java | 2 +-
.../java/org/opensaml/saml/saml2/core/SignedAssertionTest.java | 2 +-
.../java/org/opensaml/saml/saml2/core/impl/ActionTest.java | 2 +-
.../java/org/opensaml/saml/saml2/core/impl/AdviceTest.java | 2 +-
.../java/org/opensaml/saml/saml2/core/impl/ArtifactTest.java | 2 +-
.../org/opensaml/saml/saml2/core/impl/AssertionIDRefTest.java | 2 +-
.../java/org/opensaml/saml/saml2/core/impl/AssertionTest.java | 2 +-
.../org/opensaml/saml/saml2/core/impl/AssertionURIRefTest.java | 2 +-
.../opensaml/saml/saml2/core/impl/AttributeStatementTest.java | 2 +-
.../java/org/opensaml/saml/saml2/core/impl/AttributeTest.java | 2 +-
.../opensaml/saml/saml2/core/impl/AudienceRestrictionTest.java | 2 +-
.../java/org/opensaml/saml/saml2/core/impl/AudienceTest.java | 2 +-
.../saml/saml2/core/impl/AuthenticatingAuthorityTest.java | 2 +-
.../saml/saml2/core/impl/AuthnContextClassRefTest.java | 2 +-
.../opensaml/saml/saml2/core/impl/AuthnContextDeclRefTest.java | 2 +-
.../opensaml/saml/saml2/core/impl/AuthnContextDeclTest.java | 2 +-
.../org/opensaml/saml/saml2/core/impl/AuthnContextTest.java | 2 +-
.../org/opensaml/saml/saml2/core/impl/AuthnStatementTest.java | 2 +-
.../saml/saml2/core/impl/AuthzDecisionStatementTest.java | 2 +-
.../java/org/opensaml/saml/saml2/core/impl/ConditionsTest.java | 2 +-
.../opensaml/saml/saml2/core/impl/EncryptedAssertionTest.java | 2 +-
.../opensaml/saml/saml2/core/impl/EncryptedAttributeTest.java | 2 +-
.../org/opensaml/saml/saml2/core/impl/EncryptedIDTest.java | 2 +-
.../java/org/opensaml/saml/saml2/core/impl/EvidenceTest.java | 2 +-
.../java/org/opensaml/saml/saml2/core/impl/ExtensionsTest.java | 2 +-
.../org/opensaml/saml/saml2/core/impl/GetCompleteTest.java | 2 +-
.../java/org/opensaml/saml/saml2/core/impl/IDPEntryTest.java | 2 +-
.../java/org/opensaml/saml/saml2/core/impl/IDPListTest.java | 2 +-
.../java/org/opensaml/saml/saml2/core/impl/IssuerTest.java | 2 +-
.../saml/saml2/core/impl/KeyInfoConfirmationDataTypeTest.java | 2 +-
.../org/opensaml/saml/saml2/core/impl/NameIDPolicyTest.java | 2 +-
.../java/org/opensaml/saml/saml2/core/impl/NameIDTest.java | 2 +-
.../org/opensaml/saml/saml2/core/impl/NewEncryptedIDTest.java | 2 +-
.../test/java/org/opensaml/saml/saml2/core/impl/NewIDTest.java | 2 +-
.../java/org/opensaml/saml/saml2/core/impl/OneTimeUseTest.java | 2 +-
.../opensaml/saml/saml2/core/impl/ProxyRestrictionTest.java | 2 +-
.../org/opensaml/saml/saml2/core/impl/RequestTestBase.java | 2 +-
.../saml/saml2/core/impl/RequestedAuthnContextTest.java | 2 +-
.../org/opensaml/saml/saml2/core/impl/RequesterIDTest.java | 2 +-
.../java/org/opensaml/saml/saml2/core/impl/ScopingTest.java | 2 +-
.../org/opensaml/saml/saml2/core/impl/SessionIndexTest.java | 2 +-
.../java/org/opensaml/saml/saml2/core/impl/StatusCodeTest.java | 2 +-
.../org/opensaml/saml/saml2/core/impl/StatusDetailTest.java | 2 +-
.../org/opensaml/saml/saml2/core/impl/StatusMessageTest.java | 2 +-
.../opensaml/saml/saml2/core/impl/StatusResponseTestBase.java | 2 +-
.../java/org/opensaml/saml/saml2/core/impl/StatusTest.java | 2 +-
.../saml/saml2/core/impl/SubjectConfirmationDataTest.java | 2 +-
.../opensaml/saml/saml2/core/impl/SubjectConfirmationTest.java | 2 +-
.../org/opensaml/saml/saml2/core/impl/SubjectLocalityTest.java | 2 +-
.../java/org/opensaml/saml/saml2/core/impl/SubjectTest.java | 2 +-
.../java/org/opensaml/saml/saml2/core/impl/TerminateTest.java | 2 +-
.../java/org/opensaml/saml/saml2/ecp/impl/RelayStateTest.java | 2 +-
.../opensaml/saml/saml2/ecp/impl/RequestAuthenticatedTest.java | 2 +-
.../java/org/opensaml/saml/saml2/ecp/impl/RequestTest.java | 2 +-
.../java/org/opensaml/saml/saml2/ecp/impl/ResponseTest.java | 2 +-
.../opensaml/saml/saml2/ecp/impl/SubjectConfirmationTest.java | 2 +-
.../opensaml/saml/saml2/encryption/ComplexEncryptionTest.java | 2 +-
.../saml/saml2/encryption/DecryptionPlusSigningTest.java | 2 +-
.../EncryptedElementTypeEncryptedKeyResolverTest.java | 2 +-
.../opensaml/saml/saml2/encryption/SimpleDecryptionTest.java | 2 +-
.../opensaml/saml/saml2/encryption/SimpleEncryptionTest.java | 2 +-
.../java/org/opensaml/saml/saml2/metadata/MetadataTest.java | 2 +-
.../saml2/metadata/impl/AdditionalMetadataLocationTest.java | 2 +-
.../opensaml/saml/saml2/metadata/impl/AffiliateMemberTest.java | 2 +-
.../saml/saml2/metadata/impl/AffiliationDescriptorTest.java | 2 +-
.../saml2/metadata/impl/ArtifactResolutionServiceTest.java | 2 +-
.../saml/saml2/metadata/impl/AssertionConsumerServiceTest.java | 2 +-
.../saml2/metadata/impl/AssertionIDRequestServiceTest.java | 2 +-
.../saml2/metadata/impl/AttributeAuthorityDescriptorTest.java | 2 +-
.../saml2/metadata/impl/AttributeConsumingServiceTest.java | 2 +-
.../saml/saml2/metadata/impl/AttributeProfileTest.java | 2 +-
.../saml/saml2/metadata/impl/AttributeServiceTest.java | 2 +-
.../saml/saml2/metadata/impl/AuthnAuthorityDescriptorTest.java | 2 +-
.../saml/saml2/metadata/impl/AuthnQueryServiceTest.java | 2 +-
.../opensaml/saml/saml2/metadata/impl/AuthzServiceTest.java | 2 +-
.../org/opensaml/saml/saml2/metadata/impl/CompanyTest.java | 2 +-
.../opensaml/saml/saml2/metadata/impl/ContactPersonTest.java | 2 +-
.../opensaml/saml/saml2/metadata/impl/EmailAddressTest.java | 2 +-
.../saml/saml2/metadata/impl/EncryptionMethodTest.java | 2 +-
.../saml/saml2/metadata/impl/EntitiesDescriptorTest.java | 2 +-
.../saml/saml2/metadata/impl/EntityDescriptorTest.java | 2 +-
.../org/opensaml/saml/saml2/metadata/impl/ExtensionsTest.java | 2 +-
.../org/opensaml/saml/saml2/metadata/impl/GivenNameTest.java | 2 +-
.../saml/saml2/metadata/impl/IDPSSODescriptorTest.java | 2 +-
.../opensaml/saml/saml2/metadata/impl/KeyDescriptorTest.java | 2 +-
.../saml/saml2/metadata/impl/ManageNameIDServiceTest.java | 2 +-
.../opensaml/saml/saml2/metadata/impl/NameIDFormatTest.java | 2 +-
.../saml/saml2/metadata/impl/NameIDMappingServiceTest.java | 2 +-
.../saml/saml2/metadata/impl/OrganizationDisplayNameTest.java | 2 +-
.../saml/saml2/metadata/impl/OrganizationNameTest.java | 2 +-
.../opensaml/saml/saml2/metadata/impl/OrganizationTest.java | 2 +-
.../opensaml/saml/saml2/metadata/impl/OrganizationURLTest.java | 2 +-
.../opensaml/saml/saml2/metadata/impl/PDPDescriptorTest.java | 2 +-
.../saml/saml2/metadata/impl/RequestedAttributeTest.java | 2 +-
.../opensaml/saml/saml2/metadata/impl/SPSSODescriptorTest.java | 2 +-
.../saml/saml2/metadata/impl/ServiceDescriptionTest.java | 3 +--
.../org/opensaml/saml/saml2/metadata/impl/ServiceNameTest.java | 2 +-
.../saml/saml2/metadata/impl/SingleLogoutServiceTest.java | 2 +-
.../saml/saml2/metadata/impl/SingleSignOnServiceTest.java | 2 +-
.../org/opensaml/saml/saml2/metadata/impl/SurNameTest.java | 2 +-
.../opensaml/saml/saml2/metadata/impl/TelephoneNumberTest.java | 2 +-
.../saml/saml2/profile/AbstractSAML2NameIDGeneratorTest.java | 2 +-
.../saml2/profile/impl/AddChannelBindingsToAssertionsTest.java | 8 ++++----
.../saml2/profile/impl/AddGeneratedKeyToAssertionsTest.java | 8 ++++----
.../saml/saml2/profile/impl/AddNameIDToSubjectsTest.java | 8 ++++----
.../profile/impl/AddOneTimeUseConditionToAssertionsTest.java | 8 ++++----
.../profile/impl/AddProxyRestrictionToAssertionsTest.java | 8 ++++----
.../saml/saml2/profile/impl/AddStatusResponseShellTest.java | 8 ++++----
.../saml/saml2/profile/impl/AddStatusToResponseTest.java | 8 ++++----
.../profile/impl/AddSubjectConfirmationToSubjectsTest.java | 8 ++++----
.../saml/saml2/profile/impl/CopyNameIDFromRequestTest.java | 8 ++++----
.../opensaml/saml/saml2/profile/impl/DecryptNameIDsTest.java | 8 ++++----
.../saml/saml2/profile/impl/EncryptAssertionsTest.java | 8 ++++----
.../saml/saml2/profile/impl/EncryptAttributesTest.java | 8 ++++----
.../opensaml/saml/saml2/profile/impl/EncryptNameIDsTest.java | 8 ++++----
.../saml/saml2/profile/impl/PopulateECPContextTest.java | 8 ++++----
.../opensaml/saml/saml2/profile/impl/ResolveArtifactTest.java | 8 ++++----
.../opensaml/saml/saml2/profile/impl/TestSelfEncryption.java | 8 ++++----
.../saml/saml2/profile/impl/ValidateAssertionsTest.java | 8 ++++----
.../DefaultSAML20AssertionValidationContextBuilderTest.java | 4 ++--
.../WSSecuritySAML20AssertionTokenSecurityHandlerTest.java | 4 ++--
.../impl/InlineSelfEncryptionParametersStrategyTest.java | 4 ++--
.../saml/security/impl/MetadataCredentialResolverTest.java | 2 +-
.../impl/SAMLMetadataEncryptionParametersResolverTest.java | 2 +-
.../SAMLMetadataSignatureSigningParametersResolverTest.java | 2 +-
.../saml/security/impl/SAMLSignatureProfileValidatorTest.java | 2 +-
.../impl/ClientTLSValidationConfigurationInitializerTest.java | 2 +-
.../impl/PopulateHttpClientSecurityParametersHandlerTest.java | 2 +-
.../x509/impl/BasicX509CredentialNameEvaluatorTest.java | 2 +-
.../security/x509/impl/CertPathPKIXTrustEvaluatorTest.java | 2 +-
.../security/x509/impl/PKIXX509CredentialTrustEngineTest.java | 2 +-
.../decoder/http/impl/HttpClientResponseSOAP11DecoderTest.java | 2 +-
.../encoder/http/impl/HttpClientRequestSOAP11EncoderTest.java | 2 +-
.../soap/config/impl/XMLObjectProviderInitializerTest.java | 2 +-
.../src/test/java/org/opensaml/soap/soap11/SOAPTest.java | 2 +-
.../soap/soap11/decoder/http/impl/HTTPSOAP11DecoderTest.java | 2 +-
.../soap/soap11/encoder/http/impl/HTTPSOAP11EncoderTest.java | 2 +-
.../opensaml/soap/soap11/profile/impl/AddSOAPFaultTest.java | 6 +++---
.../opensaml/soap/{ => testing}/SOAPMessagingBaseTestCase.java | 4 ++--
.../java/org/opensaml/soap/{ => testing}/WSBaseTestCase.java | 4 ++--
.../soap/wsaddressing/impl/WSAddressingObjectsTestCase.java | 2 +-
.../soap/wsaddressing/messaging/impl/AddActionHandlerTest.java | 2 +-
.../wsaddressing/messaging/impl/AddMessageIDHandlerTest.java | 2 +-
.../wsaddressing/messaging/impl/AddRelatesToHandlerTest.java | 2 +-
.../messaging/impl/ExtractMessageIDHandlerTest.java | 2 +-
.../wsaddressing/messaging/impl/ValidateActionHandlerTest.java | 2 +-
.../opensaml/soap/wspolicy/impl/WSPolicyObjectsTestCase.java | 2 +-
.../soap/wssecurity/impl/WSSecurityObjectsTestCase.java | 2 +-
.../wssecurity/messaging/impl/AddTimestampHandlerTest.java | 2 +-
.../org/opensaml/soap/wstrust/impl/WSTrustObjectsTestCase.java | 2 +-
.../storage/impl/client/LoadClientStorageServicesTest.java | 4 ++--
.../impl/client/PopulateClientStorageLoadContextTest.java | 4 ++--
.../impl/client/PopulateClientStorageSaveContextTest.java | 4 ++--
.../impl/client/SaveCookieBackedClientStorageServicesTest.java | 4 ++--
.../xacml/config/impl/XMLObjectProviderInitializerTest.java | 2 +-
.../src/test/java/org/opensaml/xacml/ctx/impl/ActionTest.java | 2 +-
.../test/java/org/opensaml/xacml/ctx/impl/AttributeTest.java | 2 +-
.../java/org/opensaml/xacml/ctx/impl/AttributeValueTest.java | 2 +-
.../test/java/org/opensaml/xacml/ctx/impl/DecisionTest.java | 2 +-
.../test/java/org/opensaml/xacml/ctx/impl/EnvironmentTest.java | 2 +-
.../opensaml/xacml/ctx/impl/MissingAttributeDetailTest.java | 2 +-
.../src/test/java/org/opensaml/xacml/ctx/impl/RequestTest.java | 2 +-
.../java/org/opensaml/xacml/ctx/impl/ResourceContentTest.java | 2 +-
.../test/java/org/opensaml/xacml/ctx/impl/ResourceTest.java | 2 +-
.../test/java/org/opensaml/xacml/ctx/impl/ResponseTest.java | 2 +-
.../src/test/java/org/opensaml/xacml/ctx/impl/ResultTest.java | 2 +-
.../test/java/org/opensaml/xacml/ctx/impl/StatusCodeTest.java | 2 +-
.../java/org/opensaml/xacml/ctx/impl/StatusDetailTest.java | 2 +-
.../java/org/opensaml/xacml/ctx/impl/StatusMessageTest.java | 2 +-
.../src/test/java/org/opensaml/xacml/ctx/impl/StatusTest.java | 2 +-
.../src/test/java/org/opensaml/xacml/ctx/impl/SubjectTest.java | 2 +-
.../xacml/ctx/provider/impl/ObligationServiceTest.java | 2 +-
.../xacml/policy/impl/ActionAttributeDesignatorTest.java | 2 +-
.../java/org/opensaml/xacml/policy/impl/ActionMatchTest.java | 2 +-
.../test/java/org/opensaml/xacml/policy/impl/ActionTest.java | 2 +-
.../test/java/org/opensaml/xacml/policy/impl/ActionsTest.java | 2 +-
.../test/java/org/opensaml/xacml/policy/impl/ApplyTest.java | 2 +-
.../opensaml/xacml/policy/impl/AttributeAssignmentTest.java | 2 +-
.../org/opensaml/xacml/policy/impl/AttributeSelectorTest.java | 2 +-
.../org/opensaml/xacml/policy/impl/AttributeValueTest.java | 2 +-
.../org/opensaml/xacml/policy/impl/CombinerParameterTest.java | 2 +-
.../org/opensaml/xacml/policy/impl/CombinerParametersTest.java | 2 +-
.../java/org/opensaml/xacml/policy/impl/ConditionTest.java | 2 +-
.../java/org/opensaml/xacml/policy/impl/DescriptionTest.java | 2 +-
.../xacml/policy/impl/EnvironmentAttributeDesignatorTest.java | 2 +-
.../org/opensaml/xacml/policy/impl/EnvironmentMatchTest.java | 2 +-
.../java/org/opensaml/xacml/policy/impl/EnvironmentTest.java | 2 +-
.../java/org/opensaml/xacml/policy/impl/EnvironmentsTest.java | 2 +-
.../test/java/org/opensaml/xacml/policy/impl/FunctionTest.java | 2 +-
.../java/org/opensaml/xacml/policy/impl/ObligationTest.java | 2 +-
.../java/org/opensaml/xacml/policy/impl/ObligationsTest.java | 2 +-
.../xacml/policy/impl/PolicyCombinerParametersTest.java | 2 +-
.../org/opensaml/xacml/policy/impl/PolicyDefaultsTest.java | 2 +-
.../org/opensaml/xacml/policy/impl/PolicyIdReferenceTest.java | 2 +-
.../xacml/policy/impl/PolicySetCombinerParametersTest.java | 2 +-
.../org/opensaml/xacml/policy/impl/PolicySetDefaultsTest.java | 2 +-
.../opensaml/xacml/policy/impl/PolicySetIdReferenceTest.java | 2 +-
.../java/org/opensaml/xacml/policy/impl/PolicySetTest.java | 2 +-
.../test/java/org/opensaml/xacml/policy/impl/PolicyTest.java | 2 +-
.../xacml/policy/impl/ResourceAttributeDesignatorTest.java | 2 +-
.../java/org/opensaml/xacml/policy/impl/ResourceMatchTest.java | 2 +-
.../test/java/org/opensaml/xacml/policy/impl/ResourceTest.java | 2 +-
.../java/org/opensaml/xacml/policy/impl/ResourcesTest.java | 2 +-
.../opensaml/xacml/policy/impl/RuleCombinerParametersTest.java | 2 +-
.../src/test/java/org/opensaml/xacml/policy/impl/RuleTest.java | 2 +-
.../xacml/policy/impl/SubjectAttributeDesignatorTest.java | 2 +-
.../java/org/opensaml/xacml/policy/impl/SubjectMatchTest.java | 2 +-
.../test/java/org/opensaml/xacml/policy/impl/SubjectTest.java | 2 +-
.../test/java/org/opensaml/xacml/policy/impl/SubjectsTest.java | 2 +-
.../test/java/org/opensaml/xacml/policy/impl/TargetTest.java | 2 +-
.../org/opensaml/xacml/policy/impl/VariableDefinitionTest.java | 2 +-
.../org/opensaml/xacml/policy/impl/VariableReferenceTest.java | 2 +-
.../saml/config/impl/XMLObjectProviderInitializerTest.java | 2 +-
.../org/opensaml/xmlsec/algorithm/AlgorithmRegistryTest.java | 2 +-
.../org/opensaml/xmlsec/algorithm/AlgorithmSupportTest.java | 2 +-
.../java/org/opensaml/xmlsec/crypto/XMLSigningUtilTest.java | 2 +-
.../xmlsec/config/impl/XMLObjectProviderInitializerTest.java | 2 +-
.../opensaml/xmlsec/encryption/impl/AgreementMethodTest.java | 2 +-
.../opensaml/xmlsec/encryption/impl/CarriedKeyNameTest.java | 2 +-
.../org/opensaml/xmlsec/encryption/impl/CipherDataTest.java | 2 +-
.../opensaml/xmlsec/encryption/impl/CipherReferenceTest.java | 2 +-
.../org/opensaml/xmlsec/encryption/impl/CipherValueTest.java | 2 +-
.../org/opensaml/xmlsec/encryption/impl/DHKeyValueTest.java | 2 +-
.../org/opensaml/xmlsec/encryption/impl/DataReferenceTest.java | 2 +-
.../org/opensaml/xmlsec/encryption/impl/EncryptedDataTest.java | 2 +-
.../org/opensaml/xmlsec/encryption/impl/EncryptedKeyTest.java | 2 +-
.../opensaml/xmlsec/encryption/impl/EncryptionMethodTest.java | 2 +-
.../xmlsec/encryption/impl/EncryptionPropertiesTest.java | 2 +-
.../xmlsec/encryption/impl/EncryptionPropertyTest.java | 2 +-
.../org/opensaml/xmlsec/encryption/impl/GeneratorTest.java | 2 +-
.../java/org/opensaml/xmlsec/encryption/impl/KANonceTest.java | 2 +-
.../org/opensaml/xmlsec/encryption/impl/KeyReferenceTest.java | 2 +-
.../java/org/opensaml/xmlsec/encryption/impl/KeySizeTest.java | 2 +-
.../test/java/org/opensaml/xmlsec/encryption/impl/MGFTest.java | 2 +-
.../org/opensaml/xmlsec/encryption/impl/OAEPparamsTest.java | 2 +-
.../opensaml/xmlsec/encryption/impl/OriginatorKeyInfoTest.java | 2 +-
.../test/java/org/opensaml/xmlsec/encryption/impl/PTest.java | 2 +-
.../org/opensaml/xmlsec/encryption/impl/PgenCounterTest.java | 2 +-
.../java/org/opensaml/xmlsec/encryption/impl/PublicTest.java | 2 +-
.../test/java/org/opensaml/xmlsec/encryption/impl/QTest.java | 2 +-
.../opensaml/xmlsec/encryption/impl/RecipientKeyInfoTest.java | 2 +-
.../org/opensaml/xmlsec/encryption/impl/ReferenceListTest.java | 2 +-
.../java/org/opensaml/xmlsec/encryption/impl/SeedTest.java | 2 +-
.../org/opensaml/xmlsec/encryption/impl/TransformsTest.java | 2 +-
.../org/opensaml/xmlsec/encryption/support/AESGCMTest.java | 2 +-
.../encryption/support/ChainingEncryptedKeyResolverTest.java | 2 +-
.../xmlsec/encryption/support/DecryptionSignedContentTest.java | 2 +-
.../xmlsec/encryption/support/EncryptionClonedContentTest.java | 2 +-
.../encryption/support/InlineEncryptedKeyResolverTest.java | 2 +-
.../xmlsec/encryption/support/SimpleDecryptionTest.java | 2 +-
.../xmlsec/encryption/support/SimpleEncryptionTest.java | 2 +-
.../SimpleKeyInfoReferenceEncryptedKeyResolverTest.java | 2 +-
.../support/SimpleRetrievalMethodEncryptedKeyResolverTest.java | 2 +-
.../xmlsec/impl/AbstractSecurityParametersResolverTest.java | 2 +-
.../xmlsec/impl/AlgorithmRuntimeSupportedPredicateTest.java | 2 +-
.../xmlsec/impl/BasicEncryptionParametersResolverTest.java | 2 +-
.../impl/BasicSignatureSigningParametersResolverTest.java | 2 +-
.../java/org/opensaml/xmlsec/keyinfo/KeyInfoSupportTest.java | 2 +-
.../xmlsec/keyinfo/impl/BasicKeyInfoGeneratorTest.java | 2 +-
.../opensaml/xmlsec/keyinfo/impl/CertChainX509DataTest.java | 2 +-
.../keyinfo/impl/ChainingKeyInfoCredentialResolverTest.java | 2 +-
.../opensaml/xmlsec/keyinfo/impl/DEREncodedKeyValueTest.java | 2 +-
.../java/org/opensaml/xmlsec/keyinfo/impl/DSAKeyValueTest.java | 2 +-
.../xmlsec/keyinfo/impl/KeyInfoGeneratorManagerTest.java | 2 +-
.../keyinfo/impl/LocalKeyInfoCredentialResolverTest.java | 2 +-
.../xmlsec/keyinfo/impl/NamedKeyInfoGeneratorManagerTest.java | 2 +-
.../java/org/opensaml/xmlsec/keyinfo/impl/RSAKeyValueTest.java | 2 +-
.../opensaml/xmlsec/keyinfo/impl/SingleCertX509DataTest.java | 2 +-
.../xmlsec/keyinfo/impl/StaticKeyInfoGeneratorTest.java | 2 +-
.../opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorTest.java | 2 +-
.../impl/PopulateSignatureValidationParametersHandlerTest.java | 2 +-
.../opensaml/xmlsec/signature/impl/DEREncodedKeyValueTest.java | 2 +-
.../org/opensaml/xmlsec/signature/impl/DSAKeyValueTest.java | 2 +-
.../org/opensaml/xmlsec/signature/impl/DigestMethodTest.java | 2 +-
.../org/opensaml/xmlsec/signature/impl/ECKeyValueTest.java | 2 +-
.../java/org/opensaml/xmlsec/signature/impl/ExponentTest.java | 2 +-
.../test/java/org/opensaml/xmlsec/signature/impl/GTest.java | 2 +-
.../test/java/org/opensaml/xmlsec/signature/impl/JTest.java | 2 +-
.../opensaml/xmlsec/signature/impl/KeyInfoReferenceTest.java | 2 +-
.../java/org/opensaml/xmlsec/signature/impl/KeyInfoTest.java | 2 +-
.../java/org/opensaml/xmlsec/signature/impl/KeyNameTest.java | 2 +-
.../java/org/opensaml/xmlsec/signature/impl/KeyValueTest.java | 2 +-
.../java/org/opensaml/xmlsec/signature/impl/MgmtDataTest.java | 2 +-
.../java/org/opensaml/xmlsec/signature/impl/ModulusTest.java | 2 +-
.../org/opensaml/xmlsec/signature/impl/NamedCurveTest.java | 2 +-
.../java/org/opensaml/xmlsec/signature/impl/PGPDataTest.java | 2 +-
.../java/org/opensaml/xmlsec/signature/impl/PGPKeyIDTest.java | 2 +-
.../org/opensaml/xmlsec/signature/impl/PGPKeyPacketTest.java | 2 +-
.../test/java/org/opensaml/xmlsec/signature/impl/PTest.java | 2 +-
.../org/opensaml/xmlsec/signature/impl/PgenCounterTest.java | 2 +-
.../java/org/opensaml/xmlsec/signature/impl/PublicKeyTest.java | 2 +-
.../test/java/org/opensaml/xmlsec/signature/impl/QTest.java | 2 +-
.../org/opensaml/xmlsec/signature/impl/RSAKeyValueTest.java | 2 +-
.../opensaml/xmlsec/signature/impl/RetrievalMethodTest.java | 2 +-
.../java/org/opensaml/xmlsec/signature/impl/SPKIDataTest.java | 2 +-
.../java/org/opensaml/xmlsec/signature/impl/SPKISexpTest.java | 2 +-
.../test/java/org/opensaml/xmlsec/signature/impl/SeedTest.java | 2 +-
.../java/org/opensaml/xmlsec/signature/impl/TransformTest.java | 2 +-
.../org/opensaml/xmlsec/signature/impl/TransformsTest.java | 2 +-
.../java/org/opensaml/xmlsec/signature/impl/X509CRLTest.java | 2 +-
.../opensaml/xmlsec/signature/impl/X509CertificateTest.java | 2 +-
.../java/org/opensaml/xmlsec/signature/impl/X509DataTest.java | 2 +-
.../org/opensaml/xmlsec/signature/impl/X509DigestTest.java | 2 +-
.../org/opensaml/xmlsec/signature/impl/X509IssuerNameTest.java | 2 +-
.../opensaml/xmlsec/signature/impl/X509IssuerSerialTest.java | 2 +-
.../java/org/opensaml/xmlsec/signature/impl/X509SKITest.java | 2 +-
.../opensaml/xmlsec/signature/impl/X509SerialNumberTest.java | 2 +-
.../opensaml/xmlsec/signature/impl/X509SubjectNameTest.java | 2 +-
.../java/org/opensaml/xmlsec/signature/impl/XPathTest.java | 2 +-
.../test/java/org/opensaml/xmlsec/signature/impl/YTest.java | 2 +-
.../xmlsec/signature/support/DetachedSignatureTest.java | 2 +-
.../xmlsec/signature/support/EnvelopedSignatureTest.java | 2 +-
.../opensaml/xmlsec/signature/support/HMACSignatureTest.java | 2 +-
.../signature/support/SignatureAlgorithmValidatorTest.java | 2 +-
.../xmlsec/signature/support/SignatureSupportTest.java | 2 +-
.../support/impl/ChainingSignatureTrustEngineTest.java | 2 +-
.../support/impl/ExplicitKeySignatureTrustEngineTest.java | 2 +-
.../signature/support/impl/PKIXSignatureTrustEngineTest.java | 2 +-
518 files changed, 650 insertions(+), 670 deletions(-)
diff --git a/opensaml-core/src/test/java/org/opensaml/core/config/InitializerBaseTestCase.java b/opensaml-core/src/test/java/org/opensaml/core/testing/InitializerBaseTestCase.java
similarity index 94%
rename from opensaml-core/src/test/java/org/opensaml/core/config/InitializerBaseTestCase.java
rename to opensaml-core/src/test/java/org/opensaml/core/testing/InitializerBaseTestCase.java
index 40e3ec60f..c5276897a 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/config/InitializerBaseTestCase.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/testing/InitializerBaseTestCase.java
@@ -15,12 +15,13 @@
* limitations under the License.
*/
-package org.opensaml.core.config;
+package org.opensaml.core.testing;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import java.util.Properties;
+import org.opensaml.core.config.ConfigurationService;
import org.opensaml.core.config.provider.ThreadLocalConfigurationPropertiesHolder;
/**
diff --git a/opensaml-core/src/test/java/org/opensaml/core/OpenSAMLInitBaseTestCase.java b/opensaml-core/src/test/java/org/opensaml/core/testing/OpenSAMLInitBaseTestCase.java
similarity index 97%
rename from opensaml-core/src/test/java/org/opensaml/core/OpenSAMLInitBaseTestCase.java
rename to opensaml-core/src/test/java/org/opensaml/core/testing/OpenSAMLInitBaseTestCase.java
index 913f492bc..ab215d9f7 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/OpenSAMLInitBaseTestCase.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/testing/OpenSAMLInitBaseTestCase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opensaml.core;
+package org.opensaml.core.testing;
import org.opensaml.core.config.InitializationException;
import org.opensaml.core.config.InitializationService;
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/XMLObjectBaseTestCase.java b/opensaml-core/src/test/java/org/opensaml/core/testing/XMLObjectBaseTestCase.java
similarity index 98%
rename from opensaml-core/src/test/java/org/opensaml/core/xml/XMLObjectBaseTestCase.java
rename to opensaml-core/src/test/java/org/opensaml/core/testing/XMLObjectBaseTestCase.java
index 1cbf81bd3..c2628bdb2 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/XMLObjectBaseTestCase.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/testing/XMLObjectBaseTestCase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opensaml.core.xml;
+package org.opensaml.core.testing;
import java.io.File;
import java.io.FileOutputStream;
@@ -24,7 +24,9 @@ import java.io.InputStream;
import javax.xml.namespace.QName;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.xml.XMLObject;
+import org.opensaml.core.xml.XMLObjectBuilder;
+import org.opensaml.core.xml.XMLObjectBuilderFactory;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.io.Marshaller;
import org.opensaml.core.xml.io.MarshallerFactory;
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/XMLObjectProviderBaseTestCase.java b/opensaml-core/src/test/java/org/opensaml/core/testing/XMLObjectProviderBaseTestCase.java
similarity index 99%
rename from opensaml-core/src/test/java/org/opensaml/core/xml/XMLObjectProviderBaseTestCase.java
rename to opensaml-core/src/test/java/org/opensaml/core/testing/XMLObjectProviderBaseTestCase.java
index 4fa240599..d6b94cc1f 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/XMLObjectProviderBaseTestCase.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/testing/XMLObjectProviderBaseTestCase.java
@@ -15,8 +15,9 @@
* limitations under the License.
*/
-package org.opensaml.core.xml;
+package org.opensaml.core.testing;
+import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.util.XMLObjectSupport;
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/config/XMLObjectProviderInitializerBaseTestCase.java b/opensaml-core/src/test/java/org/opensaml/core/testing/XMLObjectProviderInitializerBaseTestCase.java
similarity index 97%
rename from opensaml-core/src/test/java/org/opensaml/core/xml/config/XMLObjectProviderInitializerBaseTestCase.java
rename to opensaml-core/src/test/java/org/opensaml/core/testing/XMLObjectProviderInitializerBaseTestCase.java
index d33032048..9cf902fe0 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/config/XMLObjectProviderInitializerBaseTestCase.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/testing/XMLObjectProviderInitializerBaseTestCase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opensaml.core.xml.config;
+package org.opensaml.core.testing;
import org.testng.annotations.Test;
import org.testng.Assert;
@@ -24,7 +24,6 @@ import javax.xml.namespace.QName;
import org.opensaml.core.config.ConfigurationService;
import org.opensaml.core.config.InitializationException;
import org.opensaml.core.config.Initializer;
-import org.opensaml.core.config.InitializerBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistry;
/**
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/AbstractXMLObjectTest.java b/opensaml-core/src/test/java/org/opensaml/core/xml/AbstractXMLObjectTest.java
index 0fa2c34dc..c0e4e2b68 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/AbstractXMLObjectTest.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/xml/AbstractXMLObjectTest.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import javax.xml.namespace.QName;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.mock.SimpleXMLObject;
import org.opensaml.core.xml.util.XMLObjectSource;
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/ElementProxyTest.java b/opensaml-core/src/test/java/org/opensaml/core/xml/ElementProxyTest.java
index dce9c1b47..a37e5fc64 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/ElementProxyTest.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/xml/ElementProxyTest.java
@@ -21,7 +21,7 @@ import org.testng.annotations.Test;
import org.testng.Assert;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
-import org.opensaml.core.xml.XMLObject;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.io.Unmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/IDAttributeTest.java b/opensaml-core/src/test/java/org/opensaml/core/xml/IDAttributeTest.java
index c8f1b3414..2bda8742d 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/IDAttributeTest.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/xml/IDAttributeTest.java
@@ -27,7 +27,7 @@ import javax.xml.namespace.QName;
import net.shibboleth.utilities.java.support.xml.QNameSupport;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
-import org.opensaml.core.xml.XMLObject;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.io.Unmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/MarshallingTest.java b/opensaml-core/src/test/java/org/opensaml/core/xml/MarshallingTest.java
index 9babad1eb..839be70dd 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/MarshallingTest.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/xml/MarshallingTest.java
@@ -23,6 +23,7 @@ import javax.xml.namespace.QName;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.io.Marshaller;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.mock.SimpleXMLObject;
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/NamespaceManagerTest.java b/opensaml-core/src/test/java/org/opensaml/core/xml/NamespaceManagerTest.java
index 19b73daf2..a173f92f7 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/NamespaceManagerTest.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/xml/NamespaceManagerTest.java
@@ -29,10 +29,7 @@ import javax.xml.namespace.QName;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.xml.XMLConstants;
-import org.opensaml.core.xml.Namespace;
-import org.opensaml.core.xml.NamespaceManager;
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBuilder;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.schema.XSAny;
/**
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/UnmarshallingSecurityTest.java b/opensaml-core/src/test/java/org/opensaml/core/xml/UnmarshallingSecurityTest.java
index db597cba1..5324ffa0e 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/UnmarshallingSecurityTest.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/xml/UnmarshallingSecurityTest.java
@@ -17,6 +17,7 @@
package org.opensaml.core.xml;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.io.Unmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
import org.opensaml.core.xml.mock.SimpleXMLObject;
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/UnmarshallingTest.java b/opensaml-core/src/test/java/org/opensaml/core/xml/UnmarshallingTest.java
index 10a7b88ef..3e3ab0647 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/UnmarshallingTest.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/xml/UnmarshallingTest.java
@@ -19,6 +19,7 @@ package org.opensaml.core.xml;
import java.util.List;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.io.Unmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
import org.opensaml.core.xml.mock.SimpleXMLObject;
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/XMLObjectXSIAttribsTest.java b/opensaml-core/src/test/java/org/opensaml/core/xml/XMLObjectXSIAttribsTest.java
index 4adb2cae7..6bdb7b2b5 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/XMLObjectXSIAttribsTest.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/xml/XMLObjectXSIAttribsTest.java
@@ -23,6 +23,7 @@ import javax.xml.namespace.QName;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.io.Unmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
import org.opensaml.core.xml.mock.SimpleXMLObject;
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/config/ConfigurationTest.java b/opensaml-core/src/test/java/org/opensaml/core/xml/config/ConfigurationTest.java
index dba05b6f0..5677e408e 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/config/ConfigurationTest.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/xml/config/ConfigurationTest.java
@@ -35,9 +35,6 @@ import net.shibboleth.utilities.java.support.xml.XMLParserException;
import org.opensaml.core.config.ConfigurationService;
import org.opensaml.core.config.provider.ThreadLocalConfigurationPropertiesHolder;
import org.opensaml.core.xml.XMLObjectBuilder;
-import org.opensaml.core.xml.config.XMLConfigurationException;
-import org.opensaml.core.xml.config.XMLConfigurator;
-import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.io.Marshaller;
import org.opensaml.core.xml.io.Unmarshaller;
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/config/TestXMLObjectProviderInitializer.java b/opensaml-core/src/test/java/org/opensaml/core/xml/config/TestXMLObjectProviderInitializer.java
index 29598af64..102fe031a 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/config/TestXMLObjectProviderInitializer.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/xml/config/TestXMLObjectProviderInitializer.java
@@ -17,8 +17,6 @@
package org.opensaml.core.xml.config;
-import org.opensaml.core.xml.config.AbstractXMLObjectProviderInitializer;
-
/**
* XMLObject provider initializer for module "core", for testing classes only.
*/
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/config/XMLObjectProviderInitializerTest.java b/opensaml-core/src/test/java/org/opensaml/core/xml/config/XMLObjectProviderInitializerTest.java
index 189410951..dd68e12c8 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/config/XMLObjectProviderInitializerTest.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/xml/config/XMLObjectProviderInitializerTest.java
@@ -21,8 +21,7 @@ import javax.xml.namespace.QName;
import org.opensaml.core.config.ConfigurationService;
import org.opensaml.core.config.Initializer;
-import org.opensaml.core.xml.config.XMLObjectProviderInitializer;
-import org.opensaml.core.xml.config.XMLObjectProviderRegistry;
+import org.opensaml.core.testing.XMLObjectProviderInitializerBaseTestCase;
import org.opensaml.core.xml.schema.XSString;
/**
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/persist/FilesystemLoadSaveManagerTest.java b/opensaml-core/src/test/java/org/opensaml/core/xml/persist/FilesystemLoadSaveManagerTest.java
index f6378db30..a1777e909 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/persist/FilesystemLoadSaveManagerTest.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/xml/persist/FilesystemLoadSaveManagerTest.java
@@ -30,8 +30,8 @@ import java.util.concurrent.TimeUnit;
import javax.xml.namespace.QName;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLRuntimeException;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.mock.SimpleXMLObject;
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/persist/MapLoadSaveManagerTest.java b/opensaml-core/src/test/java/org/opensaml/core/xml/persist/MapLoadSaveManagerTest.java
index d6c3d9847..aa1a53859 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/persist/MapLoadSaveManagerTest.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/xml/persist/MapLoadSaveManagerTest.java
@@ -24,7 +24,7 @@ import java.util.NoSuchElementException;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.mock.SimpleXMLObject;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSBase64BinaryTest.java b/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSBase64BinaryTest.java
index 28e576ad4..21a28c5ce 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSBase64BinaryTest.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSBase64BinaryTest.java
@@ -24,13 +24,12 @@ import javax.xml.namespace.QName;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObjectBuilder;
import org.opensaml.core.xml.io.Marshaller;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.io.Unmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
-import org.opensaml.core.xml.schema.XSBase64Binary;
import org.w3c.dom.Document;
/**
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSBooleanTest.java b/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSBooleanTest.java
index ab23b61cc..f79d9bbd0 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSBooleanTest.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSBooleanTest.java
@@ -24,7 +24,7 @@ import javax.xml.namespace.QName;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObjectBuilder;
import org.opensaml.core.xml.io.Marshaller;
import org.opensaml.core.xml.io.MarshallingException;
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSDateTimeTest.java b/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSDateTimeTest.java
index 0cab0e91d..054f625a9 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSDateTimeTest.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSDateTimeTest.java
@@ -28,13 +28,12 @@ import javax.xml.namespace.QName;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObjectBuilder;
import org.opensaml.core.xml.io.Marshaller;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.io.Unmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
-import org.opensaml.core.xml.schema.XSDateTime;
import org.w3c.dom.Document;
/**
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSIntegerTest.java b/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSIntegerTest.java
index 74526f087..6d3372f38 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSIntegerTest.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSIntegerTest.java
@@ -24,13 +24,12 @@ import javax.xml.namespace.QName;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObjectBuilder;
import org.opensaml.core.xml.io.Marshaller;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.io.Unmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
-import org.opensaml.core.xml.schema.XSInteger;
import org.w3c.dom.Document;
/**
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSQNameTest.java b/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSQNameTest.java
index fb1d811cc..fd38937b6 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSQNameTest.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSQNameTest.java
@@ -24,13 +24,12 @@ import javax.xml.namespace.QName;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObjectBuilder;
import org.opensaml.core.xml.io.Marshaller;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.io.Unmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
-import org.opensaml.core.xml.schema.XSQName;
import org.w3c.dom.Document;
/**
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSStringTest.java b/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSStringTest.java
index b6fb9e7de..3032c74e8 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSStringTest.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSStringTest.java
@@ -24,13 +24,12 @@ import javax.xml.namespace.QName;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObjectBuilder;
import org.opensaml.core.xml.io.Marshaller;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.io.Unmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
-import org.opensaml.core.xml.schema.XSString;
import org.w3c.dom.Document;
/**
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSURITest.java b/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSURITest.java
index a04e84c92..8d03f2f28 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSURITest.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/xml/schema/XSURITest.java
@@ -24,13 +24,12 @@ import javax.xml.namespace.QName;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObjectBuilder;
import org.opensaml.core.xml.io.Marshaller;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.io.Unmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
-import org.opensaml.core.xml.schema.XSURI;
import org.w3c.dom.Document;
/**
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/util/AttributeMapTest.java b/opensaml-core/src/test/java/org/opensaml/core/xml/util/AttributeMapTest.java
index 065aa8fcc..9f00ec2d4 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/util/AttributeMapTest.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/xml/util/AttributeMapTest.java
@@ -28,13 +28,12 @@ import javax.xml.namespace.QName;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.AttributeExtensibleXMLObject;
import org.opensaml.core.xml.Namespace;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObjectBuilder;
import org.opensaml.core.xml.schema.XSAny;
-import org.opensaml.core.xml.util.AttributeMap;
/**
* Test the NamespaceManger used by XMLObjects.
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/util/IndexedXMLObjectChildrenListTest.java b/opensaml-core/src/test/java/org/opensaml/core/xml/util/IndexedXMLObjectChildrenListTest.java
index 7226196e6..acb6fc689 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/util/IndexedXMLObjectChildrenListTest.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/xml/util/IndexedXMLObjectChildrenListTest.java
@@ -26,7 +26,6 @@ import javax.xml.namespace.QName;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.mock.SimpleXMLObject;
import org.opensaml.core.xml.mock.SimpleXMLObjectBuilder;
-import org.opensaml.core.xml.util.IndexedXMLObjectChildrenList;
/**
* Test case for {@link org.opensaml.core.xml.util.IndexedXMLObjectChildrenList}. Note that this test only tests those
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/util/XMLObjectChildrenListTest.java b/opensaml-core/src/test/java/org/opensaml/core/xml/util/XMLObjectChildrenListTest.java
index 1800bcc20..278ed71a5 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/util/XMLObjectChildrenListTest.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/xml/util/XMLObjectChildrenListTest.java
@@ -26,7 +26,6 @@ import java.util.List;
import org.opensaml.core.xml.mock.SimpleXMLObject;
import org.opensaml.core.xml.mock.SimpleXMLObjectBuilder;
-import org.opensaml.core.xml.util.XMLObjectChildrenList;
/**
* Test case for {@link org.opensaml.core.xml.util.XMLObjectChildrenList}
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/util/XMLObjectSupportTest.java b/opensaml-core/src/test/java/org/opensaml/core/xml/util/XMLObjectSupportTest.java
index 75600836c..6c8509d46 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/util/XMLObjectSupportTest.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/xml/util/XMLObjectSupportTest.java
@@ -19,7 +19,7 @@ package org.opensaml.core.xml.util;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLRuntimeException;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.io.MarshallingException;
diff --git a/opensaml-messaging-impl/src/test/java/org/opensaml/messaging/handler/impl/SchemaValidateXMLMessageTest.java b/opensaml-messaging-impl/src/test/java/org/opensaml/messaging/handler/impl/SchemaValidateXMLMessageTest.java
index d8ead529a..d0790aa07 100644
--- a/opensaml-messaging-impl/src/test/java/org/opensaml/messaging/handler/impl/SchemaValidateXMLMessageTest.java
+++ b/opensaml-messaging-impl/src/test/java/org/opensaml/messaging/handler/impl/SchemaValidateXMLMessageTest.java
@@ -23,8 +23,8 @@ import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.handler.MessageHandlerException;
import net.shibboleth.utilities.java.support.xml.SchemaBuilder;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.core.xml.mock.SimpleXMLObject;
import org.opensaml.core.xml.mock.SimpleXMLObjectBuilder;
import org.opensaml.core.xml.util.XMLObjectSupport;
diff --git a/opensaml-parent/pom.xml b/opensaml-parent/pom.xml
index a4bea4c52..6bf7374c9 100644
--- a/opensaml-parent/pom.xml
+++ b/opensaml-parent/pom.xml
@@ -186,6 +186,7 @@
<archive>
<manifestEntries>
<Automatic-Module-Name>${automatic.module.name}</Automatic-Module-Name>
+ <Sealed>true</Sealed>
</manifestEntries>
</archive>
</configuration>
diff --git a/opensaml-profile-api/src/test/java/org/opensaml/profile/context/ProfileRequestContextTest.java b/opensaml-profile-api/src/test/java/org/opensaml/profile/context/ProfileRequestContextTest.java
index 62286272c..4771c55ab 100644
--- a/opensaml-profile-api/src/test/java/org/opensaml/profile/context/ProfileRequestContextTest.java
+++ b/opensaml-profile-api/src/test/java/org/opensaml/profile/context/ProfileRequestContextTest.java
@@ -17,7 +17,6 @@
package org.opensaml.profile.context;
-import org.opensaml.profile.context.ProfileRequestContext;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-profile-api/src/test/java/org/opensaml/profile/action/ActionTestingSupport.java b/opensaml-profile-api/src/test/java/org/opensaml/profile/testing/ActionTestingSupport.java
similarity index 96%
rename from opensaml-profile-api/src/test/java/org/opensaml/profile/action/ActionTestingSupport.java
rename to opensaml-profile-api/src/test/java/org/opensaml/profile/testing/ActionTestingSupport.java
index d2c3e8e5e..3c523fadd 100644
--- a/opensaml-profile-api/src/test/java/org/opensaml/profile/action/ActionTestingSupport.java
+++ b/opensaml-profile-api/src/test/java/org/opensaml/profile/testing/ActionTestingSupport.java
@@ -15,10 +15,11 @@
* limitations under the License.
*/
-package org.opensaml.profile.action;
+package org.opensaml.profile.testing;
import javax.annotation.Nonnull;
+import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.EventContext;
import org.opensaml.profile.context.ProfileRequestContext;
import org.testng.Assert;
diff --git a/opensaml-profile-api/src/test/java/org/opensaml/profile/RequestContextBuilder.java b/opensaml-profile-api/src/test/java/org/opensaml/profile/testing/RequestContextBuilder.java
similarity index 99%
rename from opensaml-profile-api/src/test/java/org/opensaml/profile/RequestContextBuilder.java
rename to opensaml-profile-api/src/test/java/org/opensaml/profile/testing/RequestContextBuilder.java
index 67a280b6a..c56906109 100644
--- a/opensaml-profile-api/src/test/java/org/opensaml/profile/RequestContextBuilder.java
+++ b/opensaml-profile-api/src/test/java/org/opensaml/profile/testing/RequestContextBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opensaml.profile;
+package org.opensaml.profile.testing;
import java.time.Instant;
diff --git a/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/DecodeMessageTest.java b/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/DecodeMessageTest.java
index f8b21fc44..3c65f873e 100644
--- a/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/DecodeMessageTest.java
+++ b/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/DecodeMessageTest.java
@@ -23,10 +23,10 @@ import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.decoder.AbstractMessageDecoder;
import org.opensaml.messaging.decoder.MessageDecoder;
import org.opensaml.messaging.decoder.MessageDecodingException;
-import org.opensaml.profile.action.ActionTestingSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.action.impl.DecodeMessage;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
diff --git a/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/EncodeMessageTest.java b/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/EncodeMessageTest.java
index c4929a2e0..3df254e74 100644
--- a/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/EncodeMessageTest.java
+++ b/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/EncodeMessageTest.java
@@ -29,10 +29,10 @@ import org.opensaml.messaging.decoder.MessageDecodingException;
import org.opensaml.messaging.encoder.AbstractMessageEncoder;
import org.opensaml.messaging.encoder.MessageEncoder;
import org.opensaml.messaging.encoder.MessageEncodingException;
-import org.opensaml.profile.action.ActionTestingSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.action.impl.EncodeMessage;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
diff --git a/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/PopulateClientTLSValidationParametersTest.java b/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/PopulateClientTLSValidationParametersTest.java
index 3ea8eb5a8..1f2ea34b9 100644
--- a/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/PopulateClientTLSValidationParametersTest.java
+++ b/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/PopulateClientTLSValidationParametersTest.java
@@ -24,11 +24,11 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.security.messaging.ClientTLSSecurityParametersContext;
import org.opensaml.security.x509.tls.ClientTLSValidationConfigurationCriterion;
import org.opensaml.security.x509.tls.ClientTLSValidationParameters;
diff --git a/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/PopulateDecryptionParametersTest.java b/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/PopulateDecryptionParametersTest.java
index 9493ba60c..75741ea8c 100644
--- a/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/PopulateDecryptionParametersTest.java
+++ b/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/PopulateDecryptionParametersTest.java
@@ -24,11 +24,11 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.xmlsec.DecryptionParameters;
import org.opensaml.xmlsec.DecryptionParametersResolver;
import org.opensaml.xmlsec.context.SecurityParametersContext;
diff --git a/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/PopulateSignatureValidationParametersTest.java b/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/PopulateSignatureValidationParametersTest.java
index 99516c521..f680f10b4 100644
--- a/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/PopulateSignatureValidationParametersTest.java
+++ b/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/PopulateSignatureValidationParametersTest.java
@@ -24,11 +24,11 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.xmlsec.SignatureValidationParameters;
import org.opensaml.xmlsec.SignatureValidationParametersResolver;
import org.opensaml.xmlsec.context.SecurityParametersContext;
diff --git a/opensaml-saml-api/src/test/java/org/opensaml/saml/saml1/profile/SAML1ActionTestingSupport.java b/opensaml-saml-api/src/test/java/org/opensaml/saml/saml1/testing/SAML1ActionTestingSupport.java
similarity index 98%
rename from opensaml-saml-api/src/test/java/org/opensaml/saml/saml1/profile/SAML1ActionTestingSupport.java
rename to opensaml-saml-api/src/test/java/org/opensaml/saml/saml1/testing/SAML1ActionTestingSupport.java
index b7e7e8e51..6669fe248 100644
--- a/opensaml-saml-api/src/test/java/org/opensaml/saml/saml1/profile/SAML1ActionTestingSupport.java
+++ b/opensaml-saml-api/src/test/java/org/opensaml/saml/saml1/testing/SAML1ActionTestingSupport.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opensaml.saml.saml1.profile;
+package org.opensaml.saml.saml1.testing;
import java.time.Instant;
@@ -23,7 +23,7 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
-import org.opensaml.profile.action.ActionTestingSupport;
+import org.opensaml.profile.testing.ActionTestingSupport;
import org.opensaml.saml.common.SAMLObjectBuilder;
import org.opensaml.saml.common.SAMLVersion;
import org.opensaml.saml.saml1.core.Assertion;
diff --git a/opensaml-saml-api/src/test/java/org/opensaml/saml/saml2/profile/SAML2ActionTestingSupport.java b/opensaml-saml-api/src/test/java/org/opensaml/saml/saml2/testing/SAML2ActionTestingSupport.java
similarity index 99%
rename from opensaml-saml-api/src/test/java/org/opensaml/saml/saml2/profile/SAML2ActionTestingSupport.java
rename to opensaml-saml-api/src/test/java/org/opensaml/saml/saml2/testing/SAML2ActionTestingSupport.java
index 67572276a..4e7fa527b 100644
--- a/opensaml-saml-api/src/test/java/org/opensaml/saml/saml2/profile/SAML2ActionTestingSupport.java
+++ b/opensaml-saml-api/src/test/java/org/opensaml/saml/saml2/testing/SAML2ActionTestingSupport.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opensaml.saml.saml2.profile;
+package org.opensaml.saml.saml2.testing;
import java.time.Instant;
import java.util.Set;
@@ -27,7 +27,7 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElemen
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
-import org.opensaml.profile.action.ActionTestingSupport;
+import org.opensaml.profile.testing.ActionTestingSupport;
import org.opensaml.saml.common.SAMLObjectBuilder;
import org.opensaml.saml.common.SAMLVersion;
import org.opensaml.saml.saml2.core.Artifact;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/BaseComplexSAMLObjectTestCase.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/BaseComplexSAMLObjectTestCase.java
index 571a9f81f..ee85cfcdb 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/BaseComplexSAMLObjectTestCase.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/BaseComplexSAMLObjectTestCase.java
@@ -17,7 +17,7 @@
package org.opensaml.saml.common;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import org.w3c.dom.Document;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/RoundTripTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/RoundTripTest.java
index 55fb9b254..7de3a2a1a 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/RoundTripTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/RoundTripTest.java
@@ -17,7 +17,7 @@
package org.opensaml.saml.common;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.io.Marshaller;
import org.opensaml.core.xml.io.MarshallingException;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMapTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMapTest.java
index 9b69cadef..e4b4ebbfa 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMapTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMapTest.java
@@ -20,7 +20,7 @@ package org.opensaml.saml.common.binding.artifact.impl;
import java.io.IOException;
import java.time.Duration;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.binding.artifact.SAMLArtifactMap.SAMLArtifactMapEntry;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMapEntryFactoryTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMapEntryFactoryTest.java
index 0a17527c5..fbbe7d8c4 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMapEntryFactoryTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMapEntryFactoryTest.java
@@ -25,7 +25,7 @@ import org.testng.Assert;
import org.w3c.dom.Element;
import org.xmlunit.builder.DiffBuilder;
import org.xmlunit.diff.Diff;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.binding.artifact.BasicSAMLArtifactMapEntry;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMapTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMapTest.java
index ea5bd7088..dbc5cefb9 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMapTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMapTest.java
@@ -20,7 +20,7 @@ package org.opensaml.saml.common.binding.artifact.impl;
import java.io.IOException;
import java.time.Duration;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.binding.artifact.SAMLArtifactMap.SAMLArtifactMapEntry;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/AddChannelBindingsHeaderHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/AddChannelBindingsHeaderHandlerTest.java
index 94e176330..7b45bb976 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/AddChannelBindingsHeaderHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/AddChannelBindingsHeaderHandlerTest.java
@@ -21,7 +21,7 @@ import java.util.List;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.messaging.context.MessageContext;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/CheckMessageVersionHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/CheckMessageVersionHandlerTest.java
index d8ef7d680..cf16113dd 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/CheckMessageVersionHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/CheckMessageVersionHandlerTest.java
@@ -19,14 +19,14 @@ package org.opensaml.saml.common.binding.impl;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.handler.MessageHandlerException;
import org.opensaml.saml.common.SAMLVersion;
import org.opensaml.saml.saml1.core.RequestAbstractType;
-import org.opensaml.saml.saml1.profile.SAML1ActionTestingSupport;
+import org.opensaml.saml.saml1.testing.SAML1ActionTestingSupport;
import org.opensaml.saml.saml2.core.AttributeQuery;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.testng.annotations.Test;
/** {@link CheckMessageVersionHandler} unit test. */
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/DefaultEndpointResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/DefaultEndpointResolverTest.java
index 57baf42b3..8fe5f46ef 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/DefaultEndpointResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/DefaultEndpointResolverTest.java
@@ -35,7 +35,7 @@ import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.io.Unmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
import org.opensaml.saml.common.xml.SAMLConstants;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/PopulateSignatureSigningParametersHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/PopulateSignatureSigningParametersHandlerTest.java
index c4100bf12..664a8aac8 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/PopulateSignatureSigningParametersHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/PopulateSignatureSigningParametersHandlerTest.java
@@ -19,13 +19,13 @@ package org.opensaml.saml.common.binding.impl;
import java.util.Collections;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
import org.opensaml.messaging.handler.MessageHandlerException;
-import org.opensaml.profile.RequestContextBuilder;
import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.profile.context.navigate.ParentProfileRequestContextLookup;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.xmlsec.SignatureSigningParameters;
import org.opensaml.xmlsec.SignatureSigningParametersResolver;
import org.opensaml.xmlsec.context.SecurityParametersContext;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/SAMLAddAttributeConsumingServiceHandleTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/SAMLAddAttributeConsumingServiceHandleTest.java
index f7ce9910f..a7791b7cd 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/SAMLAddAttributeConsumingServiceHandleTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/SAMLAddAttributeConsumingServiceHandleTest.java
@@ -19,7 +19,7 @@ package org.opensaml.saml.common.binding.impl;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.context.navigate.ParentContextLookup;
import org.opensaml.messaging.handler.MessageHandlerException;
@@ -27,11 +27,11 @@ import org.opensaml.saml.common.messaging.context.AttributeConsumingServiceConte
import org.opensaml.saml.common.messaging.context.SAMLMetadataContext;
import org.opensaml.saml.common.messaging.context.SAMLPeerEntityContext;
import org.opensaml.saml.saml1.core.AuthenticationStatement;
-import org.opensaml.saml.saml1.profile.SAML1ActionTestingSupport;
+import org.opensaml.saml.saml1.testing.SAML1ActionTestingSupport;
import org.opensaml.saml.saml2.core.AuthnRequest;
import org.opensaml.saml.saml2.metadata.AttributeConsumingService;
import org.opensaml.saml.saml2.metadata.SPSSODescriptor;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/SAMLMetadataLookupHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/SAMLMetadataLookupHandlerTest.java
index 0a0cbb33d..927d59d90 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/SAMLMetadataLookupHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/SAMLMetadataLookupHandlerTest.java
@@ -22,7 +22,7 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.util.function.Function;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.handler.MessageHandlerException;
import org.opensaml.saml.common.messaging.context.SAMLMetadataContext;
@@ -34,13 +34,13 @@ import org.opensaml.saml.metadata.resolver.impl.FilesystemMetadataResolver;
import org.opensaml.saml.metadata.resolver.impl.PredicateRoleDescriptorResolver;
import org.opensaml.saml.saml1.core.AttributeQuery;
import org.opensaml.saml.saml1.core.Request;
-import org.opensaml.saml.saml1.profile.SAML1ActionTestingSupport;
+import org.opensaml.saml.saml1.testing.SAML1ActionTestingSupport;
import org.opensaml.saml.saml2.core.AuthnRequest;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
import org.opensaml.saml.saml2.metadata.IDPSSODescriptor;
import org.opensaml.saml.saml2.metadata.RoleDescriptor;
import org.opensaml.saml.saml2.metadata.SPSSODescriptor;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/SAMLOutboundDestinationHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/SAMLOutboundDestinationHandlerTest.java
index ba9800edf..321d62d40 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/SAMLOutboundDestinationHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/SAMLOutboundDestinationHandlerTest.java
@@ -17,7 +17,7 @@
package org.opensaml.saml.common.binding.impl;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.handler.MessageHandlerException;
import org.opensaml.saml.common.SAMLObjectBuilder;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/EndpointURLSchemeSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/EndpointURLSchemeSecurityHandlerTest.java
index 3c19b1a6e..549b16dab 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/EndpointURLSchemeSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/EndpointURLSchemeSecurityHandlerTest.java
@@ -17,7 +17,7 @@
package org.opensaml.saml.common.binding.security.impl;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.handler.MessageHandlerException;
import org.opensaml.saml.common.messaging.context.SAMLEndpointContext;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/InResponseToSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/InResponseToSecurityHandlerTest.java
index 7a99f276e..56a529239 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/InResponseToSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/InResponseToSecurityHandlerTest.java
@@ -17,7 +17,7 @@
package org.opensaml.saml.common.binding.security.impl;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.messaging.context.InOutOperationContext;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.handler.MessageHandlerException;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/MessageLifetimeSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/MessageLifetimeSecurityHandlerTest.java
index d28e6e14e..517ca852c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/MessageLifetimeSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/MessageLifetimeSecurityHandlerTest.java
@@ -20,7 +20,7 @@ package org.opensaml.saml.common.binding.security.impl;
import java.time.Duration;
import java.time.Instant;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.handler.MessageHandlerException;
import org.opensaml.saml.common.messaging.context.SAMLMessageInfoContext;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/MessageReplaySecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/MessageReplaySecurityHandlerTest.java
index b5a85bb63..fab5ef4ad 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/MessageReplaySecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/MessageReplaySecurityHandlerTest.java
@@ -21,7 +21,7 @@ import net.shibboleth.utilities.java.support.component.ComponentInitializationEx
import java.time.Duration;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.handler.MessageHandlerException;
import org.opensaml.saml.common.messaging.context.SAMLMessageInfoContext;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandlerTest.java
index e851b5470..453c264da 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandlerTest.java
@@ -22,7 +22,7 @@ import java.net.URL;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.messaging.MessageException;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.handler.MessageHandlerException;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLMDClientCertAuthSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLMDClientCertAuthSecurityHandlerTest.java
index 10a3254bd..1774078f1 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLMDClientCertAuthSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLMDClientCertAuthSecurityHandlerTest.java
@@ -24,7 +24,7 @@ import java.util.List;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.handler.MessageHandlerException;
import org.opensaml.saml.common.messaging.context.SAMLPeerEntityContext;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLOutboundProtocolMessageSigningHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLOutboundProtocolMessageSigningHandlerTest.java
index 5ae3daac3..33779865b 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLOutboundProtocolMessageSigningHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLOutboundProtocolMessageSigningHandlerTest.java
@@ -24,7 +24,7 @@ import java.time.Instant;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.handler.MessageHandlerException;
import org.opensaml.saml.saml2.core.Issuer;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLProtocolMessageXMLSignatureSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLProtocolMessageXMLSignatureSecurityHandlerTest.java
index 2abe07ff1..73a3e0963 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLProtocolMessageXMLSignatureSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLProtocolMessageXMLSignatureSecurityHandlerTest.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.handler.MessageHandlerException;
import org.opensaml.saml.common.SAMLTestSupport;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/messaging/context/SAMLMessageInfoContextTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/messaging/context/SAMLMessageInfoContextTest.java
index fb2a0601e..3525e4d17 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/messaging/context/SAMLMessageInfoContextTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/messaging/context/SAMLMessageInfoContextTest.java
@@ -19,7 +19,7 @@ package org.opensaml.saml.common.messaging.context;
import java.time.Instant;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.context.TestContext;
import org.opensaml.saml.saml1.core.Request;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddAudienceRestrictionToAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddAudienceRestrictionToAssertionsTest.java
index 2610b208e..e67165a8a 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddAudienceRestrictionToAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddAudienceRestrictionToAssertionsTest.java
@@ -22,20 +22,20 @@ import net.shibboleth.utilities.java.support.logic.FunctionSupport;
import java.util.List;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.saml.common.SAMLObjectBuilder;
import org.opensaml.saml.saml1.core.Assertion;
import org.opensaml.saml.saml1.core.AudienceRestrictionCondition;
import org.opensaml.saml.saml1.core.Conditions;
import org.opensaml.saml.saml1.core.Response;
-import org.opensaml.saml.saml1.profile.SAML1ActionTestingSupport;
+import org.opensaml.saml.saml1.testing.SAML1ActionTestingSupport;
import org.opensaml.saml.saml2.core.AudienceRestriction;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponseTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponseTest.java
index 769d5e880..2cdccf640 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponseTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponseTest.java
@@ -19,16 +19,16 @@ package org.opensaml.saml.common.profile.impl;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.saml.saml1.core.RequestAbstractType;
import org.opensaml.saml.saml1.core.Response;
-import org.opensaml.saml.saml1.profile.SAML1ActionTestingSupport;
+import org.opensaml.saml.saml1.testing.SAML1ActionTestingSupport;
import org.opensaml.saml.saml2.core.LogoutResponse;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddNotBeforeConditionToAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddNotBeforeConditionToAssertionsTest.java
index d181e0818..7087a789f 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddNotBeforeConditionToAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddNotBeforeConditionToAssertionsTest.java
@@ -19,18 +19,18 @@ package org.opensaml.saml.common.profile.impl;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.saml.common.SAMLObjectBuilder;
import org.opensaml.saml.saml1.core.Assertion;
import org.opensaml.saml.saml1.core.Conditions;
import org.opensaml.saml.saml1.core.Response;
-import org.opensaml.saml.saml1.profile.SAML1ActionTestingSupport;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml1.testing.SAML1ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddNotOnOrAfterConditionToAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddNotOnOrAfterConditionToAssertionsTest.java
index 678d63436..f257489a7 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddNotOnOrAfterConditionToAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddNotOnOrAfterConditionToAssertionsTest.java
@@ -22,18 +22,18 @@ import net.shibboleth.utilities.java.support.logic.FunctionSupport;
import java.time.Duration;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.saml.common.SAMLObjectBuilder;
import org.opensaml.saml.saml1.core.Assertion;
import org.opensaml.saml.saml1.core.Conditions;
import org.opensaml.saml.saml1.core.Response;
-import org.opensaml.saml.saml1.profile.SAML1ActionTestingSupport;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml1.testing.SAML1ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/PopulateSignatureSigningParametersTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/PopulateSignatureSigningParametersTest.java
index 0dbc43880..0c1fa818c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/PopulateSignatureSigningParametersTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/PopulateSignatureSigningParametersTest.java
@@ -24,13 +24,13 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.profile.context.navigate.OutboundMessageContextLookup;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.xmlsec.SignatureSigningParameters;
import org.opensaml.xmlsec.SignatureSigningParametersResolver;
import org.opensaml.xmlsec.context.SecurityParametersContext;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/SignAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/SignAssertionsTest.java
index 774dcedad..a4a9c8bc5 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/SignAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/SignAssertionsTest.java
@@ -21,13 +21,13 @@ import java.security.KeyPair;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
-import org.opensaml.saml.saml1.profile.SAML1ActionTestingSupport;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
+import org.opensaml.saml.saml1.testing.SAML1ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.opensaml.security.credential.CredentialSupport;
import org.opensaml.security.crypto.KeySupport;
import org.opensaml.xmlsec.SignatureSigningParameters;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/VerifyChannelBindingsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/VerifyChannelBindingsTest.java
index ec6a52b1b..dba88d763 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/VerifyChannelBindingsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/VerifyChannelBindingsTest.java
@@ -19,12 +19,12 @@ package org.opensaml.saml.common.profile.impl;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.messaging.handler.MessageHandlerException;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.saml.common.messaging.context.ChannelBindingsContext;
import org.opensaml.saml.common.profile.SAMLEventIds;
import org.opensaml.saml.ext.saml2cb.ChannelBindings;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicateTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicateTest.java
index 607868ee0..0448efb40 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicateTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicateTest.java
@@ -24,7 +24,7 @@ import net.shibboleth.ext.spring.resource.ResourceHelper;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import org.opensaml.core.criterion.EntityIdCriterion;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.saml.common.profile.logic.EntityAttributesPredicate.Candidate;
import org.opensaml.saml.metadata.resolver.impl.ResourceBackedMetadataResolver;
import org.opensaml.saml.saml2.core.Attribute;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/logic/EntityGroupNamePredicateTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/logic/EntityGroupNamePredicateTest.java
index 283c0000f..6275d474d 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/logic/EntityGroupNamePredicateTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/logic/EntityGroupNamePredicateTest.java
@@ -24,7 +24,7 @@ import net.shibboleth.ext.spring.resource.ResourceHelper;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import org.opensaml.core.criterion.EntityIdCriterion;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.saml.metadata.resolver.filter.MetadataNodeProcessor;
import org.opensaml.saml.metadata.resolver.filter.impl.EntitiesDescriptorNameProcessor;
import org.opensaml.saml.metadata.resolver.filter.impl.NodeProcessingMetadataFilter;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/config/impl/XMLObjectProviderInitializerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/config/impl/XMLObjectProviderInitializerTest.java
index ab1d9e9bb..e9ae297ef 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/config/impl/XMLObjectProviderInitializerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/config/impl/XMLObjectProviderInitializerTest.java
@@ -20,7 +20,7 @@ package org.opensaml.saml.config.impl;
import javax.xml.namespace.QName;
import org.opensaml.core.config.Initializer;
-import org.opensaml.core.xml.config.XMLObjectProviderInitializerBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderInitializerBaseTestCase;
import org.opensaml.saml.ext.idpdisco.DiscoveryResponse;
import org.opensaml.saml.ext.saml1md.SourceID;
import org.opensaml.saml.ext.saml2delrestrict.Delegate;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/idpdisco/impl/DiscoveryResponseTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/idpdisco/impl/DiscoveryResponseTest.java
index 321a8634a..490f9495b 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/idpdisco/impl/DiscoveryResponseTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/idpdisco/impl/DiscoveryResponseTest.java
@@ -20,8 +20,8 @@ package org.opensaml.saml.ext.idpdisco.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.schema.XSBooleanValue;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.ext.idpdisco.DiscoveryResponse;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/reqattr/impl/RequestedAttributesTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/reqattr/impl/RequestedAttributesTest.java
index 105eeacec..61895ccf3 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/reqattr/impl/RequestedAttributesTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/reqattr/impl/RequestedAttributesTest.java
@@ -19,7 +19,7 @@ package org.opensaml.saml.ext.reqattr.impl;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.ext.reqattr.RequestedAttributes;
import org.opensaml.saml.saml2.metadata.RequestedAttribute;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml1md/impl/SourceIDTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml1md/impl/SourceIDTest.java
index 05f857205..2554c7f84 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml1md/impl/SourceIDTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml1md/impl/SourceIDTest.java
@@ -20,7 +20,7 @@ package org.opensaml.saml.ext.saml1md.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.SAMLObjectBuilder;
import org.opensaml.saml.ext.saml1md.SourceID;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2alg/impl/DigestMethodTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2alg/impl/DigestMethodTest.java
index 8723dd98c..bacb9108a 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2alg/impl/DigestMethodTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2alg/impl/DigestMethodTest.java
@@ -17,7 +17,7 @@
package org.opensaml.saml.ext.saml2alg.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.mock.SimpleXMLObject;
import org.opensaml.saml.ext.saml2alg.DigestMethod;
import org.opensaml.xmlsec.signature.support.SignatureConstants;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2alg/impl/SigningMethodTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2alg/impl/SigningMethodTest.java
index c628a0169..9f5f2870e 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2alg/impl/SigningMethodTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2alg/impl/SigningMethodTest.java
@@ -17,7 +17,7 @@
package org.opensaml.saml.ext.saml2alg.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.mock.SimpleXMLObject;
import org.opensaml.saml.ext.saml2alg.SigningMethod;
import org.opensaml.xmlsec.signature.support.SignatureConstants;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2aslo/impl/AsynchronousTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2aslo/impl/AsynchronousTest.java
index b2b5424b8..e214d9f9c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2aslo/impl/AsynchronousTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2aslo/impl/AsynchronousTest.java
@@ -20,7 +20,7 @@
*/
package org.opensaml.saml.ext.saml2aslo.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.ext.saml2aslo.Asynchronous;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2cb/impl/ChannelBindingsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2cb/impl/ChannelBindingsTest.java
index c2202fee9..b219663f0 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2cb/impl/ChannelBindingsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2cb/impl/ChannelBindingsTest.java
@@ -17,7 +17,7 @@
package org.opensaml.saml.ext.saml2cb.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.ext.saml2cb.ChannelBindings;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateTest.java
index 2fce85107..1a1dc15b6 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateTest.java
@@ -23,7 +23,7 @@ import org.testng.Assert;
import java.time.Instant;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.ext.saml2delrestrict.Delegate;
import org.opensaml.saml.saml2.core.NameID;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegationRestrictionTypeTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegationRestrictionTypeTest.java
index 40cb6c543..af1fb68fd 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegationRestrictionTypeTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegationRestrictionTypeTest.java
@@ -20,8 +20,8 @@ package org.opensaml.saml.ext.saml2delrestrict.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.SAMLObjectBuilder;
import org.opensaml.saml.ext.saml2delrestrict.Delegate;
import org.opensaml.saml.ext.saml2delrestrict.DelegationRestrictionType;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdattr/impl/EntityAttributesTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdattr/impl/EntityAttributesTest.java
index 356369413..eb086faaa 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdattr/impl/EntityAttributesTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdattr/impl/EntityAttributesTest.java
@@ -22,7 +22,7 @@ import org.testng.Assert;
import java.time.Instant;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.ext.saml2mdattr.EntityAttributes;
import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.Attribute;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdreqinit/impl/RequestInitiatorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdreqinit/impl/RequestInitiatorTest.java
index e492e6ca6..8b004b6d9 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdreqinit/impl/RequestInitiatorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdreqinit/impl/RequestInitiatorTest.java
@@ -21,7 +21,7 @@
package org.opensaml.saml.ext.saml2mdreqinit.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.ext.saml2mdreqinit.RequestInitiator;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoTest.java
index aa7dba92e..7fb543345 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoTest.java
@@ -19,7 +19,7 @@ package org.opensaml.saml.ext.saml2mdrpi.impl;
import java.time.Instant;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.ext.saml2mdrpi.PublicationInfo;
import org.opensaml.saml.ext.saml2mdrpi.UsagePolicy;
import org.testng.Assert;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationPathTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationPathTest.java
index 99dc13ec7..2f1c7cb50 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationPathTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationPathTest.java
@@ -17,7 +17,7 @@
package org.opensaml.saml.ext.saml2mdrpi.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.ext.saml2mdrpi.Publication;
import org.opensaml.saml.ext.saml2mdrpi.PublicationPath;
import org.testng.Assert;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationTest.java
index 89c9bcc44..83d188267 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationTest.java
@@ -19,7 +19,7 @@ package org.opensaml.saml.ext.saml2mdrpi.impl;
import java.time.Instant;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.ext.saml2mdrpi.Publication;
import org.testng.Assert;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoTest.java
index 0ae59e4cc..0e0f45462 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoTest.java
@@ -19,7 +19,7 @@ package org.opensaml.saml.ext.saml2mdrpi.impl;
import java.time.Instant;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.ext.saml2mdrpi.RegistrationInfo;
import org.opensaml.saml.ext.saml2mdrpi.RegistrationPolicy;
import org.testng.Assert;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationPolicyTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationPolicyTest.java
index 40698d25f..a6d6d2ea8 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationPolicyTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationPolicyTest.java
@@ -17,8 +17,8 @@
package org.opensaml.saml.ext.saml2mdrpi.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.testng.Assert;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.ext.saml2mdrpi.RegistrationPolicy;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdrpi/impl/UsagePolicyTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdrpi/impl/UsagePolicyTest.java
index b84d97961..f8a637826 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdrpi/impl/UsagePolicyTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdrpi/impl/UsagePolicyTest.java
@@ -17,8 +17,8 @@
package org.opensaml.saml.ext.saml2mdrpi.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.testng.Assert;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.ext.saml2mdrpi.UsagePolicy;
public class UsagePolicyTest extends XMLObjectProviderBaseTestCase {
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/DescriptionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/DescriptionTest.java
index 1b6f36378..477b1df36 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/DescriptionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/DescriptionTest.java
@@ -22,8 +22,7 @@ package org.opensaml.saml.ext.saml2mdui.impl;
import org.testng.annotations.Test;
import org.testng.Assert;
-
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.ext.saml2mdui.Description;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/DiscoHintsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/DiscoHintsTest.java
index 99b64af35..ad58379eb 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/DiscoHintsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/DiscoHintsTest.java
@@ -22,9 +22,8 @@ package org.opensaml.saml.ext.saml2mdui.impl;
import org.testng.annotations.Test;
import org.testng.Assert;
-
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.mock.SimpleXMLObject;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.ext.saml2mdui.DiscoHints;
import org.opensaml.saml.ext.saml2mdui.DomainHint;
import org.opensaml.saml.ext.saml2mdui.GeolocationHint;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/DisplayNameTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/DisplayNameTest.java
index efe0cc817..e38805337 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/DisplayNameTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/DisplayNameTest.java
@@ -22,8 +22,7 @@ package org.opensaml.saml.ext.saml2mdui.impl;
import org.testng.annotations.Test;
import org.testng.Assert;
-
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.ext.saml2mdui.DisplayName;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintTest.java
index ab76f1f76..c971753d0 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintTest.java
@@ -23,8 +23,7 @@ package org.opensaml.saml.ext.saml2mdui.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.ext.saml2mdui.DomainHint;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintTest.java
index ab34304e5..7e9ab87b1 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintTest.java
@@ -23,8 +23,7 @@ package org.opensaml.saml.ext.saml2mdui.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.ext.saml2mdui.GeolocationHint;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintTest.java
index fe67c1c0d..3615deff1 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintTest.java
@@ -23,8 +23,7 @@ package org.opensaml.saml.ext.saml2mdui.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.ext.saml2mdui.IPHint;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/InformationURLTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/InformationURLTest.java
index 546d5f570..80843a3b9 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/InformationURLTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/InformationURLTest.java
@@ -22,8 +22,7 @@ package org.opensaml.saml.ext.saml2mdui.impl;
import org.testng.annotations.Test;
import org.testng.Assert;
-
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.ext.saml2mdui.InformationURL;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/KeywordsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/KeywordsTest.java
index 5e584c185..a425d8e0d 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/KeywordsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/KeywordsTest.java
@@ -26,7 +26,7 @@ import static org.testng.Assert.assertNotEquals;
import java.util.ArrayList;
import java.util.List;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.ext.saml2mdui.Keywords;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/LogoTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/LogoTest.java
index fc8f9d2e4..0f7158a1f 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/LogoTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/LogoTest.java
@@ -22,8 +22,7 @@ package org.opensaml.saml.ext.saml2mdui.impl;
import org.testng.annotations.Test;
import org.testng.Assert;
-
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.ext.saml2mdui.Logo;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/PrivacyStatementURLTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/PrivacyStatementURLTest.java
index 9c4176357..36a139a5e 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/PrivacyStatementURLTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/PrivacyStatementURLTest.java
@@ -22,8 +22,7 @@ package org.opensaml.saml.ext.saml2mdui.impl;
import org.testng.annotations.Test;
import org.testng.Assert;
-
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.ext.saml2mdui.PrivacyStatementURL;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/UIInfoTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/UIInfoTest.java
index a73359412..ce9078d79 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/UIInfoTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/saml2mdui/impl/UIInfoTest.java
@@ -22,9 +22,8 @@ package org.opensaml.saml.ext.saml2mdui.impl;
import org.testng.annotations.Test;
import org.testng.Assert;
-
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.mock.SimpleXMLObject;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.ext.saml2mdui.Description;
import org.opensaml.saml.ext.saml2mdui.DisplayName;
import org.opensaml.saml.ext.saml2mdui.InformationURL;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/samlec/impl/EncTypeTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/samlec/impl/EncTypeTest.java
index b8ce30ed0..99fb30b93 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/samlec/impl/EncTypeTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/samlec/impl/EncTypeTest.java
@@ -17,7 +17,7 @@
package org.opensaml.saml.ext.samlec.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.ext.samlec.EncType;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/samlec/impl/GeneratedKeyTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/samlec/impl/GeneratedKeyTest.java
index d3621ff0c..e54030a2e 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/samlec/impl/GeneratedKeyTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/samlec/impl/GeneratedKeyTest.java
@@ -17,7 +17,7 @@
package org.opensaml.saml.ext.samlec.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.ext.samlec.GeneratedKey;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/samlec/impl/SessionKeyTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/samlec/impl/SessionKeyTest.java
index c83c84db9..aaf0e10af 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/samlec/impl/SessionKeyTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/ext/samlec/impl/SessionKeyTest.java
@@ -17,7 +17,7 @@
package org.opensaml.saml.ext.samlec.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.ext.samlec.EncType;
import org.opensaml.saml.ext.samlec.SessionKey;
import org.testng.Assert;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/AlgorithmFilterTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/AlgorithmFilterTest.java
index 6340d7ac3..72cad1e7b 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/AlgorithmFilterTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/AlgorithmFilterTest.java
@@ -32,8 +32,8 @@ import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
import org.opensaml.core.criterion.EntityIdCriterion;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.saml.ext.saml2alg.DigestMethod;
import org.opensaml.saml.ext.saml2alg.SigningMethod;
import org.opensaml.saml.metadata.resolver.impl.FilesystemMetadataResolver;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/BasicDynamicTrustedNamesStrategyTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/BasicDynamicTrustedNamesStrategyTest.java
index 7d3fad671..90f2dd8dc 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/BasicDynamicTrustedNamesStrategyTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/BasicDynamicTrustedNamesStrategyTest.java
@@ -19,8 +19,8 @@ package org.opensaml.saml.metadata.resolver.filter.impl;
import java.util.Set;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.saml.saml2.metadata.AffiliationDescriptor;
import org.opensaml.saml.saml2.metadata.EntitiesDescriptor;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/ByReferenceMetadataFilterTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/ByReferenceMetadataFilterTest.java
index 5e43aaf05..6d74af78b 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/ByReferenceMetadataFilterTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/ByReferenceMetadataFilterTest.java
@@ -26,7 +26,7 @@ import java.util.Collections;
import java.util.function.Predicate;
import org.opensaml.core.criterion.EntityIdCriterion;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.metadata.resolver.MetadataResolver;
import org.opensaml.saml.metadata.resolver.impl.FilesystemMetadataResolver;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntitiesDescriptorNameProcessorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntitiesDescriptorNameProcessorTest.java
index 0d3282ee0..08cc4c2fa 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntitiesDescriptorNameProcessorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntitiesDescriptorNameProcessorTest.java
@@ -26,7 +26,7 @@ import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
import org.opensaml.core.criterion.EntityIdCriterion;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.saml.metadata.EntityGroupName;
import org.opensaml.saml.metadata.resolver.filter.MetadataNodeProcessor;
import org.opensaml.saml.metadata.resolver.impl.FilesystemMetadataResolver;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityAttributesFilterTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityAttributesFilterTest.java
index 1bb0872cc..ea1aafaa4 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityAttributesFilterTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityAttributesFilterTest.java
@@ -29,8 +29,8 @@ import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
import org.opensaml.core.criterion.EntityIdCriterion;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObjectBuilder;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.schema.XSString;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityRoleFilterTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityRoleFilterTest.java
index 182cfe245..f363d147d 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityRoleFilterTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityRoleFilterTest.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import javax.xml.namespace.QName;
import org.apache.http.client.HttpClient;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.saml.metadata.resolver.impl.HTTPMetadataResolver;
import org.opensaml.saml.metadata.resolver.impl.HTTPMetadataResolverTest;
import org.opensaml.saml.saml2.metadata.AttributeAuthorityDescriptor;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/NameIDFormatFilterTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/NameIDFormatFilterTest.java
index 6dc9c87a4..ffb438624 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/NameIDFormatFilterTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/NameIDFormatFilterTest.java
@@ -30,7 +30,7 @@ import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
import org.opensaml.core.criterion.EntityIdCriterion;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.metadata.resolver.impl.FilesystemMetadataResolver;
import org.opensaml.saml.metadata.resolver.impl.FilesystemMetadataResolverTest;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/NodeProcessingMetadataFilterTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/NodeProcessingMetadataFilterTest.java
index 022468ca2..c1dec7dd5 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/NodeProcessingMetadataFilterTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/NodeProcessingMetadataFilterTest.java
@@ -24,8 +24,8 @@ import java.util.List;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.saml.metadata.resolver.filter.FilterException;
import org.opensaml.saml.metadata.resolver.filter.MetadataNodeProcessor;
import org.opensaml.saml.metadata.resolver.impl.FilesystemMetadataResolver;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/PredicateFilterTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/PredicateFilterTest.java
index ffe23fe5c..378ca2c88 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/PredicateFilterTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/PredicateFilterTest.java
@@ -23,7 +23,7 @@ import net.shibboleth.ext.spring.resource.ResourceHelper;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import org.opensaml.core.criterion.EntityIdCriterion;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.saml.common.profile.logic.EntityIdPredicate;
import org.opensaml.saml.metadata.resolver.filter.impl.PredicateFilter.Direction;
import org.opensaml.saml.metadata.resolver.impl.ResourceBackedMetadataResolver;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/RequiredValidUntilTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/RequiredValidUntilTest.java
index 37f0c7671..e74f3d135 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/RequiredValidUntilTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/RequiredValidUntilTest.java
@@ -24,7 +24,7 @@ import java.time.Instant;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.saml.common.SAMLObjectBuilder;
import org.opensaml.saml.metadata.resolver.filter.MetadataFilterContext;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SchemaValidationFilterTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SchemaValidationFilterTest.java
index c802c50a8..8e53d696c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SchemaValidationFilterTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SchemaValidationFilterTest.java
@@ -17,7 +17,7 @@
package org.opensaml.saml.metadata.resolver.filter.impl;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.saml.common.xml.SAMLSchemaBuilder;
import org.opensaml.saml.common.xml.SAMLSchemaBuilder.SAML1Version;
import org.opensaml.saml.metadata.resolver.impl.ResourceBackedMetadataResolver;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/ScriptedFunctionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/ScriptedFunctionTest.java
index cfa201fdf..51f16a7eb 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/ScriptedFunctionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/ScriptedFunctionTest.java
@@ -27,8 +27,8 @@ import net.shibboleth.ext.spring.resource.ResourceHelper;
import net.shibboleth.utilities.java.support.resource.Resource;
import net.shibboleth.utilities.java.support.testing.TestSupport;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.saml.common.SAMLObjectBuilder;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilterExplicitKeyTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilterExplicitKeyTest.java
index f8b73f3de..5a32bb6eb 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilterExplicitKeyTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilterExplicitKeyTest.java
@@ -25,8 +25,8 @@ import net.shibboleth.utilities.java.support.component.ComponentInitializationEx
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.core.xml.io.UnmarshallingException;
import org.opensaml.saml.metadata.resolver.filter.FilterException;
import org.opensaml.saml.metadata.resolver.filter.MetadataFilterContext;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilterPKIXTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilterPKIXTest.java
index bf1378289..76709c309 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilterPKIXTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilterPKIXTest.java
@@ -25,8 +25,8 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.io.UnmarshallingException;
import org.opensaml.core.xml.util.XMLObjectSupport;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolverTest.java
index c4b3a2d81..a095bae19 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolverTest.java
@@ -28,8 +28,8 @@ import org.apache.http.entity.ByteArrayEntity;
import org.apache.http.message.BasicHeader;
import org.apache.http.message.BasicHttpResponse;
import org.opensaml.core.criterion.EntityIdCriterion;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.core.xml.util.XMLObjectSource;
import org.opensaml.core.xml.util.XMLObjectSupport;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolverTest.java
index a1b075c7f..a3085e1d7 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolverTest.java
@@ -35,8 +35,8 @@ import java.util.function.Function;
import java.util.function.Predicate;
import org.opensaml.core.criterion.EntityIdCriterion;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.persist.MapLoadSaveManager;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ChainingMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ChainingMetadataResolverTest.java
index d8f7886a1..3f28095ef 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ChainingMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ChainingMetadataResolverTest.java
@@ -25,7 +25,7 @@ import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
import org.opensaml.core.criterion.EntityIdCriterion;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.saml.common.xml.SAMLSchemaBuilder;
import org.opensaml.saml.common.xml.SAMLSchemaBuilder.SAML1Version;
import org.opensaml.saml.metadata.resolver.ChainingMetadataResolver;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/DOMMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/DOMMetadataResolverTest.java
index 3b1095004..1a58b52c2 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/DOMMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/DOMMetadataResolverTest.java
@@ -29,7 +29,7 @@ import net.shibboleth.utilities.java.support.resolver.ResolverException;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
import org.opensaml.core.criterion.EntityIdCriterion;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java
index 63cab72fd..14cfbed39 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java
@@ -27,8 +27,8 @@ import java.time.Duration;
import java.time.Instant;
import org.opensaml.core.criterion.EntityIdCriterion;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.saml.metadata.resolver.filter.FilterException;
import org.opensaml.saml.metadata.resolver.filter.MetadataFilter;
import org.opensaml.saml.metadata.resolver.filter.MetadataFilterContext;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FilesystemMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FilesystemMetadataResolverTest.java
index e2938a548..b56893b14 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FilesystemMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FilesystemMetadataResolverTest.java
@@ -27,7 +27,7 @@ import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
import org.opensaml.core.criterion.EntityIdCriterion;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java
index b7a30ae1e..a45c82a3b 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java
@@ -23,7 +23,7 @@ import java.util.Arrays;
import java.util.Collections;
import org.opensaml.core.criterion.EntityIdCriterion;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.saml.common.binding.artifact.SAMLSourceIDArtifact;
import org.opensaml.saml.criterion.ArtifactCriterion;
import org.opensaml.saml.metadata.resolver.impl.TemplateRequestURLBuilder.EncodingStyle;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java
index 2cc20642e..d114e9745 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java
@@ -27,7 +27,7 @@ import java.util.Set;
import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
import org.opensaml.core.criterion.EntityIdCriterion;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
import org.opensaml.security.credential.impl.StaticCredentialResolver;
import org.opensaml.security.httpclient.HttpClientSecurityParameters;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/LocalDynamicMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/LocalDynamicMetadataResolverTest.java
index 7efd0539b..38a72e04a 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/LocalDynamicMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/LocalDynamicMetadataResolverTest.java
@@ -23,8 +23,8 @@ import java.time.Duration;
import java.util.concurrent.TimeUnit;
import org.opensaml.core.criterion.EntityIdCriterion;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.core.xml.persist.MapLoadSaveManager;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
import org.opensaml.security.crypto.JCAConstants;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/PredicateFilteringTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/PredicateFilteringTest.java
index 5efc6a820..f3892c2d1 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/PredicateFilteringTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/PredicateFilteringTest.java
@@ -22,7 +22,7 @@ import java.net.URL;
import java.util.Set;
import org.opensaml.core.criterion.EntityIdCriterion;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.saml.criterion.EntityRoleCriterion;
import org.opensaml.saml.metadata.criteria.entity.impl.EvaluableEntityRoleEntityDescriptorCriterion;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/PredicateRoleDescriptorResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/PredicateRoleDescriptorResolverTest.java
index 9add59eb2..8998959f4 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/PredicateRoleDescriptorResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/PredicateRoleDescriptorResolverTest.java
@@ -22,7 +22,7 @@ import java.util.List;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.criterion.EntityRoleCriterion;
import org.opensaml.saml.criterion.ProtocolCriterion;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolverTest.java
index 9f0dcd549..04648ba0c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolverTest.java
@@ -28,7 +28,7 @@ import net.shibboleth.utilities.java.support.resolver.ResolverException;
import net.shibboleth.utilities.java.support.resource.Resource;
import org.opensaml.core.criterion.EntityIdCriterion;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
import org.springframework.core.io.FileSystemResource;
import org.testng.Assert;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/EndpointMetadataIndexTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/EndpointMetadataIndexTest.java
index 0a6d1b764..4a90be82d 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/EndpointMetadataIndexTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/EndpointMetadataIndexTest.java
@@ -27,7 +27,7 @@ import java.util.function.Predicate;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.util.XMLObjectSupport;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.criterion.EndpointCriterion;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/FunctionDrivenMetadataIndexTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/FunctionDrivenMetadataIndexTest.java
index cc55fe778..2736601e3 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/FunctionDrivenMetadataIndexTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/FunctionDrivenMetadataIndexTest.java
@@ -21,7 +21,7 @@ import java.util.Set;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.util.XMLObjectSupport;
import org.opensaml.saml.metadata.resolver.index.MetadataIndexKey;
import org.opensaml.saml.metadata.resolver.index.SimpleStringMetadataIndexKey;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexManagerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexManagerTest.java
index b6572f31d..453faa4a7 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexManagerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexManagerTest.java
@@ -23,7 +23,7 @@ import java.util.Set;
import java.util.function.Function;
import org.opensaml.core.criterion.EntityIdCriterion;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.util.XMLObjectSupport;
import org.opensaml.saml.criterion.EntityRoleCriterion;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexStoreTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexStoreTest.java
index ee2bc5403..4b7771c51 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexStoreTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexStoreTest.java
@@ -19,7 +19,7 @@ package org.opensaml.saml.metadata.resolver.index.impl;
import java.util.Set;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.util.XMLObjectSupport;
import org.opensaml.saml.metadata.resolver.index.MetadataIndexKey;
import org.opensaml.saml.metadata.resolver.index.SimpleStringMetadataIndexKey;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexingTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexingTest.java
index 7570b6217..efeeb3182 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexingTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexingTest.java
@@ -24,7 +24,7 @@ import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.util.HashSet;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.saml.criterion.ArtifactCriterion;
import org.opensaml.saml.criterion.EntityRoleCriterion;
import org.opensaml.saml.metadata.resolver.impl.AbstractBatchMetadataResolver;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/RoleMetadataIndexTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/RoleMetadataIndexTest.java
index 1c879ee80..afcca15d6 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/RoleMetadataIndexTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/RoleMetadataIndexTest.java
@@ -24,7 +24,7 @@ import javax.xml.namespace.QName;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.util.XMLObjectSupport;
import org.opensaml.saml.criterion.EntityRoleCriterion;
import org.opensaml.saml.metadata.resolver.index.MetadataIndexKey;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/SAMLArtifactMetadataIndexTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/SAMLArtifactMetadataIndexTest.java
index 2d5b0d288..4e8d43769 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/SAMLArtifactMetadataIndexTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/SAMLArtifactMetadataIndexTest.java
@@ -24,7 +24,7 @@ import java.security.SecureRandom;
import java.util.Set;
import org.apache.commons.codec.binary.Hex;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.util.XMLObjectSupport;
import org.opensaml.saml.common.binding.artifact.SAMLSourceIDArtifact;
import org.opensaml.saml.common.binding.artifact.SAMLSourceLocationArtifact;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/support/AttributeConsumingServiceSelectorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/support/AttributeConsumingServiceSelectorTest.java
index e275eefee..79469e5f5 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/support/AttributeConsumingServiceSelectorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/support/AttributeConsumingServiceSelectorTest.java
@@ -21,7 +21,7 @@ import java.io.File;
import java.net.URL;
import org.opensaml.core.criterion.EntityIdCriterion;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.criterion.EntityRoleCriterion;
import org.opensaml.saml.criterion.ProtocolCriterion;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPPostDecoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPPostDecoderTest.java
index 09702a5ec..e7bb1d473 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPPostDecoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPPostDecoderTest.java
@@ -24,7 +24,7 @@ import net.shibboleth.utilities.java.support.codec.Base64Support;
import net.shibboleth.utilities.java.support.codec.DecodingException;
import net.shibboleth.utilities.java.support.xml.SerializeSupport;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.decoder.MessageDecodingException;
import org.opensaml.saml.common.SAMLObject;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPSOAP11DecoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPSOAP11DecoderTest.java
index ddff4f451..475cfbd24 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPSOAP11DecoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPSOAP11DecoderTest.java
@@ -19,8 +19,8 @@ package org.opensaml.saml.saml1.binding.decoding.impl;
import net.shibboleth.utilities.java.support.xml.SerializeSupport;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.saml.saml1.core.Request;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPPostEncoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPPostEncoderTest.java
index 4cb9e6107..93ebb219d 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPPostEncoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPPostEncoderTest.java
@@ -28,8 +28,8 @@ import org.jsoup.nodes.Document;
import org.jsoup.nodes.DocumentType;
import org.jsoup.nodes.Element;
import org.jsoup.nodes.Node;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.core.xml.util.XMLObjectSupport;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.saml.common.SAMLObjectBuilder;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPSOAP11EncoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPSOAP11EncoderTest.java
index 8aaebc3b4..686223f08 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPSOAP11EncoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPSOAP11EncoderTest.java
@@ -20,8 +20,8 @@ package org.opensaml.saml.saml1.binding.encoding.impl;
import java.io.ByteArrayInputStream;
import java.time.Instant;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.core.xml.util.XMLObjectSupport;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.saml.common.SAMLObjectBuilder;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/impl/SAML1ArtifactRequestIssuerHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/impl/SAML1ArtifactRequestIssuerHandlerTest.java
index a6a3e213c..6cc8b2b51 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/impl/SAML1ArtifactRequestIssuerHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/impl/SAML1ArtifactRequestIssuerHandlerTest.java
@@ -21,12 +21,12 @@ import java.io.IOException;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.handler.MessageHandlerException;
import org.opensaml.saml.common.binding.artifact.impl.BasicSAMLArtifactMap;
import org.opensaml.saml.common.messaging.context.SAMLPeerEntityContext;
-import org.opensaml.saml.saml1.profile.SAML1ActionTestingSupport;
+import org.opensaml.saml.saml1.testing.SAML1ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/ResponseTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/ResponseTest.java
index 1790810c9..6da20159d 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/ResponseTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/ResponseTest.java
@@ -23,10 +23,10 @@ import java.io.InputStream;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.io.Unmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.w3c.dom.Document;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ActionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ActionTest.java
index 2c77fbb98..8d81b664b 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ActionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ActionTest.java
@@ -24,7 +24,7 @@ import org.testng.annotations.Test;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.Action;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AdviceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AdviceTest.java
index c0ea3f6a8..7718c56bb 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AdviceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AdviceTest.java
@@ -25,7 +25,7 @@ import org.testng.annotations.Test;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.Advice;
import org.opensaml.saml.saml1.core.Assertion;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactTest.java
index 9d9820cdc..708f375ab 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactTest.java
@@ -24,7 +24,7 @@ import org.testng.annotations.Test;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.AssertionArtifact;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceTest.java
index 54fc5a621..886a1ae2c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceTest.java
@@ -25,7 +25,7 @@ import org.testng.annotations.Test;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.AssertionIDReference;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AssertionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AssertionTest.java
index 3d487436d..00c503299 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AssertionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AssertionTest.java
@@ -25,8 +25,8 @@ import java.time.Instant;
import javax.xml.namespace.QName;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.saml.saml1.core.Advice;
import org.opensaml.saml.saml1.core.Assertion;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorTest.java
index 22c928424..1b920ae74 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorTest.java
@@ -25,7 +25,7 @@ import org.testng.annotations.Test;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.AttributeDesignator;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeQueryTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeQueryTest.java
index 9511191aa..60e770010 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeQueryTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeQueryTest.java
@@ -27,7 +27,7 @@ import java.util.List;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.AttributeDesignator;
import org.opensaml.saml.saml1.core.AttributeQuery;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeStatementTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeStatementTest.java
index 3f33b79d2..d5be272b6 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeStatementTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeStatementTest.java
@@ -27,7 +27,7 @@ import java.util.ArrayList;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.Attribute;
import org.opensaml.saml.saml1.core.AttributeStatement;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeTest.java
index ec7f0034f..b4ba5755e 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeTest.java
@@ -26,8 +26,8 @@ import org.testng.Assert;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSString;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.XMLObjectBuilder;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.Attribute;
import org.opensaml.saml.saml1.core.AttributeValue;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AudienceRestrictionConditionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AudienceRestrictionConditionTest.java
index 53874dc93..3dd4a65aa 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AudienceRestrictionConditionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AudienceRestrictionConditionTest.java
@@ -25,7 +25,7 @@ import org.testng.annotations.Test;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.Audience;
import org.opensaml.saml.saml1.core.AudienceRestrictionCondition;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AudienceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AudienceTest.java
index 610cfe0fb..f94b8161c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AudienceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AudienceTest.java
@@ -24,7 +24,7 @@ import org.testng.annotations.Test;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.Audience;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthenticationQueryTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthenticationQueryTest.java
index 712067cef..3214dac91 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthenticationQueryTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthenticationQueryTest.java
@@ -25,7 +25,7 @@ import org.testng.annotations.Test;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.AuthenticationQuery;
import org.opensaml.saml.saml1.core.Subject;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementTest.java
index 12a6a4bb7..c04ee1689 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementTest.java
@@ -28,7 +28,7 @@ import java.time.Instant;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.AuthenticationStatement;
import org.opensaml.saml.saml1.core.AuthorityBinding;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingTest.java
index 41be127e2..7fbfd639c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingTest.java
@@ -24,7 +24,7 @@ import org.testng.annotations.Test;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.AttributeQuery;
import org.opensaml.saml.saml1.core.AuthorityBinding;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionQueryTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionQueryTest.java
index 98e7aa610..8778545e9 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionQueryTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionQueryTest.java
@@ -28,7 +28,7 @@ import java.util.List;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.Action;
import org.opensaml.saml.saml1.core.AuthorizationDecisionQuery;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionStatementTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionStatementTest.java
index 02a57e652..541aedb59 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionStatementTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionStatementTest.java
@@ -27,8 +27,8 @@ import javax.xml.namespace.QName;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.io.UnmarshallingException;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.Action;
import org.opensaml.saml.saml1.core.AuthorizationDecisionStatement;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ConditionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ConditionsTest.java
index 7f1a9936a..34b8ba83b 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ConditionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ConditionsTest.java
@@ -28,7 +28,7 @@ import java.time.Instant;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.AudienceRestrictionCondition;
import org.opensaml.saml.saml1.core.Conditions;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodTest.java
index bf94d97ad..062abc5e8 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodTest.java
@@ -24,7 +24,7 @@ import org.testng.annotations.Test;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.ConfirmationMethod;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/DoNotCacheConditionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/DoNotCacheConditionTest.java
index a9db316e4..f929a708d 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/DoNotCacheConditionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/DoNotCacheConditionTest.java
@@ -23,7 +23,7 @@ package org.opensaml.saml.saml1.core.impl;
import org.testng.annotations.Test;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.DoNotCacheCondition;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/EvidenceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/EvidenceTest.java
index ce7124ebb..e91bc1e17 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/EvidenceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/EvidenceTest.java
@@ -25,7 +25,7 @@ import org.testng.annotations.Test;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.Assertion;
import org.opensaml.saml.saml1.core.AssertionIDReference;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/NameIdentifierTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/NameIdentifierTest.java
index d1ec76fa8..ba4a4ef58 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/NameIdentifierTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/NameIdentifierTest.java
@@ -24,7 +24,7 @@ import org.testng.annotations.Test;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.NameIdentifier;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/RequestTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/RequestTest.java
index ed3de5339..ad0c0ac16 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/RequestTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/RequestTest.java
@@ -24,8 +24,8 @@ import java.time.Instant;
import javax.xml.namespace.QName;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.saml.saml1.core.AssertionArtifact;
import org.opensaml.saml.saml1.core.AssertionIDReference;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/RespondWithTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/RespondWithTest.java
index 9fc4aae76..886516bc9 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/RespondWithTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/RespondWithTest.java
@@ -24,7 +24,7 @@ import org.testng.annotations.Test;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml1.core.AttributeStatement;
import org.opensaml.saml.saml1.core.RespondWith;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ResponseTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ResponseTest.java
index 3ff3de5dc..b4d96bd3f 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ResponseTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ResponseTest.java
@@ -25,8 +25,8 @@ import java.time.Instant;
import javax.xml.namespace.QName;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.saml.saml1.core.Assertion;
import org.opensaml.saml.saml1.core.Response;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/StatusCodeTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/StatusCodeTest.java
index 8b0d5d362..1c0c3ebf0 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/StatusCodeTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/StatusCodeTest.java
@@ -21,7 +21,7 @@ import org.testng.annotations.Test;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.StatusCode;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/StatusMessageTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/StatusMessageTest.java
index 2c7741edd..8a5ca5184 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/StatusMessageTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/StatusMessageTest.java
@@ -24,7 +24,7 @@ import org.testng.annotations.Test;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.StatusMessage;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/StatusTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/StatusTest.java
index 1d8a48964..7952a9698 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/StatusTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/StatusTest.java
@@ -25,7 +25,7 @@ import org.testng.annotations.Test;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.Status;
import org.opensaml.saml.saml1.core.StatusCode;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationTest.java
index 267494628..40e2205c1 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationTest.java
@@ -26,8 +26,8 @@ import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
import javax.xml.namespace.QName;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.XMLObjectBuilder;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.schema.XSAny;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.ConfirmationMethod;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityTest.java
index dd2ad0310..bae89f6c5 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityTest.java
@@ -24,7 +24,7 @@ import org.testng.annotations.Test;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.SubjectLocality;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/SubjectTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/SubjectTest.java
index 6b65d4fe7..859473938 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/SubjectTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/SubjectTest.java
@@ -25,7 +25,7 @@ import org.testng.annotations.Test;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.NameIdentifier;
import org.opensaml.saml.saml1.core.Subject;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/AbstractSAML1NameIdentifierGeneratorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/AbstractSAML1NameIdentifierGeneratorTest.java
index a71632835..dc284cc8c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/AbstractSAML1NameIdentifierGeneratorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/AbstractSAML1NameIdentifierGeneratorTest.java
@@ -20,7 +20,7 @@ package org.opensaml.saml.saml1.profile;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.FunctionSupport;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.saml.common.SAMLException;
import org.opensaml.saml.saml1.core.NameIdentifier;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddDoNotCacheConditionToAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddDoNotCacheConditionToAssertionsTest.java
index 52aa689e8..b94bf275c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddDoNotCacheConditionToAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddDoNotCacheConditionToAssertionsTest.java
@@ -17,18 +17,18 @@
package org.opensaml.saml.saml1.profile.impl;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.saml.common.SAMLObjectBuilder;
import org.opensaml.saml.saml1.core.Assertion;
import org.opensaml.saml.saml1.core.Conditions;
import org.opensaml.saml.saml1.core.DoNotCacheCondition;
import org.opensaml.saml.saml1.core.Response;
-import org.opensaml.saml.saml1.profile.SAML1ActionTestingSupport;
+import org.opensaml.saml.saml1.testing.SAML1ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjectsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjectsTest.java
index fc4ff62f3..74773cea8 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjectsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjectsTest.java
@@ -25,10 +25,10 @@ import javax.annotation.Nonnull;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.saml.common.SAMLException;
import org.opensaml.saml.common.profile.NameIdentifierGenerator;
import org.opensaml.saml.saml1.core.Assertion;
@@ -36,7 +36,7 @@ import org.opensaml.saml.saml1.core.NameIdentifier;
import org.opensaml.saml.saml1.core.Response;
import org.opensaml.saml.saml1.core.Subject;
import org.opensaml.saml.saml1.profile.AbstractSAML1NameIdentifierGenerator;
-import org.opensaml.saml.saml1.profile.SAML1ActionTestingSupport;
+import org.opensaml.saml.saml1.testing.SAML1ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddResponseShellTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddResponseShellTest.java
index 106aa2d0a..dd3ea89a8 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddResponseShellTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddResponseShellTest.java
@@ -19,17 +19,17 @@ package org.opensaml.saml.saml1.profile.impl;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.saml.common.SAMLVersion;
import org.opensaml.saml.saml1.core.Response;
import org.opensaml.saml.saml1.core.Status;
import org.opensaml.saml.saml1.core.StatusCode;
-import org.opensaml.saml.saml1.profile.SAML1ActionTestingSupport;
+import org.opensaml.saml.saml1.testing.SAML1ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddStatusToResponseTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddStatusToResponseTest.java
index d7c27cb01..0fe0b91e0 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddStatusToResponseTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddStatusToResponseTest.java
@@ -19,17 +19,17 @@ package org.opensaml.saml.saml1.profile.impl;
import java.util.Arrays;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
import org.opensaml.saml.saml1.core.Response;
import org.opensaml.saml.saml1.core.Status;
import org.opensaml.saml.saml1.core.StatusCode;
-import org.opensaml.saml.saml1.profile.SAML1ActionTestingSupport;
+import org.opensaml.saml.saml1.testing.SAML1ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddSubjectConfirmationToSubjectsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddSubjectConfirmationToSubjectsTest.java
index eec9c8c64..fd2827e9b 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddSubjectConfirmationToSubjectsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddSubjectConfirmationToSubjectsTest.java
@@ -22,18 +22,18 @@ import java.util.Collections;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.saml.common.messaging.context.SAMLBindingContext;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.Assertion;
import org.opensaml.saml.saml1.core.ConfirmationMethod;
import org.opensaml.saml.saml1.core.Response;
import org.opensaml.saml.saml1.core.Subject;
-import org.opensaml.saml.saml1.profile.SAML1ActionTestingSupport;
+import org.opensaml.saml.saml1.testing.SAML1ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/CopyNameIdentifierFromRequestTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/CopyNameIdentifierFromRequestTest.java
index 1ed8bf513..58cda20d1 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/CopyNameIdentifierFromRequestTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/CopyNameIdentifierFromRequestTest.java
@@ -19,15 +19,15 @@ package org.opensaml.saml.saml1.profile.impl;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.saml.saml1.core.Assertion;
import org.opensaml.saml.saml1.core.Response;
import org.opensaml.saml.saml1.core.Subject;
-import org.opensaml.saml.saml1.profile.SAML1ActionTestingSupport;
+import org.opensaml.saml.saml1.testing.SAML1ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/ResolveArtifactsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/ResolveArtifactsTest.java
index 475f99971..461aa09ab 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/ResolveArtifactsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/ResolveArtifactsTest.java
@@ -19,20 +19,20 @@ package org.opensaml.saml.saml1.profile.impl;
import java.io.IOException;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.FunctionSupport;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
import org.opensaml.saml.common.binding.artifact.impl.BasicSAMLArtifactMap;
import org.opensaml.saml.common.messaging.context.SAMLPeerEntityContext;
import org.opensaml.saml.common.profile.SAMLEventIds;
import org.opensaml.saml.saml1.core.Response;
-import org.opensaml.saml.saml1.profile.SAML1ActionTestingSupport;
+import org.opensaml.saml.saml1.testing.SAML1ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/BaseAssertionValidationTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/BaseAssertionValidationTest.java
index 1b54f386f..918d5605b 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/BaseAssertionValidationTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/BaseAssertionValidationTest.java
@@ -36,7 +36,7 @@ import java.util.Map;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObjectBuilder;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.saml.saml2.core.Assertion;
@@ -47,7 +47,7 @@ import org.opensaml.saml.saml2.core.Conditions;
import org.opensaml.saml.saml2.core.SubjectConfirmation;
import org.opensaml.saml.saml2.core.SubjectConfirmationData;
import org.opensaml.saml.saml2.core.SubjectLocality;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.opensaml.security.SecurityException;
import org.opensaml.security.credential.BasicCredential;
import org.opensaml.security.credential.Credential;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPPostDecoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPPostDecoderTest.java
index d49017f99..d1f282938 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPPostDecoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPPostDecoderTest.java
@@ -17,7 +17,7 @@
package org.opensaml.saml.saml2.binding.decoding.impl;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.decoder.MessageDecodingException;
import org.opensaml.saml.common.binding.SAMLBindingSupport;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPRedirectDeflateDecoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPRedirectDeflateDecoderTest.java
index 13b7be0f7..37151b549 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPRedirectDeflateDecoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPRedirectDeflateDecoderTest.java
@@ -24,7 +24,7 @@ import java.net.URL;
import java.util.zip.Deflater;
import java.util.zip.DeflaterOutputStream;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.decoder.MessageDecodingException;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPSOAP11DecoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPSOAP11DecoderTest.java
index e0752e3e1..c0ea656a1 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPSOAP11DecoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPSOAP11DecoderTest.java
@@ -19,8 +19,8 @@ package org.opensaml.saml.saml2.binding.decoding.impl;
import net.shibboleth.utilities.java.support.xml.SerializeSupport;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.saml.saml2.core.Response;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostEncoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostEncoderTest.java
index 031403e4c..8234e62fc 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostEncoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostEncoderTest.java
@@ -28,8 +28,8 @@ import org.jsoup.nodes.Document;
import org.jsoup.nodes.DocumentType;
import org.jsoup.nodes.Element;
import org.jsoup.nodes.Node;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.core.xml.util.XMLObjectSupport;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.saml.common.SAMLObjectBuilder;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostSimpleSignEncoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostSimpleSignEncoderTest.java
index 9f020ce16..ea369ca04 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostSimpleSignEncoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostSimpleSignEncoderTest.java
@@ -29,8 +29,8 @@ import org.jsoup.nodes.Document;
import org.jsoup.nodes.DocumentType;
import org.jsoup.nodes.Element;
import org.jsoup.nodes.Node;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.core.xml.util.XMLObjectSupport;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.saml.common.SAMLObjectBuilder;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoderTest.java
index 4662f3590..85b25793d 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoderTest.java
@@ -24,7 +24,7 @@ import java.util.Map;
import java.util.zip.Inflater;
import java.util.zip.InflaterInputStream;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.saml.common.SAMLObjectBuilder;
import org.opensaml.saml.common.SAMLVersion;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPSOAP11EncoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPSOAP11EncoderTest.java
index a30d5fd18..8167e3b93 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPSOAP11EncoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPSOAP11EncoderTest.java
@@ -20,8 +20,8 @@ package org.opensaml.saml.saml2.binding.encoding.impl;
import java.io.ByteArrayInputStream;
import java.time.Instant;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.core.xml.util.XMLObjectSupport;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.saml.common.SAMLObjectBuilder;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddConsentToResponseHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddConsentToResponseHandlerTest.java
index 6bb372f2b..1aa6fb07d 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddConsentToResponseHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddConsentToResponseHandlerTest.java
@@ -19,12 +19,12 @@ package org.opensaml.saml.saml2.binding.impl;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.handler.MessageHandlerException;
import org.opensaml.saml.common.messaging.context.SAMLConsentContext;
import org.opensaml.saml.saml2.core.StatusResponseType;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddECPResponseHeaderHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddECPResponseHeaderHandlerTest.java
index 4d06367e7..b68c89b65 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddECPResponseHeaderHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddECPResponseHeaderHandlerTest.java
@@ -21,7 +21,7 @@ import java.util.List;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.messaging.context.MessageContext;
@@ -31,7 +31,7 @@ import org.opensaml.saml.common.messaging.context.SAMLPeerEntityContext;
import org.opensaml.saml.saml2.ecp.Response;
import org.opensaml.saml.saml2.metadata.AssertionConsumerService;
import org.opensaml.saml.saml2.metadata.Endpoint;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.opensaml.soap.messaging.SOAPMessagingSupport;
import org.opensaml.soap.messaging.context.SOAP11Context;
import org.opensaml.soap.soap11.Envelope;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddGeneratedKeyHeaderHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddGeneratedKeyHeaderHandlerTest.java
index 7f56c38dd..81b1ad1d1 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddGeneratedKeyHeaderHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddGeneratedKeyHeaderHandlerTest.java
@@ -25,7 +25,7 @@ import net.shibboleth.utilities.java.support.codec.Base64Support;
import net.shibboleth.utilities.java.support.codec.EncodingException;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.schema.XSBase64Binary;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddRelayStateHeaderHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddRelayStateHeaderHandlerTest.java
index 3b10326f5..dfee9de4d 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddRelayStateHeaderHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddRelayStateHeaderHandlerTest.java
@@ -21,7 +21,7 @@ import java.util.List;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.messaging.context.MessageContext;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddRequestAuthenticatedHeaderHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddRequestAuthenticatedHeaderHandlerTest.java
index db87c8ad4..466949e62 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddRequestAuthenticatedHeaderHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddRequestAuthenticatedHeaderHandlerTest.java
@@ -21,7 +21,7 @@ import java.util.List;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.messaging.context.MessageContext;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/ExtractConsentFromRequestHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/ExtractConsentFromRequestHandlerTest.java
index 7fb28d776..1db3c74a7 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/ExtractConsentFromRequestHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/ExtractConsentFromRequestHandlerTest.java
@@ -19,13 +19,13 @@ package org.opensaml.saml.saml2.binding.impl;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.handler.MessageHandlerException;
import org.opensaml.saml.common.messaging.context.SAMLConsentContext;
import org.opensaml.saml.saml2.core.RequestAbstractType;
import org.opensaml.saml.saml2.core.StatusResponseType;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/ExtractProxiedRequestersHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/ExtractProxiedRequestersHandlerTest.java
index 7f4686027..cfd1f3598 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/ExtractProxiedRequestersHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/ExtractProxiedRequestersHandlerTest.java
@@ -21,7 +21,7 @@ import net.shibboleth.utilities.java.support.component.ComponentInitializationEx
import java.util.Arrays;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.handler.MessageHandlerException;
@@ -30,7 +30,7 @@ import org.opensaml.saml.common.SAMLObjectBuilder;
import org.opensaml.saml.saml2.core.AuthnRequest;
import org.opensaml.saml.saml2.core.RequesterID;
import org.opensaml.saml.saml2.core.Scoping;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/ExtractChannelBindingsExtensionsHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/ExtractChannelBindingsExtensionsHandlerTest.java
index 66b605c69..32367bf5d 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/ExtractChannelBindingsExtensionsHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/ExtractChannelBindingsExtensionsHandlerTest.java
@@ -19,17 +19,17 @@ package org.opensaml.saml.saml2.binding.security.impl;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.handler.MessageHandlerException;
import org.opensaml.saml.common.messaging.context.ChannelBindingsContext;
import org.opensaml.saml.common.messaging.context.SAMLBindingContext;
import org.opensaml.saml.ext.saml2cb.ChannelBindings;
-import org.opensaml.saml.saml1.profile.SAML1ActionTestingSupport;
+import org.opensaml.saml.saml1.testing.SAML1ActionTestingSupport;
import org.opensaml.saml.saml2.core.AuthnRequest;
import org.opensaml.saml.saml2.core.Extensions;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/ExtractChannelBindingsHeadersHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/ExtractChannelBindingsHeadersHandlerTest.java
index 66ecca24e..6c72f84c2 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/ExtractChannelBindingsHeadersHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/ExtractChannelBindingsHeadersHandlerTest.java
@@ -19,13 +19,13 @@ package org.opensaml.saml.saml2.binding.security.impl;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.handler.MessageHandlerException;
import org.opensaml.saml.common.messaging.context.ChannelBindingsContext;
import org.opensaml.saml.ext.saml2cb.ChannelBindings;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.opensaml.soap.messaging.SOAPMessagingSupport;
import org.opensaml.soap.messaging.context.SOAP11Context;
import org.opensaml.soap.soap11.ActorBearing;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2AuthnRequestsSignedSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2AuthnRequestsSignedSecurityHandlerTest.java
index 9db93f970..8e88c952e 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2AuthnRequestsSignedSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2AuthnRequestsSignedSecurityHandlerTest.java
@@ -17,7 +17,7 @@
package org.opensaml.saml.saml2.binding.security.impl;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.handler.MessageHandlerException;
import org.opensaml.saml.common.messaging.context.SAMLBindingContext;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java
index 48c904d1a..ea173a69d 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java
@@ -36,7 +36,7 @@ import net.shibboleth.utilities.java.support.xml.XMLParserException;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.runtime.RuntimeConstants;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.encoder.MessageEncodingException;
import org.opensaml.messaging.handler.MessageHandlerException;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java
index 123da3d4d..39d83cd8c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java
@@ -30,7 +30,7 @@ import net.shibboleth.utilities.java.support.collection.Pair;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.net.URLBuilder;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.encoder.MessageEncodingException;
import org.opensaml.messaging.handler.MessageHandlerException;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/SignedAssertionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/SignedAssertionTest.java
index a76dfb35e..a6b291baf 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/SignedAssertionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/SignedAssertionTest.java
@@ -28,10 +28,10 @@ import net.shibboleth.utilities.java.support.security.impl.RandomIdentifierGener
import net.shibboleth.utilities.java.support.xml.SerializeSupport;
import org.opensaml.core.criterion.EntityIdCriterion;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.io.Marshaller;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.io.UnmarshallingException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObjectBuilder;
import org.opensaml.saml.common.SAMLObjectBuilder;
import org.opensaml.saml.common.SAMLTestSupport;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ActionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ActionTest.java
index 7350ae7f7..68a138bed 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ActionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ActionTest.java
@@ -22,7 +22,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.Action;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AdviceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AdviceTest.java
index fd34d3051..05e552182 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AdviceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AdviceTest.java
@@ -19,7 +19,7 @@ package org.opensaml.saml.saml2.core.impl;
import org.testng.annotations.Test;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.core.Advice;
import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.AssertionIDRef;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ArtifactTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ArtifactTest.java
index 91c72235d..b458b4387 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ArtifactTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ArtifactTest.java
@@ -23,7 +23,7 @@ package org.opensaml.saml.saml2.core.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.core.Artifact;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefTest.java
index 821276720..99ce423b2 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefTest.java
@@ -22,7 +22,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.AssertionIDRef;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionTest.java
index 568143fb5..0ac29caae 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionTest.java
@@ -21,8 +21,8 @@ import java.time.Instant;
import javax.xml.namespace.QName;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.io.UnmarshallingException;
import org.opensaml.saml.common.SAMLVersion;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefTest.java
index b6c7bd54c..93312093f 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefTest.java
@@ -22,7 +22,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.AssertionURIRef;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AttributeStatementTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AttributeStatementTest.java
index d4cfad4e4..bf94a52e9 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AttributeStatementTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AttributeStatementTest.java
@@ -19,7 +19,7 @@ package org.opensaml.saml.saml2.core.impl;
import org.testng.annotations.Test;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.core.Attribute;
import org.opensaml.saml.saml2.core.AttributeStatement;
import org.opensaml.saml.saml2.core.EncryptedAttribute;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AttributeTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AttributeTest.java
index 527c3b8b8..22ea6a6a3 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AttributeTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AttributeTest.java
@@ -22,7 +22,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.Attribute;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AudienceRestrictionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AudienceRestrictionTest.java
index 3df31f4fd..658d3d5cd 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AudienceRestrictionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AudienceRestrictionTest.java
@@ -21,7 +21,7 @@ import org.testng.annotations.Test;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.Audience;
import org.opensaml.saml.saml2.core.AudienceRestriction;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AudienceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AudienceTest.java
index 02a9af3a9..8e119b9ee 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AudienceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AudienceTest.java
@@ -22,7 +22,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.Audience;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityTest.java
index 06fedf0b9..a2a37ecb4 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityTest.java
@@ -22,7 +22,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.AuthenticatingAuthority;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefTest.java
index c3ed01814..7591e8a86 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefTest.java
@@ -22,7 +22,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.AuthnContextClassRef;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefTest.java
index d041991b5..9128e26c5 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefTest.java
@@ -22,7 +22,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.AuthnContextDeclRef;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclTest.java
index e4e2d67fc..db5e56f7c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclTest.java
@@ -22,7 +22,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.AuthnContextDecl;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextTest.java
index b4f9b25c6..7111bc078 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextTest.java
@@ -19,7 +19,7 @@ package org.opensaml.saml.saml2.core.impl;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.AuthenticatingAuthority;
import org.opensaml.saml.saml2.core.AuthnContext;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnStatementTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnStatementTest.java
index a5eb812e5..e41846876 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnStatementTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnStatementTest.java
@@ -23,7 +23,7 @@ import org.testng.Assert;
import java.time.Instant;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.core.AuthnContext;
import org.opensaml.saml.saml2.core.AuthnStatement;
import org.opensaml.saml.saml2.core.SubjectLocality;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementTest.java
index 2486040f9..767b508e6 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementTest.java
@@ -19,7 +19,7 @@ package org.opensaml.saml.saml2.core.impl;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.io.UnmarshallingException;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.Action;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ConditionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ConditionsTest.java
index 330f68143..d7152ebc0 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ConditionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ConditionsTest.java
@@ -25,7 +25,7 @@ import java.time.Instant;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.AudienceRestriction;
import org.opensaml.saml.saml2.core.Condition;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EncryptedAssertionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EncryptedAssertionTest.java
index 06756670f..5cccdd649 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EncryptedAssertionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EncryptedAssertionTest.java
@@ -19,7 +19,7 @@ package org.opensaml.saml.saml2.core.impl;
import org.testng.annotations.Test;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.core.EncryptedAssertion;
import org.opensaml.xmlsec.encryption.EncryptedData;
import org.opensaml.xmlsec.encryption.EncryptedKey;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EncryptedAttributeTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EncryptedAttributeTest.java
index 41e324e6f..69e179668 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EncryptedAttributeTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EncryptedAttributeTest.java
@@ -19,7 +19,7 @@ package org.opensaml.saml.saml2.core.impl;
import org.testng.annotations.Test;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.core.EncryptedAttribute;
import org.opensaml.xmlsec.encryption.EncryptedData;
import org.opensaml.xmlsec.encryption.EncryptedKey;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EncryptedIDTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EncryptedIDTest.java
index 49c370d92..287d6e99c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EncryptedIDTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EncryptedIDTest.java
@@ -19,7 +19,7 @@ package org.opensaml.saml.saml2.core.impl;
import org.testng.annotations.Test;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.core.EncryptedID;
import org.opensaml.xmlsec.encryption.EncryptedData;
import org.opensaml.xmlsec.encryption.EncryptedKey;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EvidenceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EvidenceTest.java
index 7c8d82efc..f8f26bac7 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EvidenceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EvidenceTest.java
@@ -19,7 +19,7 @@ package org.opensaml.saml.saml2.core.impl;
import org.testng.annotations.Test;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.AssertionIDRef;
import org.opensaml.saml.saml2.core.AssertionURIRef;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ExtensionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ExtensionsTest.java
index 997e81540..17e5cb151 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ExtensionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ExtensionsTest.java
@@ -24,7 +24,7 @@ import org.testng.annotations.Test;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.core.Extensions;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/GetCompleteTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/GetCompleteTest.java
index 564401c95..cf746b8c7 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/GetCompleteTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/GetCompleteTest.java
@@ -23,7 +23,7 @@ package org.opensaml.saml.saml2.core.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.core.GetComplete;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/IDPEntryTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/IDPEntryTest.java
index 38e7d3014..ec05fb4b3 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/IDPEntryTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/IDPEntryTest.java
@@ -23,7 +23,7 @@ package org.opensaml.saml.saml2.core.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.core.IDPEntry;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/IDPListTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/IDPListTest.java
index c4bf83203..5bead1367 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/IDPListTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/IDPListTest.java
@@ -25,7 +25,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.GetComplete;
import org.opensaml.saml.saml2.core.IDPEntry;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/IssuerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/IssuerTest.java
index 0e3cd4d3c..c178ac8e7 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/IssuerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/IssuerTest.java
@@ -22,7 +22,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.Issuer;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/KeyInfoConfirmationDataTypeTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/KeyInfoConfirmationDataTypeTest.java
index 9046d40e9..78071f7c4 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/KeyInfoConfirmationDataTypeTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/KeyInfoConfirmationDataTypeTest.java
@@ -25,7 +25,7 @@ import java.time.Instant;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.saml.common.SAMLObjectBuilder;
import org.opensaml.saml.common.xml.SAMLConstants;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyTest.java
index 805b4ed27..6a2f61aad 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyTest.java
@@ -23,8 +23,8 @@ package org.opensaml.saml.saml2.core.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.schema.XSBooleanValue;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.core.NameIDPolicy;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NameIDTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NameIDTest.java
index fefc49c6e..eb00c8db5 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NameIDTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NameIDTest.java
@@ -22,7 +22,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.NameID;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NewEncryptedIDTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NewEncryptedIDTest.java
index d24a19ca2..2f0a492ef 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NewEncryptedIDTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NewEncryptedIDTest.java
@@ -19,7 +19,7 @@ package org.opensaml.saml.saml2.core.impl;
import org.testng.annotations.Test;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.core.NewEncryptedID;
import org.opensaml.xmlsec.encryption.EncryptedData;
import org.opensaml.xmlsec.encryption.EncryptedKey;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NewIDTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NewIDTest.java
index f7debe3df..3e72bcafa 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NewIDTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NewIDTest.java
@@ -23,7 +23,7 @@ package org.opensaml.saml.saml2.core.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.core.NewID;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/OneTimeUseTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/OneTimeUseTest.java
index 3e5d85256..fe7544152 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/OneTimeUseTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/OneTimeUseTest.java
@@ -21,7 +21,7 @@ import org.testng.annotations.Test;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.OneTimeUse;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionTest.java
index 911683fc6..fc4acebdd 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionTest.java
@@ -21,7 +21,7 @@ import org.testng.annotations.Test;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.Audience;
import org.opensaml.saml.saml2.core.ProxyRestriction;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequestTestBase.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequestTestBase.java
index 7d5a49d18..82559aeb0 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequestTestBase.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequestTestBase.java
@@ -25,7 +25,7 @@ import java.time.Instant;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.SAMLVersion;
import org.opensaml.saml.common.xml.SAMLConstants;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextTest.java
index fd26f00e0..47ef042bd 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextTest.java
@@ -25,7 +25,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.AuthnContextClassRef;
import org.opensaml.saml.saml2.core.AuthnContextComparisonTypeEnumeration;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequesterIDTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequesterIDTest.java
index 91389a2b0..32d5da2f9 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequesterIDTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequesterIDTest.java
@@ -23,7 +23,7 @@ package org.opensaml.saml.saml2.core.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.core.RequesterID;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ScopingTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ScopingTest.java
index 048a45b82..2f7bdcc36 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ScopingTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ScopingTest.java
@@ -25,7 +25,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.IDPList;
import org.opensaml.saml.saml2.core.RequesterID;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SessionIndexTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SessionIndexTest.java
index 7ce81cbc2..ac71e4518 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SessionIndexTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SessionIndexTest.java
@@ -23,7 +23,7 @@ package org.opensaml.saml.saml2.core.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.core.SessionIndex;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusCodeTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusCodeTest.java
index e7913a698..bd0066789 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusCodeTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusCodeTest.java
@@ -25,7 +25,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.StatusCode;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusDetailTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusDetailTest.java
index 59bfa79fb..3364b01e3 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusDetailTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusDetailTest.java
@@ -24,7 +24,7 @@ import org.testng.annotations.Test;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.core.StatusDetail;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusMessageTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusMessageTest.java
index df2c8b9bc..108919761 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusMessageTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusMessageTest.java
@@ -20,7 +20,7 @@ package org.opensaml.saml.saml2.core.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.core.StatusMessage;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusResponseTestBase.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusResponseTestBase.java
index 08b69122a..f9e7ea934 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusResponseTestBase.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusResponseTestBase.java
@@ -28,7 +28,7 @@ import java.time.Instant;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.SAMLVersion;
import org.opensaml.saml.common.xml.SAMLConstants;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusTest.java
index 9493fa086..0d16e568a 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusTest.java
@@ -22,7 +22,7 @@ package org.opensaml.saml.saml2.core.impl;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.Status;
import org.opensaml.saml.saml2.core.StatusCode;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataTest.java
index c5e201776..0ddf119aa 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataTest.java
@@ -25,7 +25,7 @@ import java.time.Instant;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.SubjectConfirmationData;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationTest.java
index 7c99aafcd..b4a0887cf 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationTest.java
@@ -24,7 +24,7 @@ import javax.xml.namespace.QName;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.EncryptedID;
import org.opensaml.saml.saml2.core.NameID;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityTest.java
index b8649c1c9..cb678d5e4 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityTest.java
@@ -22,7 +22,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.SubjectLocality;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectTest.java
index 57e2a97de..e56b56eda 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectTest.java
@@ -19,7 +19,7 @@ package org.opensaml.saml.saml2.core.impl;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.NameID;
import org.opensaml.saml.saml2.core.Subject;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/TerminateTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/TerminateTest.java
index 47eb6522e..2209ec673 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/TerminateTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/TerminateTest.java
@@ -22,7 +22,7 @@ package org.opensaml.saml.saml2.core.impl;
import org.testng.annotations.Test;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.core.Terminate;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/ecp/impl/RelayStateTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/ecp/impl/RelayStateTest.java
index 1012306a3..7559f4e4a 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/ecp/impl/RelayStateTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/ecp/impl/RelayStateTest.java
@@ -20,7 +20,7 @@ package org.opensaml.saml.saml2.ecp.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.ecp.RelayState;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/ecp/impl/RequestAuthenticatedTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/ecp/impl/RequestAuthenticatedTest.java
index 68509fc98..83040451f 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/ecp/impl/RequestAuthenticatedTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/ecp/impl/RequestAuthenticatedTest.java
@@ -17,7 +17,7 @@
package org.opensaml.saml.saml2.ecp.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.ecp.RequestAuthenticated;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/ecp/impl/RequestTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/ecp/impl/RequestTest.java
index 19d57cfd0..9d9c2e2ba 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/ecp/impl/RequestTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/ecp/impl/RequestTest.java
@@ -20,7 +20,7 @@ package org.opensaml.saml.saml2.ecp.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.core.IDPList;
import org.opensaml.saml.saml2.core.Issuer;
import org.opensaml.saml.saml2.ecp.Request;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/ecp/impl/ResponseTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/ecp/impl/ResponseTest.java
index 5cf8c36f1..41c460f84 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/ecp/impl/ResponseTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/ecp/impl/ResponseTest.java
@@ -20,7 +20,7 @@ package org.opensaml.saml.saml2.ecp.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.ecp.Response;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/ecp/impl/SubjectConfirmationTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/ecp/impl/SubjectConfirmationTest.java
index d566ea544..f1910e729 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/ecp/impl/SubjectConfirmationTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/ecp/impl/SubjectConfirmationTest.java
@@ -17,7 +17,7 @@
package org.opensaml.saml.saml2.ecp.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.core.SubjectConfirmationData;
import org.opensaml.saml.saml2.ecp.SubjectConfirmation;
import org.testng.Assert;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/ComplexEncryptionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/ComplexEncryptionTest.java
index c7dbae71b..d649936d4 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/ComplexEncryptionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/ComplexEncryptionTest.java
@@ -23,8 +23,8 @@ import org.testng.Assert;
import java.util.ArrayList;
import java.util.List;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.Attribute;
import org.opensaml.saml.saml2.core.EncryptedAssertion;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/DecryptionPlusSigningTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/DecryptionPlusSigningTest.java
index cd75a19f1..17eb0c711 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/DecryptionPlusSigningTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/DecryptionPlusSigningTest.java
@@ -30,9 +30,9 @@ import java.time.Instant;
import net.shibboleth.utilities.java.support.xml.SerializeSupport;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.io.UnmarshallingException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.EncryptedAssertion;
import org.opensaml.saml.saml2.core.Issuer;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/EncryptedElementTypeEncryptedKeyResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/EncryptedElementTypeEncryptedKeyResolverTest.java
index fc311d310..e368b347b 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/EncryptedElementTypeEncryptedKeyResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/EncryptedElementTypeEncryptedKeyResolverTest.java
@@ -26,7 +26,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.saml.saml2.core.EncryptedAssertion;
import org.opensaml.xmlsec.encryption.EncryptedData;
import org.opensaml.xmlsec.encryption.EncryptedKey;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/SimpleDecryptionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/SimpleDecryptionTest.java
index 1b54c52be..1c82c05f6 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/SimpleDecryptionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/SimpleDecryptionTest.java
@@ -29,7 +29,7 @@ import javax.crypto.SecretKey;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.Attribute;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/SimpleEncryptionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/SimpleEncryptionTest.java
index d56194ed5..32dfca0bb 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/SimpleEncryptionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/SimpleEncryptionTest.java
@@ -23,8 +23,8 @@ import org.testng.Assert;
import java.util.ArrayList;
import java.util.List;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.Attribute;
import org.opensaml.saml.saml2.core.EncryptedAssertion;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/MetadataTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/MetadataTest.java
index 1159f07fc..8c3eaafd0 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/MetadataTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/MetadataTest.java
@@ -21,8 +21,8 @@ import java.io.InputStream;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.io.Unmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationTest.java
index 4255e8abb..ef3510f23 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationTest.java
@@ -17,7 +17,7 @@
package org.opensaml.saml.saml2.metadata.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.metadata.AdditionalMetadataLocation;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberTest.java
index c3d03f779..5d62645d8 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberTest.java
@@ -22,7 +22,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.metadata.AffiliateMember;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorTest.java
index b6bc0bffa..30aaac6de 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorTest.java
@@ -22,8 +22,8 @@ import java.time.Instant;
import javax.xml.namespace.QName;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.util.AttributeMap;
import org.opensaml.saml.common.xml.SAMLConstants;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ArtifactResolutionServiceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ArtifactResolutionServiceTest.java
index 268c32000..9dc189821 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ArtifactResolutionServiceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ArtifactResolutionServiceTest.java
@@ -23,8 +23,8 @@ package org.opensaml.saml.saml2.metadata.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.schema.XSBooleanValue;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.metadata.ArtifactResolutionService;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AssertionConsumerServiceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AssertionConsumerServiceTest.java
index e0ff44952..fa7b789d1 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AssertionConsumerServiceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AssertionConsumerServiceTest.java
@@ -23,8 +23,8 @@ package org.opensaml.saml.saml2.metadata.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.schema.XSBooleanValue;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.metadata.AssertionConsumerService;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AssertionIDRequestServiceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AssertionIDRequestServiceTest.java
index b7fc3b4b7..010764f5f 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AssertionIDRequestServiceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AssertionIDRequestServiceTest.java
@@ -23,7 +23,7 @@ package org.opensaml.saml.saml2.metadata.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.metadata.AssertionIDRequestService;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeAuthorityDescriptorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeAuthorityDescriptorTest.java
index fe4ac3ee1..538f691bc 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeAuthorityDescriptorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeAuthorityDescriptorTest.java
@@ -19,7 +19,7 @@ package org.opensaml.saml.saml2.metadata.impl;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.Attribute;
import org.opensaml.saml.saml2.metadata.AssertionIDRequestService;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceTest.java
index ab58fbe99..e28e0dd28 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceTest.java
@@ -20,8 +20,8 @@ package org.opensaml.saml.saml2.metadata.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.schema.XSBooleanValue;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.metadata.AttributeConsumingService;
import org.opensaml.saml.saml2.metadata.RequestedAttribute;
import org.opensaml.saml.saml2.metadata.ServiceDescription;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileTest.java
index 7b794ba0c..5f30ac630 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileTest.java
@@ -17,7 +17,7 @@
package org.opensaml.saml.saml2.metadata.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.metadata.AttributeProfile;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeServiceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeServiceTest.java
index e0508bc4c..c956cf2bb 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeServiceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeServiceTest.java
@@ -25,7 +25,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.metadata.AttributeService;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AuthnAuthorityDescriptorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AuthnAuthorityDescriptorTest.java
index f3aa0202d..72a104cb4 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AuthnAuthorityDescriptorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AuthnAuthorityDescriptorTest.java
@@ -28,7 +28,7 @@ import java.util.List;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.metadata.Extensions;
import org.opensaml.saml.saml2.metadata.AssertionIDRequestService;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AuthnQueryServiceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AuthnQueryServiceTest.java
index 19b3a5ce7..399b4e6c8 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AuthnQueryServiceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AuthnQueryServiceTest.java
@@ -23,7 +23,7 @@ package org.opensaml.saml.saml2.metadata.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.metadata.AuthnQueryService;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AuthzServiceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AuthzServiceTest.java
index f30b8ec98..a645b7a89 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AuthzServiceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AuthzServiceTest.java
@@ -23,7 +23,7 @@ package org.opensaml.saml.saml2.metadata.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.metadata.AuthzService;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/CompanyTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/CompanyTest.java
index 852949e45..b51e8db70 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/CompanyTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/CompanyTest.java
@@ -23,7 +23,7 @@ package org.opensaml.saml.saml2.metadata.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.metadata.Company;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonTest.java
index 8081ab9f1..f84d00389 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonTest.java
@@ -19,7 +19,7 @@ package org.opensaml.saml.saml2.metadata.impl;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.util.AttributeMap;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.metadata.Extensions;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressTest.java
index 90f4b0615..ba4225408 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressTest.java
@@ -23,7 +23,7 @@ package org.opensaml.saml.saml2.metadata.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.metadata.EmailAddress;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EncryptionMethodTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EncryptionMethodTest.java
index ee2459e60..27f08f3de 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EncryptionMethodTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EncryptionMethodTest.java
@@ -21,7 +21,7 @@ package org.opensaml.saml.saml2.metadata.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.metadata.EncryptionMethod;
import org.opensaml.xmlsec.encryption.KeySize;
import org.opensaml.xmlsec.encryption.OAEPparams;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorTest.java
index c5896d084..8b9be2a5f 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorTest.java
@@ -22,8 +22,8 @@ import java.time.Instant;
import javax.xml.namespace.QName;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.metadata.EntitiesDescriptor;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorTest.java
index bcd8551f0..ccdb3f5ce 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorTest.java
@@ -22,8 +22,8 @@ import java.time.Instant;
import javax.xml.namespace.QName;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.util.AttributeMap;
import org.opensaml.saml.common.xml.SAMLConstants;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsTest.java
index d0b21d179..0bb359f86 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsTest.java
@@ -22,7 +22,7 @@ package org.opensaml.saml.saml2.metadata.impl;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.metadata.Extensions;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/GivenNameTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/GivenNameTest.java
index 086b40a15..b07d8d764 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/GivenNameTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/GivenNameTest.java
@@ -23,7 +23,7 @@ package org.opensaml.saml.saml2.metadata.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.metadata.GivenName;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/IDPSSODescriptorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/IDPSSODescriptorTest.java
index 27659b256..868583e5b 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/IDPSSODescriptorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/IDPSSODescriptorTest.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.schema.XSBooleanValue;
import org.opensaml.core.xml.util.AttributeMap;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorTest.java
index 2a258a887..4f60baf7d 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorTest.java
@@ -22,7 +22,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.metadata.EncryptionMethod;
import org.opensaml.saml.saml2.metadata.KeyDescriptor;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ManageNameIDServiceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ManageNameIDServiceTest.java
index 14ee43b42..1272afbc1 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ManageNameIDServiceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ManageNameIDServiceTest.java
@@ -23,7 +23,7 @@ package org.opensaml.saml.saml2.metadata.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.metadata.ManageNameIDService;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatTest.java
index 2fa3384a4..717c94f32 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatTest.java
@@ -23,7 +23,7 @@ package org.opensaml.saml.saml2.metadata.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.metadata.NameIDFormat;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/NameIDMappingServiceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/NameIDMappingServiceTest.java
index ad8899d12..b1672badf 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/NameIDMappingServiceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/NameIDMappingServiceTest.java
@@ -23,7 +23,7 @@ package org.opensaml.saml.saml2.metadata.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.metadata.NameIDMappingService;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationDisplayNameTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationDisplayNameTest.java
index c5875f9dd..82ab08952 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationDisplayNameTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationDisplayNameTest.java
@@ -23,7 +23,7 @@ package org.opensaml.saml.saml2.metadata.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.metadata.OrganizationDisplayName;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationNameTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationNameTest.java
index f5b9ea524..733328abe 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationNameTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationNameTest.java
@@ -25,7 +25,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.metadata.OrganizationName;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationTest.java
index e9fe023df..32e2d56d1 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationTest.java
@@ -23,7 +23,7 @@ package org.opensaml.saml.saml2.metadata.impl;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.util.AttributeMap;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.metadata.Extensions;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationURLTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationURLTest.java
index b7d5e40a8..73adc30cb 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationURLTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationURLTest.java
@@ -24,7 +24,7 @@ import org.testng.annotations.Test;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.metadata.OrganizationURL;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/PDPDescriptorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/PDPDescriptorTest.java
index 9be94b702..2ba7245b9 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/PDPDescriptorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/PDPDescriptorTest.java
@@ -27,7 +27,7 @@ import java.util.ArrayList;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.metadata.Extensions;
import org.opensaml.saml.saml2.metadata.AssertionIDRequestService;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/RequestedAttributeTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/RequestedAttributeTest.java
index d083e643e..d205a9bde 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/RequestedAttributeTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/RequestedAttributeTest.java
@@ -19,7 +19,7 @@ package org.opensaml.saml.saml2.metadata.impl;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.schema.XSAny;
import org.opensaml.core.xml.schema.XSBooleanValue;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SPSSODescriptorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SPSSODescriptorTest.java
index 8f7e54e46..bd1673021 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SPSSODescriptorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SPSSODescriptorTest.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.schema.XSBooleanValue;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.metadata.Extensions;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ServiceDescriptionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ServiceDescriptionTest.java
index 61e1854c9..281316e03 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ServiceDescriptionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ServiceDescriptionTest.java
@@ -22,8 +22,7 @@ package org.opensaml.saml.saml2.metadata.impl;
import org.testng.annotations.Test;
import org.testng.Assert;
-
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.metadata.ServiceDescription;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ServiceNameTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ServiceNameTest.java
index 1b343c755..ba1795ca1 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ServiceNameTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ServiceNameTest.java
@@ -24,7 +24,7 @@ import org.testng.annotations.Test;
import org.testng.Assert;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.metadata.ServiceName;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SingleLogoutServiceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SingleLogoutServiceTest.java
index d1961e771..f7406e06a 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SingleLogoutServiceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SingleLogoutServiceTest.java
@@ -22,8 +22,8 @@ package org.opensaml.saml.saml2.metadata.impl;
import javax.xml.namespace.QName;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.schema.XSAny;
import org.opensaml.core.xml.util.AttributeMap;
import org.opensaml.saml.saml2.metadata.SingleLogoutService;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SingleSignOnServiceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SingleSignOnServiceTest.java
index ba3727ed8..54e030235 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SingleSignOnServiceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SingleSignOnServiceTest.java
@@ -23,7 +23,7 @@ package org.opensaml.saml.saml2.metadata.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.metadata.SingleSignOnService;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SurNameTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SurNameTest.java
index a1d2bd548..a39120617 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SurNameTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SurNameTest.java
@@ -23,7 +23,7 @@ package org.opensaml.saml.saml2.metadata.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.metadata.SurName;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberTest.java
index 036516c14..156a352fb 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberTest.java
@@ -23,7 +23,7 @@ package org.opensaml.saml.saml2.metadata.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.saml2.metadata.TelephoneNumber;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/AbstractSAML2NameIDGeneratorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/AbstractSAML2NameIDGeneratorTest.java
index 9ce2a859c..4f406f877 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/AbstractSAML2NameIDGeneratorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/AbstractSAML2NameIDGeneratorTest.java
@@ -20,7 +20,7 @@ package org.opensaml.saml.saml2.profile;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.FunctionSupport;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.saml.common.SAMLException;
import org.opensaml.saml.saml2.core.NameID;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddChannelBindingsToAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddChannelBindingsToAssertionsTest.java
index d109f1a38..a43447c15 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddChannelBindingsToAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddChannelBindingsToAssertionsTest.java
@@ -19,19 +19,19 @@ package org.opensaml.saml.saml2.profile.impl;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.saml.common.SAMLObjectBuilder;
import org.opensaml.saml.common.messaging.context.ChannelBindingsContext;
import org.opensaml.saml.ext.saml2cb.ChannelBindings;
import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.Response;
import org.opensaml.saml.saml2.profile.SAML2ActionSupport;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddGeneratedKeyToAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddGeneratedKeyToAssertionsTest.java
index 33af774e3..ea1f4ebcf 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddGeneratedKeyToAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddGeneratedKeyToAssertionsTest.java
@@ -21,17 +21,17 @@ import net.shibboleth.utilities.java.support.codec.Base64Support;
import net.shibboleth.utilities.java.support.codec.EncodingException;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.saml.common.messaging.context.ECPContext;
import org.opensaml.saml.ext.samlec.GeneratedKey;
import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.Response;
import org.opensaml.saml.saml2.profile.SAML2ActionSupport;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjectsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjectsTest.java
index 72400226e..4b0d733b3 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjectsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjectsTest.java
@@ -29,11 +29,11 @@ import javax.annotation.Nonnull;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.saml.common.SAMLException;
import org.opensaml.saml.common.SAMLObjectBuilder;
import org.opensaml.saml.common.binding.impl.SAMLMetadataLookupHandlerTest;
@@ -48,7 +48,7 @@ import org.opensaml.saml.saml2.core.NameIDPolicy;
import org.opensaml.saml.saml2.core.Response;
import org.opensaml.saml.saml2.core.Subject;
import org.opensaml.saml.saml2.profile.AbstractSAML2NameIDGenerator;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddOneTimeUseConditionToAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddOneTimeUseConditionToAssertionsTest.java
index 113449a24..28146e992 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddOneTimeUseConditionToAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddOneTimeUseConditionToAssertionsTest.java
@@ -19,18 +19,18 @@ package org.opensaml.saml.saml2.profile.impl;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.saml.common.SAMLObjectBuilder;
import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.Conditions;
import org.opensaml.saml.saml2.core.OneTimeUse;
import org.opensaml.saml.saml2.core.Response;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddProxyRestrictionToAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddProxyRestrictionToAssertionsTest.java
index 8b12e2773..50109b638 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddProxyRestrictionToAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddProxyRestrictionToAssertionsTest.java
@@ -24,19 +24,19 @@ import net.shibboleth.utilities.java.support.logic.FunctionSupport;
import java.util.Set;
import java.util.stream.Collectors;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.saml.common.SAMLObjectBuilder;
import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.Audience;
import org.opensaml.saml.saml2.core.Conditions;
import org.opensaml.saml.saml2.core.ProxyRestriction;
import org.opensaml.saml.saml2.core.Response;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddStatusResponseShellTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddStatusResponseShellTest.java
index a6cbfaf08..215ba2cbb 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddStatusResponseShellTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddStatusResponseShellTest.java
@@ -19,19 +19,19 @@ package org.opensaml.saml.saml2.profile.impl;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.saml.common.SAMLVersion;
import org.opensaml.saml.saml2.core.ArtifactResponse;
import org.opensaml.saml.saml2.core.LogoutResponse;
import org.opensaml.saml.saml2.core.Response;
import org.opensaml.saml.saml2.core.Status;
import org.opensaml.saml.saml2.core.StatusCode;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddStatusToResponseTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddStatusToResponseTest.java
index f05115cfd..379d96bf4 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddStatusToResponseTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddStatusToResponseTest.java
@@ -19,17 +19,17 @@ package org.opensaml.saml.saml2.profile.impl;
import java.util.Arrays;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
import org.opensaml.saml.saml2.core.Response;
import org.opensaml.saml.saml2.core.Status;
import org.opensaml.saml.saml2.core.StatusCode;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjectsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjectsTest.java
index 647c253b9..063ad12bd 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjectsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjectsTest.java
@@ -19,11 +19,11 @@ package org.opensaml.saml.saml2.profile.impl;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.saml.common.messaging.context.SAMLMessageInfoContext;
import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.AuthnRequest;
@@ -31,7 +31,7 @@ import org.opensaml.saml.saml2.core.Response;
import org.opensaml.saml.saml2.core.Subject;
import org.opensaml.saml.saml2.core.SubjectConfirmation;
import org.opensaml.saml.saml2.core.SubjectConfirmationData;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.springframework.mock.web.MockHttpServletRequest;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/CopyNameIDFromRequestTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/CopyNameIDFromRequestTest.java
index b15153f1a..7ddd90581 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/CopyNameIDFromRequestTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/CopyNameIDFromRequestTest.java
@@ -19,15 +19,15 @@ package org.opensaml.saml.saml2.profile.impl;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.Response;
import org.opensaml.saml.saml2.core.Subject;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/DecryptNameIDsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/DecryptNameIDsTest.java
index ac67cdc0f..a3c802676 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/DecryptNameIDsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/DecryptNameIDsTest.java
@@ -26,12 +26,12 @@ import java.security.NoSuchAlgorithmException;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.saml.common.SAMLObjectBuilder;
import org.opensaml.saml.common.profile.SAMLEventIds;
import org.opensaml.saml.saml2.core.AuthnRequest;
@@ -39,7 +39,7 @@ import org.opensaml.saml.saml2.core.EncryptedID;
import org.opensaml.saml.saml2.core.NameID;
import org.opensaml.saml.saml2.core.Subject;
import org.opensaml.saml.saml2.encryption.Encrypter;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.opensaml.security.credential.Credential;
import org.opensaml.xmlsec.DecryptionParameters;
import org.opensaml.xmlsec.algorithm.AlgorithmSupport;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/EncryptAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/EncryptAssertionsTest.java
index 7d223fbee..51bb13608 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/EncryptAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/EncryptAssertionsTest.java
@@ -22,16 +22,16 @@ import java.security.NoSuchProviderException;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.saml.saml2.core.EncryptedAssertion;
import org.opensaml.saml.saml2.core.Response;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
import org.opensaml.saml.saml2.profile.context.EncryptionContext;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.opensaml.xmlsec.EncryptionParameters;
import org.opensaml.xmlsec.algorithm.AlgorithmSupport;
import org.opensaml.xmlsec.encryption.support.EncryptionConstants;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/EncryptAttributesTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/EncryptAttributesTest.java
index 47b5aaac0..0a6af6f57 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/EncryptAttributesTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/EncryptAttributesTest.java
@@ -22,20 +22,20 @@ import java.security.NoSuchProviderException;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.saml.common.SAMLObjectBuilder;
import org.opensaml.saml.saml2.core.Attribute;
import org.opensaml.saml.saml2.core.AttributeStatement;
import org.opensaml.saml.saml2.core.EncryptedAttribute;
import org.opensaml.saml.saml2.core.Response;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
import org.opensaml.saml.saml2.profile.context.EncryptionContext;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.opensaml.xmlsec.EncryptionParameters;
import org.opensaml.xmlsec.algorithm.AlgorithmSupport;
import org.opensaml.xmlsec.encryption.support.EncryptionConstants;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/EncryptNameIDsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/EncryptNameIDsTest.java
index 4de200e84..0a7e9fbb6 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/EncryptNameIDsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/EncryptNameIDsTest.java
@@ -22,16 +22,16 @@ import java.security.NoSuchProviderException;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.saml.saml2.core.EncryptedID;
import org.opensaml.saml.saml2.core.Response;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
import org.opensaml.saml.saml2.profile.context.EncryptionContext;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.opensaml.xmlsec.EncryptionParameters;
import org.opensaml.xmlsec.algorithm.AlgorithmSupport;
import org.opensaml.xmlsec.encryption.support.EncryptionConstants;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/PopulateECPContextTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/PopulateECPContextTest.java
index 25ccd936b..cb1f10496 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/PopulateECPContextTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/PopulateECPContextTest.java
@@ -26,14 +26,14 @@ import java.security.NoSuchProviderException;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.saml.common.messaging.context.ECPContext;
import org.opensaml.saml.common.messaging.context.SAMLBindingContext;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
import org.opensaml.saml.saml2.profile.context.EncryptionContext;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.opensaml.xmlsec.EncryptionParameters;
/** Unit test for {@link PopulateECPContext}. */
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ResolveArtifactTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ResolveArtifactTest.java
index 64d98c6ee..ae84d65dd 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ResolveArtifactTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ResolveArtifactTest.java
@@ -19,21 +19,21 @@ package org.opensaml.saml.saml2.profile.impl;
import java.io.IOException;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.FunctionSupport;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
import org.opensaml.saml.common.binding.artifact.impl.BasicSAMLArtifactMap;
import org.opensaml.saml.common.messaging.context.SAMLPeerEntityContext;
import org.opensaml.saml.common.profile.SAMLEventIds;
import org.opensaml.saml.saml2.core.ArtifactResponse;
import org.opensaml.saml.saml2.core.Response;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/TestSelfEncryption.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/TestSelfEncryption.java
index d1648231b..bbbecbdb6 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/TestSelfEncryption.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/TestSelfEncryption.java
@@ -25,16 +25,16 @@ import java.util.List;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.FunctionSupport;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.saml.saml2.core.EncryptedID;
import org.opensaml.saml.saml2.core.Response;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
import org.opensaml.saml.saml2.profile.context.EncryptionContext;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.opensaml.xmlsec.EncryptionParameters;
import org.opensaml.xmlsec.algorithm.AlgorithmSupport;
import org.opensaml.xmlsec.encryption.support.EncryptionConstants;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertionsTest.java
index c384f7a6c..c742c1e3c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertionsTest.java
@@ -22,10 +22,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.saml.common.assertion.AssertionValidationException;
import org.opensaml.saml.common.assertion.ValidationProcessingData;
import org.opensaml.saml.common.assertion.ValidationResult;
@@ -33,7 +33,7 @@ import org.opensaml.saml.common.profile.SAMLEventIds;
import org.opensaml.saml.saml2.assertion.MockAssertionValidator;
import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.Response;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.testng.Assert;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/DefaultSAML20AssertionValidationContextBuilderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/DefaultSAML20AssertionValidationContextBuilderTest.java
index 08eff735d..f3c26c7cc 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/DefaultSAML20AssertionValidationContextBuilderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/DefaultSAML20AssertionValidationContextBuilderTest.java
@@ -31,7 +31,7 @@ import net.shibboleth.utilities.java.support.collection.Pair;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import org.opensaml.core.criterion.EntityIdCriterion;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.saml.common.assertion.ValidationContext;
import org.opensaml.saml.common.messaging.context.SAMLSelfEntityContext;
@@ -41,7 +41,7 @@ import org.opensaml.saml.criterion.ProtocolCriterion;
import org.opensaml.saml.saml2.assertion.SAML2AssertionValidationParameters;
import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.metadata.IDPSSODescriptor;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.opensaml.security.credential.UsageType;
import org.opensaml.security.criteria.UsageCriterion;
import org.opensaml.security.x509.X509Support;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandlerTest.java
index fc4707f53..e6c78bea9 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandlerTest.java
@@ -28,8 +28,8 @@ import javax.annotation.Nullable;
import net.shibboleth.utilities.java.support.collection.Pair;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.handler.MessageHandlerException;
@@ -41,7 +41,7 @@ import org.opensaml.saml.saml2.assertion.SAML20AssertionValidator;
import org.opensaml.saml.saml2.assertion.SAML2AssertionValidationParameters;
import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.SubjectConfirmation;
-import org.opensaml.saml.saml2.profile.SAML2ActionTestingSupport;
+import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
import org.opensaml.saml.saml2.wssecurity.SAML20AssertionToken;
import org.opensaml.security.SecurityException;
import org.opensaml.soap.messaging.context.SOAP11Context;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/InlineSelfEncryptionParametersStrategyTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/InlineSelfEncryptionParametersStrategyTest.java
index ce13eae0f..84a8bf771 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/InlineSelfEncryptionParametersStrategyTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/InlineSelfEncryptionParametersStrategyTest.java
@@ -27,9 +27,9 @@ import javax.annotation.Nullable;
import net.shibboleth.utilities.java.support.collection.Pair;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
-import org.opensaml.profile.RequestContextBuilder;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.security.credential.Credential;
import org.opensaml.security.credential.impl.CollectionCredentialResolver;
import org.opensaml.xmlsec.EncryptionConfiguration;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/MetadataCredentialResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/MetadataCredentialResolverTest.java
index 740665aac..fac016b53 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/MetadataCredentialResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/MetadataCredentialResolverTest.java
@@ -32,7 +32,7 @@ import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
import org.opensaml.core.criterion.EntityIdCriterion;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.saml.common.SAMLTestSupport;
import org.opensaml.saml.criterion.EntityRoleCriterion;
import org.opensaml.saml.criterion.ProtocolCriterion;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolverTest.java
index 67fb7d176..e33d78745 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolverTest.java
@@ -40,7 +40,7 @@ import net.shibboleth.utilities.java.support.resolver.ResolverException;
import org.opensaml.core.config.ConfigurationService;
import org.opensaml.core.config.InitializationException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.saml.common.SAMLTestSupport;
import org.opensaml.saml.criterion.RoleDescriptorCriterion;
import org.opensaml.saml.saml2.metadata.EncryptionMethod;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLMetadataSignatureSigningParametersResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLMetadataSignatureSigningParametersResolverTest.java
index 06c2ef125..409980edd 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLMetadataSignatureSigningParametersResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLMetadataSignatureSigningParametersResolverTest.java
@@ -30,8 +30,8 @@ import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.saml.criterion.RoleDescriptorCriterion;
import org.opensaml.saml.ext.saml2alg.DigestMethod;
import org.opensaml.saml.ext.saml2alg.SigningMethod;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLSignatureProfileValidatorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLSignatureProfileValidatorTest.java
index ef2dbc77d..7ab96daca 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLSignatureProfileValidatorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLSignatureProfileValidatorTest.java
@@ -20,7 +20,7 @@ package org.opensaml.saml.security.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.saml.common.SignableSAMLObject;
import org.opensaml.xmlsec.signature.Signature;
import org.opensaml.xmlsec.signature.impl.SignatureImpl;
diff --git a/opensaml-security-impl/src/test/java/org/opensaml/security/config/impl/ClientTLSValidationConfigurationInitializerTest.java b/opensaml-security-impl/src/test/java/org/opensaml/security/config/impl/ClientTLSValidationConfigurationInitializerTest.java
index fc9cfc140..3910d7970 100644
--- a/opensaml-security-impl/src/test/java/org/opensaml/security/config/impl/ClientTLSValidationConfigurationInitializerTest.java
+++ b/opensaml-security-impl/src/test/java/org/opensaml/security/config/impl/ClientTLSValidationConfigurationInitializerTest.java
@@ -19,7 +19,7 @@ package org.opensaml.security.config.impl;
import org.opensaml.core.config.ConfigurationService;
import org.opensaml.core.config.InitializationException;
-import org.opensaml.core.config.InitializerBaseTestCase;
+import org.opensaml.core.testing.InitializerBaseTestCase;
import org.opensaml.security.x509.tls.ClientTLSValidationConfiguration;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-security-impl/src/test/java/org/opensaml/security/messaging/impl/PopulateHttpClientSecurityParametersHandlerTest.java b/opensaml-security-impl/src/test/java/org/opensaml/security/messaging/impl/PopulateHttpClientSecurityParametersHandlerTest.java
index 14dcf921d..46ecb4987 100644
--- a/opensaml-security-impl/src/test/java/org/opensaml/security/messaging/impl/PopulateHttpClientSecurityParametersHandlerTest.java
+++ b/opensaml-security-impl/src/test/java/org/opensaml/security/messaging/impl/PopulateHttpClientSecurityParametersHandlerTest.java
@@ -26,7 +26,7 @@ import java.util.Collections;
import javax.crypto.SecretKey;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.handler.MessageHandlerException;
import org.opensaml.security.credential.Credential;
diff --git a/opensaml-security-impl/src/test/java/org/opensaml/security/x509/impl/BasicX509CredentialNameEvaluatorTest.java b/opensaml-security-impl/src/test/java/org/opensaml/security/x509/impl/BasicX509CredentialNameEvaluatorTest.java
index e65481a58..1efe65f30 100644
--- a/opensaml-security-impl/src/test/java/org/opensaml/security/x509/impl/BasicX509CredentialNameEvaluatorTest.java
+++ b/opensaml-security-impl/src/test/java/org/opensaml/security/x509/impl/BasicX509CredentialNameEvaluatorTest.java
@@ -23,7 +23,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.security.SecurityException;
import org.opensaml.security.credential.CredentialSupport;
import org.opensaml.security.x509.X509Credential;
diff --git a/opensaml-security-impl/src/test/java/org/opensaml/security/x509/impl/CertPathPKIXTrustEvaluatorTest.java b/opensaml-security-impl/src/test/java/org/opensaml/security/x509/impl/CertPathPKIXTrustEvaluatorTest.java
index 52f52fe98..77669e593 100644
--- a/opensaml-security-impl/src/test/java/org/opensaml/security/x509/impl/CertPathPKIXTrustEvaluatorTest.java
+++ b/opensaml-security-impl/src/test/java/org/opensaml/security/x509/impl/CertPathPKIXTrustEvaluatorTest.java
@@ -28,7 +28,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.security.SecurityException;
import org.opensaml.security.x509.BasicX509Credential;
import org.opensaml.security.x509.PKIXTrustEvaluator;
diff --git a/opensaml-security-impl/src/test/java/org/opensaml/security/x509/impl/PKIXX509CredentialTrustEngineTest.java b/opensaml-security-impl/src/test/java/org/opensaml/security/x509/impl/PKIXX509CredentialTrustEngineTest.java
index dc371d99a..fb9835c35 100644
--- a/opensaml-security-impl/src/test/java/org/opensaml/security/x509/impl/PKIXX509CredentialTrustEngineTest.java
+++ b/opensaml-security-impl/src/test/java/org/opensaml/security/x509/impl/PKIXX509CredentialTrustEngineTest.java
@@ -29,7 +29,7 @@ import java.util.Set;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import org.opensaml.core.criterion.EntityIdCriterion;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.security.SecurityException;
import org.opensaml.security.x509.BasicX509Credential;
import org.opensaml.security.x509.PKIXValidationInformation;
diff --git a/opensaml-soap-impl/src/test/java/org/opensaml/soap/client/soap11/decoder/http/impl/HttpClientResponseSOAP11DecoderTest.java b/opensaml-soap-impl/src/test/java/org/opensaml/soap/client/soap11/decoder/http/impl/HttpClientResponseSOAP11DecoderTest.java
index 9a4a1366e..aa081db6a 100644
--- a/opensaml-soap-impl/src/test/java/org/opensaml/soap/client/soap11/decoder/http/impl/HttpClientResponseSOAP11DecoderTest.java
+++ b/opensaml-soap-impl/src/test/java/org/opensaml/soap/client/soap11/decoder/http/impl/HttpClientResponseSOAP11DecoderTest.java
@@ -30,7 +30,7 @@ import org.apache.http.HttpStatus;
import org.apache.http.HttpVersion;
import org.apache.http.entity.ByteArrayEntity;
import org.apache.http.message.BasicHttpResponse;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.mock.SimpleXMLObject;
import org.opensaml.core.xml.util.XMLObjectSupport;
diff --git a/opensaml-soap-impl/src/test/java/org/opensaml/soap/client/soap11/encoder/http/impl/HttpClientRequestSOAP11EncoderTest.java b/opensaml-soap-impl/src/test/java/org/opensaml/soap/client/soap11/encoder/http/impl/HttpClientRequestSOAP11EncoderTest.java
index 76e4b54b6..39d69c5e4 100644
--- a/opensaml-soap-impl/src/test/java/org/opensaml/soap/client/soap11/encoder/http/impl/HttpClientRequestSOAP11EncoderTest.java
+++ b/opensaml-soap-impl/src/test/java/org/opensaml/soap/client/soap11/encoder/http/impl/HttpClientRequestSOAP11EncoderTest.java
@@ -20,7 +20,7 @@ package org.opensaml.soap.client.soap11.encoder.http.impl;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.apache.http.client.methods.HttpPost;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.mock.SimpleXMLObject;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.encoder.MessageEncodingException;
diff --git a/opensaml-soap-impl/src/test/java/org/opensaml/soap/config/impl/XMLObjectProviderInitializerTest.java b/opensaml-soap-impl/src/test/java/org/opensaml/soap/config/impl/XMLObjectProviderInitializerTest.java
index 782913707..d71f1dc7c 100644
--- a/opensaml-soap-impl/src/test/java/org/opensaml/soap/config/impl/XMLObjectProviderInitializerTest.java
+++ b/opensaml-soap-impl/src/test/java/org/opensaml/soap/config/impl/XMLObjectProviderInitializerTest.java
@@ -20,7 +20,7 @@ package org.opensaml.soap.config.impl;
import javax.xml.namespace.QName;
import org.opensaml.core.config.Initializer;
-import org.opensaml.core.xml.config.XMLObjectProviderInitializerBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderInitializerBaseTestCase;
import org.opensaml.soap.soap11.Envelope;
import org.opensaml.soap.wsaddressing.Action;
import org.opensaml.soap.wspolicy.Policy;
diff --git a/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/SOAPTest.java b/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/SOAPTest.java
index 6faa8f43d..c662534bb 100644
--- a/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/SOAPTest.java
+++ b/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/SOAPTest.java
@@ -24,7 +24,7 @@ import javax.xml.namespace.QName;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObjectBuilder;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.io.Unmarshaller;
diff --git a/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/decoder/http/impl/HTTPSOAP11DecoderTest.java b/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/decoder/http/impl/HTTPSOAP11DecoderTest.java
index 22bd23bac..8f627cfdd 100644
--- a/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/decoder/http/impl/HTTPSOAP11DecoderTest.java
+++ b/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/decoder/http/impl/HTTPSOAP11DecoderTest.java
@@ -19,7 +19,7 @@ package org.opensaml.soap.soap11.decoder.http.impl;
import java.io.IOException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.schema.XSAny;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.decoder.MessageDecodingException;
diff --git a/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/encoder/http/impl/HTTPSOAP11EncoderTest.java b/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/encoder/http/impl/HTTPSOAP11EncoderTest.java
index 27f04063e..c65ddde19 100644
--- a/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/encoder/http/impl/HTTPSOAP11EncoderTest.java
+++ b/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/encoder/http/impl/HTTPSOAP11EncoderTest.java
@@ -26,8 +26,8 @@ import javax.servlet.http.HttpServletResponse;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObjectBuilder;
import org.opensaml.core.xml.io.Unmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
diff --git a/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/profile/impl/AddSOAPFaultTest.java b/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/profile/impl/AddSOAPFaultTest.java
index a03c72446..75216c855 100644
--- a/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/profile/impl/AddSOAPFaultTest.java
+++ b/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/profile/impl/AddSOAPFaultTest.java
@@ -22,12 +22,12 @@ import java.util.Collections;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.FunctionSupport;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.mock.SimpleXMLObject;
import org.opensaml.core.xml.util.XMLObjectSupport;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.soap.messaging.context.SOAP11Context;
import org.opensaml.soap.soap11.Fault;
import org.opensaml.soap.soap11.FaultCode;
diff --git a/opensaml-soap-impl/src/test/java/org/opensaml/soap/SOAPMessagingBaseTestCase.java b/opensaml-soap-impl/src/test/java/org/opensaml/soap/testing/SOAPMessagingBaseTestCase.java
similarity index 95%
rename from opensaml-soap-impl/src/test/java/org/opensaml/soap/SOAPMessagingBaseTestCase.java
rename to opensaml-soap-impl/src/test/java/org/opensaml/soap/testing/SOAPMessagingBaseTestCase.java
index 03035ef01..04bf71b5a 100644
--- a/opensaml-soap-impl/src/test/java/org/opensaml/soap/SOAPMessagingBaseTestCase.java
+++ b/opensaml-soap-impl/src/test/java/org/opensaml/soap/testing/SOAPMessagingBaseTestCase.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.opensaml.soap;
+package org.opensaml.soap.testing;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.soap.messaging.context.SOAP11Context;
import org.opensaml.soap.soap11.Body;
diff --git a/opensaml-soap-impl/src/test/java/org/opensaml/soap/WSBaseTestCase.java b/opensaml-soap-impl/src/test/java/org/opensaml/soap/testing/WSBaseTestCase.java
similarity index 97%
rename from opensaml-soap-impl/src/test/java/org/opensaml/soap/WSBaseTestCase.java
rename to opensaml-soap-impl/src/test/java/org/opensaml/soap/testing/WSBaseTestCase.java
index c6af88444..b8df1609b 100644
--- a/opensaml-soap-impl/src/test/java/org/opensaml/soap/WSBaseTestCase.java
+++ b/opensaml-soap-impl/src/test/java/org/opensaml/soap/testing/WSBaseTestCase.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.opensaml.soap;
+package org.opensaml.soap.testing;
import org.testng.Assert;
import javax.xml.namespace.QName;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.core.xml.io.Marshaller;
import org.opensaml.core.xml.io.Unmarshaller;
import org.w3c.dom.Element;
diff --git a/opensaml-soap-impl/src/test/java/org/opensaml/soap/wsaddressing/impl/WSAddressingObjectsTestCase.java b/opensaml-soap-impl/src/test/java/org/opensaml/soap/wsaddressing/impl/WSAddressingObjectsTestCase.java
index 19822a94e..578fad68e 100644
--- a/opensaml-soap-impl/src/test/java/org/opensaml/soap/wsaddressing/impl/WSAddressingObjectsTestCase.java
+++ b/opensaml-soap-impl/src/test/java/org/opensaml/soap/wsaddressing/impl/WSAddressingObjectsTestCase.java
@@ -18,7 +18,7 @@
package org.opensaml.soap.wsaddressing.impl;
import org.testng.annotations.Test;
-import org.opensaml.soap.WSBaseTestCase;
+import org.opensaml.soap.testing.WSBaseTestCase;
import org.opensaml.soap.wsaddressing.Action;
import org.opensaml.soap.wsaddressing.Address;
import org.opensaml.soap.wsaddressing.EndpointReference;
diff --git a/opensaml-soap-impl/src/test/java/org/opensaml/soap/wsaddressing/messaging/impl/AddActionHandlerTest.java b/opensaml-soap-impl/src/test/java/org/opensaml/soap/wsaddressing/messaging/impl/AddActionHandlerTest.java
index 98f0e24cd..eb015e8c3 100644
--- a/opensaml-soap-impl/src/test/java/org/opensaml/soap/wsaddressing/messaging/impl/AddActionHandlerTest.java
+++ b/opensaml-soap-impl/src/test/java/org/opensaml/soap/wsaddressing/messaging/impl/AddActionHandlerTest.java
@@ -20,10 +20,10 @@ package org.opensaml.soap.wsaddressing.messaging.impl;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.opensaml.messaging.handler.MessageHandlerException;
-import org.opensaml.soap.SOAPMessagingBaseTestCase;
import org.opensaml.soap.messaging.SOAPMessagingSupport;
import org.opensaml.soap.soap11.Fault;
import org.opensaml.soap.soap11.FaultCode;
+import org.opensaml.soap.testing.SOAPMessagingBaseTestCase;
import org.opensaml.soap.util.SOAPSupport;
import org.opensaml.soap.wsaddressing.Action;
import org.opensaml.soap.wsaddressing.WSAddressingConstants;
diff --git a/opensaml-soap-impl/src/test/java/org/opensaml/soap/wsaddressing/messaging/impl/AddMessageIDHandlerTest.java b/opensaml-soap-impl/src/test/java/org/opensaml/soap/wsaddressing/messaging/impl/AddMessageIDHandlerTest.java
index e5a101848..c5d6165e1 100644
--- a/opensaml-soap-impl/src/test/java/org/opensaml/soap/wsaddressing/messaging/impl/AddMessageIDHandlerTest.java
+++ b/opensaml-soap-impl/src/test/java/org/opensaml/soap/wsaddressing/messaging/impl/AddMessageIDHandlerTest.java
@@ -23,8 +23,8 @@ import net.shibboleth.utilities.java.support.component.ComponentInitializationEx
import net.shibboleth.utilities.java.support.security.IdentifierGenerationStrategy;
import org.opensaml.messaging.handler.MessageHandlerException;
-import org.opensaml.soap.SOAPMessagingBaseTestCase;
import org.opensaml.soap.messaging.SOAPMessagingSupport;
+import org.opensaml.soap.testing.SOAPMessagingBaseTestCase;
import org.opensaml.soap.wsaddressing.MessageID;
import org.opensaml.soap.wsaddressing.messaging.WSAddressingContext;
import org.testng.Assert;
diff --git a/opensaml-soap-impl/src/test/java/org/opensaml/soap/wsaddressing/messaging/impl/AddRelatesToHandlerTest.java b/opensaml-soap-impl/src/test/java/org/opensaml/soap/wsaddressing/messaging/impl/AddRelatesToHandlerTest.java
index 9a6c9ccb0..bea3b969e 100644
--- a/opensaml-soap-impl/src/test/java/org/opensaml/soap/wsaddressing/messaging/impl/AddRelatesToHandlerTest.java
+++ b/opensaml-soap-impl/src/test/java/org/opensaml/soap/wsaddressing/messaging/impl/AddRelatesToHandlerTest.java
@@ -24,8 +24,8 @@ import net.shibboleth.utilities.java.support.component.ComponentInitializationEx
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.context.navigate.ContextDataLookupFunction;
import org.opensaml.messaging.handler.MessageHandlerException;
-import org.opensaml.soap.SOAPMessagingBaseTestCase;
import org.opensaml.soap.messaging.SOAPMessagingSupport;
+import org.opensaml.soap.testing.SOAPMessagingBaseTestCase;
import org.opensaml.soap.wsaddressing.RelatesTo;
import org.opensaml.soap.wsaddressing.messaging.WSAddressingContext;
import org.testng.Assert;
diff --git a/opensaml-soap-impl/src/test/java/org/opensaml/soap/wsaddressing/messaging/impl/ExtractMessageIDHandlerTest.java b/opensaml-soap-impl/src/test/java/org/opensaml/soap/wsaddressing/messaging/impl/ExtractMessageIDHandlerTest.java
index 465dacb72..a6adea0a2 100644
--- a/opensaml-soap-impl/src/test/java/org/opensaml/soap/wsaddressing/messaging/impl/ExtractMessageIDHandlerTest.java
+++ b/opensaml-soap-impl/src/test/java/org/opensaml/soap/wsaddressing/messaging/impl/ExtractMessageIDHandlerTest.java
@@ -20,8 +20,8 @@ package org.opensaml.soap.wsaddressing.messaging.impl;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.opensaml.messaging.handler.MessageHandlerException;
-import org.opensaml.soap.SOAPMessagingBaseTestCase;
import org.opensaml.soap.messaging.SOAPMessagingSupport;
+import org.opensaml.soap.testing.SOAPMessagingBaseTestCase;
import org.opensaml.soap.wsaddressing.MessageID;
import org.opensaml.soap.wsaddressing.messaging.WSAddressingContext;
import org.testng.Assert;
diff --git a/opensaml-soap-impl/src/test/java/org/opensaml/soap/wsaddressing/messaging/impl/ValidateActionHandlerTest.java b/opensaml-soap-impl/src/test/java/org/opensaml/soap/wsaddressing/messaging/impl/ValidateActionHandlerTest.java
index b47aa685b..02823cad4 100644
--- a/opensaml-soap-impl/src/test/java/org/opensaml/soap/wsaddressing/messaging/impl/ValidateActionHandlerTest.java
+++ b/opensaml-soap-impl/src/test/java/org/opensaml/soap/wsaddressing/messaging/impl/ValidateActionHandlerTest.java
@@ -20,8 +20,8 @@ package org.opensaml.soap.wsaddressing.messaging.impl;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.opensaml.messaging.handler.MessageHandlerException;
-import org.opensaml.soap.SOAPMessagingBaseTestCase;
import org.opensaml.soap.messaging.SOAPMessagingSupport;
+import org.opensaml.soap.testing.SOAPMessagingBaseTestCase;
import org.opensaml.soap.wsaddressing.Action;
import org.opensaml.soap.wsaddressing.messaging.WSAddressingContext;
import org.testng.Assert;
diff --git a/opensaml-soap-impl/src/test/java/org/opensaml/soap/wspolicy/impl/WSPolicyObjectsTestCase.java b/opensaml-soap-impl/src/test/java/org/opensaml/soap/wspolicy/impl/WSPolicyObjectsTestCase.java
index 8d23c0b11..0756a46df 100644
--- a/opensaml-soap-impl/src/test/java/org/opensaml/soap/wspolicy/impl/WSPolicyObjectsTestCase.java
+++ b/opensaml-soap-impl/src/test/java/org/opensaml/soap/wspolicy/impl/WSPolicyObjectsTestCase.java
@@ -26,7 +26,7 @@ import org.opensaml.core.xml.schema.XSAny;
import org.opensaml.core.xml.schema.impl.XSAnyBuilder;
import org.opensaml.core.xml.schema.impl.XSAnyMarshaller;
import org.opensaml.core.xml.schema.impl.XSAnyUnmarshaller;
-import org.opensaml.soap.WSBaseTestCase;
+import org.opensaml.soap.testing.WSBaseTestCase;
import org.opensaml.soap.wspolicy.All;
import org.opensaml.soap.wspolicy.AppliesTo;
import org.opensaml.soap.wspolicy.ExactlyOne;
diff --git a/opensaml-soap-impl/src/test/java/org/opensaml/soap/wssecurity/impl/WSSecurityObjectsTestCase.java b/opensaml-soap-impl/src/test/java/org/opensaml/soap/wssecurity/impl/WSSecurityObjectsTestCase.java
index 205fdff7b..6d969fc4f 100644
--- a/opensaml-soap-impl/src/test/java/org/opensaml/soap/wssecurity/impl/WSSecurityObjectsTestCase.java
+++ b/opensaml-soap-impl/src/test/java/org/opensaml/soap/wssecurity/impl/WSSecurityObjectsTestCase.java
@@ -26,7 +26,7 @@ import java.util.List;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.Marshaller;
-import org.opensaml.soap.WSBaseTestCase;
+import org.opensaml.soap.testing.WSBaseTestCase;
import org.opensaml.soap.wssecurity.BinarySecurityToken;
import org.opensaml.soap.wssecurity.Created;
import org.opensaml.soap.wssecurity.Embedded;
diff --git a/opensaml-soap-impl/src/test/java/org/opensaml/soap/wssecurity/messaging/impl/AddTimestampHandlerTest.java b/opensaml-soap-impl/src/test/java/org/opensaml/soap/wssecurity/messaging/impl/AddTimestampHandlerTest.java
index 5347d69e2..34fe7e3ce 100644
--- a/opensaml-soap-impl/src/test/java/org/opensaml/soap/wssecurity/messaging/impl/AddTimestampHandlerTest.java
+++ b/opensaml-soap-impl/src/test/java/org/opensaml/soap/wssecurity/messaging/impl/AddTimestampHandlerTest.java
@@ -25,8 +25,8 @@ import net.shibboleth.utilities.java.support.component.ComponentInitializationEx
import net.shibboleth.utilities.java.support.logic.FunctionSupport;
import org.opensaml.messaging.handler.MessageHandlerException;
-import org.opensaml.soap.SOAPMessagingBaseTestCase;
import org.opensaml.soap.messaging.SOAPMessagingSupport;
+import org.opensaml.soap.testing.SOAPMessagingBaseTestCase;
import org.opensaml.soap.wssecurity.Security;
import org.opensaml.soap.wssecurity.Timestamp;
import org.opensaml.soap.wssecurity.messaging.WSSecurityContext;
diff --git a/opensaml-soap-impl/src/test/java/org/opensaml/soap/wstrust/impl/WSTrustObjectsTestCase.java b/opensaml-soap-impl/src/test/java/org/opensaml/soap/wstrust/impl/WSTrustObjectsTestCase.java
index f6f6b4b3e..e954bc0bc 100644
--- a/opensaml-soap-impl/src/test/java/org/opensaml/soap/wstrust/impl/WSTrustObjectsTestCase.java
+++ b/opensaml-soap-impl/src/test/java/org/opensaml/soap/wstrust/impl/WSTrustObjectsTestCase.java
@@ -31,7 +31,7 @@ import org.opensaml.core.xml.schema.XSBooleanValue;
import org.opensaml.core.xml.schema.impl.XSAnyBuilder;
import org.opensaml.core.xml.schema.impl.XSAnyMarshaller;
import org.opensaml.core.xml.schema.impl.XSAnyUnmarshaller;
-import org.opensaml.soap.WSBaseTestCase;
+import org.opensaml.soap.testing.WSBaseTestCase;
import org.opensaml.soap.wssecurity.Created;
import org.opensaml.soap.wssecurity.Password;
import org.opensaml.soap.wssecurity.Timestamp;
diff --git a/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/client/LoadClientStorageServicesTest.java b/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/client/LoadClientStorageServicesTest.java
index e7f233620..51518129b 100644
--- a/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/client/LoadClientStorageServicesTest.java
+++ b/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/client/LoadClientStorageServicesTest.java
@@ -23,10 +23,10 @@ import java.util.concurrent.locks.Lock;
import javax.servlet.http.Cookie;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.storage.StorageRecord;
import org.opensaml.storage.StorageService;
import org.opensaml.storage.impl.client.ClientStorageService.ClientStorageSource;
diff --git a/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/client/PopulateClientStorageLoadContextTest.java b/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/client/PopulateClientStorageLoadContextTest.java
index e614c12ec..90488acdd 100644
--- a/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/client/PopulateClientStorageLoadContextTest.java
+++ b/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/client/PopulateClientStorageLoadContextTest.java
@@ -19,9 +19,9 @@ package org.opensaml.storage.impl.client;
import java.util.Collections;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.storage.impl.client.ClientStorageService.ClientStorageSource;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/client/PopulateClientStorageSaveContextTest.java b/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/client/PopulateClientStorageSaveContextTest.java
index dff2ecd1f..9cae1374c 100644
--- a/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/client/PopulateClientStorageSaveContextTest.java
+++ b/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/client/PopulateClientStorageSaveContextTest.java
@@ -20,9 +20,9 @@ package org.opensaml.storage.impl.client;
import java.io.IOException;
import java.util.Collections;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.storage.impl.client.ClientStorageService.ClientStorageSource;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/client/SaveCookieBackedClientStorageServicesTest.java b/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/client/SaveCookieBackedClientStorageServicesTest.java
index df296953b..dc8e87ab7 100644
--- a/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/client/SaveCookieBackedClientStorageServicesTest.java
+++ b/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/client/SaveCookieBackedClientStorageServicesTest.java
@@ -20,10 +20,10 @@ package org.opensaml.storage.impl.client;
import java.io.IOException;
import java.util.Collections;
-import org.opensaml.profile.RequestContextBuilder;
-import org.opensaml.profile.action.ActionTestingSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.testing.ActionTestingSupport;
+import org.opensaml.profile.testing.RequestContextBuilder;
import org.opensaml.storage.impl.client.ClientStorageService.ClientStorageSource;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/config/impl/XMLObjectProviderInitializerTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/config/impl/XMLObjectProviderInitializerTest.java
index f0de06f58..25bd506f5 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/config/impl/XMLObjectProviderInitializerTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/config/impl/XMLObjectProviderInitializerTest.java
@@ -20,7 +20,7 @@ package org.opensaml.xacml.config.impl;
import javax.xml.namespace.QName;
import org.opensaml.core.config.Initializer;
-import org.opensaml.core.xml.config.XMLObjectProviderInitializerBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderInitializerBaseTestCase;
import org.opensaml.xacml.ctx.EnvironmentType;
import org.opensaml.xacml.policy.PolicySetType;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/ActionTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/ActionTest.java
index c6aa57bb8..466aebaa3 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/ActionTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/ActionTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.ctx.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.ctx.ActionType;
import org.opensaml.xacml.ctx.AttributeType;
import org.testng.Assert;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/AttributeTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/AttributeTest.java
index 978fae4b6..120b95633 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/AttributeTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/AttributeTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.ctx.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.ctx.AttributeType;
import org.opensaml.xacml.ctx.AttributeValueType;
import org.testng.Assert;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/AttributeValueTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/AttributeValueTest.java
index 96d970613..b4bf86a40 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/AttributeValueTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/AttributeValueTest.java
@@ -19,7 +19,7 @@ package org.opensaml.xacml.ctx.impl;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.XACMLConstants;
import org.opensaml.xacml.ctx.AttributeValueType;
import org.opensaml.xacml.policy.ActionType;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/DecisionTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/DecisionTest.java
index 1c78b4445..0a405cc54 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/DecisionTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/DecisionTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.ctx.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.ctx.DecisionType;
import org.opensaml.xacml.ctx.DecisionType.DECISION;
import org.testng.Assert;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/EnvironmentTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/EnvironmentTest.java
index e3936c318..8b90d803f 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/EnvironmentTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/EnvironmentTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.ctx.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.ctx.AttributeType;
import org.opensaml.xacml.ctx.EnvironmentType;
import org.testng.Assert;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/MissingAttributeDetailTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/MissingAttributeDetailTest.java
index 78976b157..83b159928 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/MissingAttributeDetailTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/MissingAttributeDetailTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.ctx.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.ctx.AttributeValueType;
import org.opensaml.xacml.ctx.MissingAttributeDetailType;
import org.testng.Assert;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/RequestTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/RequestTest.java
index 223f8abb8..ec486c268 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/RequestTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/RequestTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.ctx.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.ctx.ActionType;
import org.opensaml.xacml.ctx.EnvironmentType;
import org.opensaml.xacml.ctx.RequestType;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/ResourceContentTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/ResourceContentTest.java
index db62ac7fa..2c22190d7 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/ResourceContentTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/ResourceContentTest.java
@@ -19,7 +19,7 @@ package org.opensaml.xacml.ctx.impl;
import javax.xml.namespace.QName;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.XACMLConstants;
import org.opensaml.xacml.ctx.ResourceContentType;
import org.opensaml.xacml.policy.ActionType;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/ResourceTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/ResourceTest.java
index c95075d37..d34e224be 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/ResourceTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/ResourceTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.ctx.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.ctx.AttributeType;
import org.opensaml.xacml.ctx.ResourceContentType;
import org.opensaml.xacml.ctx.ResourceType;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/ResponseTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/ResponseTest.java
index ab82e9109..1637078b4 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/ResponseTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/ResponseTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.ctx.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.ctx.ResponseType;
import org.opensaml.xacml.ctx.ResultType;
import org.testng.Assert;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/ResultTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/ResultTest.java
index c403aa0c9..acbc9620c 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/ResultTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/ResultTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.ctx.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.ctx.DecisionType;
import org.opensaml.xacml.ctx.DecisionType.DECISION;
import org.opensaml.xacml.ctx.ResultType;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/StatusCodeTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/StatusCodeTest.java
index 1f1e09567..3722c949e 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/StatusCodeTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/StatusCodeTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.ctx.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.ctx.StatusCodeType;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/StatusDetailTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/StatusDetailTest.java
index 1d01d8a66..71fb86ff4 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/StatusDetailTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/StatusDetailTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.ctx.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.ctx.StatusDetailType;
import org.opensaml.xacml.policy.ActionType;
import org.opensaml.xacml.policy.ApplyType;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/StatusMessageTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/StatusMessageTest.java
index 9ad9ed78c..9b0cec646 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/StatusMessageTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/StatusMessageTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.ctx.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.ctx.StatusMessageType;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/StatusTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/StatusTest.java
index 2e7ab15c7..ab5e1789c 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/StatusTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/StatusTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.ctx.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.ctx.StatusCodeType;
import org.opensaml.xacml.ctx.StatusDetailType;
import org.opensaml.xacml.ctx.StatusMessageType;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/SubjectTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/SubjectTest.java
index 76cfd9f5f..765a71db1 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/SubjectTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/impl/SubjectTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.ctx.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.ctx.AttributeType;
import org.opensaml.xacml.ctx.SubjectType;
import org.testng.Assert;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/provider/impl/ObligationServiceTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/provider/impl/ObligationServiceTest.java
index 31d6ba587..9a666e004 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/provider/impl/ObligationServiceTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/provider/impl/ObligationServiceTest.java
@@ -23,7 +23,7 @@ import java.util.Collections;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.xacml.ctx.DecisionType;
import org.opensaml.xacml.ctx.DecisionType.DECISION;
import org.opensaml.xacml.ctx.ResultType;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ActionAttributeDesignatorTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ActionAttributeDesignatorTest.java
index f5ac20423..7f5b0c29e 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ActionAttributeDesignatorTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ActionAttributeDesignatorTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.AttributeDesignatorType;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ActionMatchTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ActionMatchTest.java
index 8e6e5d9a2..5a5d72ab8 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ActionMatchTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ActionMatchTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.ActionMatchType;
import org.opensaml.xacml.policy.AttributeDesignatorType;
import org.opensaml.xacml.policy.AttributeSelectorType;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ActionTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ActionTest.java
index cce773c9c..04719b036 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ActionTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ActionTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.ActionMatchType;
import org.opensaml.xacml.policy.ActionType;
import org.testng.Assert;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ActionsTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ActionsTest.java
index ad27a1e0e..da1b6f910 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ActionsTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ActionsTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.ActionType;
import org.opensaml.xacml.policy.ActionsType;
import org.testng.Assert;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ApplyTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ApplyTest.java
index d5a3ddd70..5d00285ca 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ApplyTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ApplyTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.ApplyType;
import org.opensaml.xacml.policy.AttributeDesignatorType;
import org.opensaml.xacml.policy.AttributeSelectorType;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTest.java
index 4d4582b43..47c1f7b85 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.AttributeAssignmentType;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/AttributeSelectorTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/AttributeSelectorTest.java
index b82e63d51..ec3831e72 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/AttributeSelectorTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/AttributeSelectorTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.AttributeSelectorType;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/AttributeValueTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/AttributeValueTest.java
index 096e75b60..9005fac41 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/AttributeValueTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/AttributeValueTest.java
@@ -19,8 +19,8 @@ package org.opensaml.xacml.policy.impl;
import javax.xml.namespace.QName;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.util.AttributeMap;
import org.opensaml.xacml.policy.ActionsType;
import org.opensaml.xacml.policy.AttributeValueType;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/CombinerParameterTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/CombinerParameterTest.java
index 69debdf21..e473e1f09 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/CombinerParameterTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/CombinerParameterTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.AttributeValueType;
import org.opensaml.xacml.policy.CombinerParameterType;
import org.testng.Assert;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/CombinerParametersTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/CombinerParametersTest.java
index 6d5ab17c3..d12e934f3 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/CombinerParametersTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/CombinerParametersTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.CombinerParameterType;
import org.opensaml.xacml.policy.CombinerParametersType;
import org.testng.Assert;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ConditionTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ConditionTest.java
index 8f7b9514a..7888bf94a 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ConditionTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ConditionTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.ConditionType;
import org.opensaml.xacml.policy.FunctionType;
import org.testng.Assert;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/DescriptionTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/DescriptionTest.java
index c3bbf655c..b4c9b0294 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/DescriptionTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/DescriptionTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.DescriptionType;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/EnvironmentAttributeDesignatorTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/EnvironmentAttributeDesignatorTest.java
index 263b6f722..ced3d3f35 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/EnvironmentAttributeDesignatorTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/EnvironmentAttributeDesignatorTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.AttributeDesignatorType;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/EnvironmentMatchTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/EnvironmentMatchTest.java
index be4afe4f8..1c7d55ef6 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/EnvironmentMatchTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/EnvironmentMatchTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.AttributeDesignatorType;
import org.opensaml.xacml.policy.AttributeSelectorType;
import org.opensaml.xacml.policy.AttributeValueType;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/EnvironmentTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/EnvironmentTest.java
index 5e59b0ffa..50869cc01 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/EnvironmentTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/EnvironmentTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.EnvironmentMatchType;
import org.opensaml.xacml.policy.EnvironmentType;
import org.testng.Assert;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/EnvironmentsTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/EnvironmentsTest.java
index d6113e600..ddd91ebee 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/EnvironmentsTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/EnvironmentsTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.EnvironmentType;
import org.opensaml.xacml.policy.EnvironmentsType;
import org.testng.Assert;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/FunctionTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/FunctionTest.java
index c881b5e27..434d7de23 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/FunctionTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/FunctionTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.FunctionType;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ObligationTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ObligationTest.java
index 8754d48b9..77138bd84 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ObligationTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ObligationTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.AttributeAssignmentType;
import org.opensaml.xacml.policy.EffectType;
import org.opensaml.xacml.policy.ObligationType;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ObligationsTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ObligationsTest.java
index fb9219856..7b14d4e84 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ObligationsTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ObligationsTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.EffectType;
import org.opensaml.xacml.policy.ObligationType;
import org.opensaml.xacml.policy.ObligationsType;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTest.java
index e3d812691..deee50be9 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.PolicyCombinerParametersType;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicyDefaultsTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicyDefaultsTest.java
index 8751e979e..c11693084 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicyDefaultsTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicyDefaultsTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.schema.XSString;
import org.opensaml.xacml.policy.DefaultsType;
import org.opensaml.xacml.policy.XPathVersion;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicyIdReferenceTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicyIdReferenceTest.java
index 532afdfa0..e3f5cf372 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicyIdReferenceTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicyIdReferenceTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.IdReferenceType;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicySetCombinerParametersTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicySetCombinerParametersTest.java
index 323201b64..efeefbd97 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicySetCombinerParametersTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicySetCombinerParametersTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.PolicySetCombinerParametersType;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicySetDefaultsTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicySetDefaultsTest.java
index ffeda8bd6..852b49de2 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicySetDefaultsTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicySetDefaultsTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.schema.XSString;
import org.opensaml.xacml.policy.DefaultsType;
import org.opensaml.xacml.policy.XPathVersion;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicySetIdReferenceTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicySetIdReferenceTest.java
index 591c832ee..469f1b9e8 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicySetIdReferenceTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicySetIdReferenceTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.IdReferenceType;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicySetTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicySetTest.java
index 0d0c177c2..67f8c4b06 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicySetTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicySetTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.CombinerParametersType;
import org.opensaml.xacml.policy.DefaultsType;
import org.opensaml.xacml.policy.DescriptionType;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicyTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicyTest.java
index dc0c63050..2a8c8dae1 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicyTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/PolicyTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.DefaultsType;
import org.opensaml.xacml.policy.DescriptionType;
import org.opensaml.xacml.policy.EffectType;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ResourceAttributeDesignatorTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ResourceAttributeDesignatorTest.java
index de6443af9..9036ed3dc 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ResourceAttributeDesignatorTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ResourceAttributeDesignatorTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.AttributeDesignatorType;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ResourceMatchTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ResourceMatchTest.java
index 4b0be2e18..48c46b324 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ResourceMatchTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ResourceMatchTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.AttributeDesignatorType;
import org.opensaml.xacml.policy.AttributeSelectorType;
import org.opensaml.xacml.policy.AttributeValueType;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ResourceTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ResourceTest.java
index 28b3b3073..1f0dab516 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ResourceTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ResourceTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.ResourceMatchType;
import org.opensaml.xacml.policy.ResourceType;
import org.testng.Assert;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ResourcesTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ResourcesTest.java
index 35855ef73..b5fd3d16e 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ResourcesTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/ResourcesTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.ResourcesType;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/RuleCombinerParametersTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/RuleCombinerParametersTest.java
index c6634e8d5..6bd1615b0 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/RuleCombinerParametersTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/RuleCombinerParametersTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.RuleCombinerParametersType;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/RuleTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/RuleTest.java
index 0c9ab4ebf..306747587 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/RuleTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/RuleTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.DescriptionType;
import org.opensaml.xacml.policy.EffectType;
import org.opensaml.xacml.policy.RuleType;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTest.java
index a2ae21b8a..9d11bf318 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.SubjectAttributeDesignatorType;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/SubjectMatchTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/SubjectMatchTest.java
index 94cf32124..254441da1 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/SubjectMatchTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/SubjectMatchTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.AttributeDesignatorType;
import org.opensaml.xacml.policy.AttributeSelectorType;
import org.opensaml.xacml.policy.AttributeValueType;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/SubjectTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/SubjectTest.java
index 0abcb00af..57789d78a 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/SubjectTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/SubjectTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.SubjectMatchType;
import org.opensaml.xacml.policy.SubjectType;
import org.testng.Assert;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/SubjectsTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/SubjectsTest.java
index 8813a6f4b..59feb612a 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/SubjectsTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/SubjectsTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.SubjectsType;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/TargetTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/TargetTest.java
index 0a463b715..cdff1515e 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/TargetTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/TargetTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.TargetType;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/VariableDefinitionTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/VariableDefinitionTest.java
index d6bf18d94..8a34eb53a 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/VariableDefinitionTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/VariableDefinitionTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.VariableDefinitionType;
import org.opensaml.xacml.policy.VariableReferenceType;
import org.testng.Assert;
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/VariableReferenceTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/VariableReferenceTest.java
index 395521b5b..60604fe40 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/VariableReferenceTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/policy/impl/VariableReferenceTest.java
@@ -17,7 +17,7 @@
package org.opensaml.xacml.policy.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xacml.policy.VariableReferenceType;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-xacml-saml-impl/src/test/java/org/opensaml/xacml/profile/saml/config/impl/XMLObjectProviderInitializerTest.java b/opensaml-xacml-saml-impl/src/test/java/org/opensaml/xacml/profile/saml/config/impl/XMLObjectProviderInitializerTest.java
index 782809996..c9ab0930c 100644
--- a/opensaml-xacml-saml-impl/src/test/java/org/opensaml/xacml/profile/saml/config/impl/XMLObjectProviderInitializerTest.java
+++ b/opensaml-xacml-saml-impl/src/test/java/org/opensaml/xacml/profile/saml/config/impl/XMLObjectProviderInitializerTest.java
@@ -20,7 +20,7 @@ package org.opensaml.xacml.profile.saml.config.impl;
import javax.xml.namespace.QName;
import org.opensaml.core.config.Initializer;
-import org.opensaml.core.xml.config.XMLObjectProviderInitializerBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderInitializerBaseTestCase;
import org.opensaml.xacml.profile.saml.XACMLPolicyStatementType;
/**
diff --git a/opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/algorithm/AlgorithmRegistryTest.java b/opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/algorithm/AlgorithmRegistryTest.java
index 8c6f7fa1f..f8b821d86 100644
--- a/opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/algorithm/AlgorithmRegistryTest.java
+++ b/opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/algorithm/AlgorithmRegistryTest.java
@@ -20,9 +20,9 @@ package org.opensaml.xmlsec.algorithm;
import java.util.Objects;
import java.util.Set;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
import org.opensaml.core.config.ConfigurationService;
import org.opensaml.core.config.InitializationException;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.security.SecurityProviderTestSupport;
import org.opensaml.security.crypto.JCAConstants;
import org.opensaml.xmlsec.algorithm.AlgorithmDescriptor.AlgorithmType;
diff --git a/opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/algorithm/AlgorithmSupportTest.java b/opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/algorithm/AlgorithmSupportTest.java
index 0344b775a..630f8b654 100644
--- a/opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/algorithm/AlgorithmSupportTest.java
+++ b/opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/algorithm/AlgorithmSupportTest.java
@@ -24,7 +24,7 @@ import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import java.util.HashSet;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.security.credential.Credential;
import org.opensaml.security.credential.CredentialSupport;
import org.opensaml.security.crypto.JCAConstants;
diff --git a/opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/crypto/XMLSigningUtilTest.java b/opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/crypto/XMLSigningUtilTest.java
index 1327bb706..4b9de9eb8 100644
--- a/opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/crypto/XMLSigningUtilTest.java
+++ b/opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/crypto/XMLSigningUtilTest.java
@@ -32,7 +32,7 @@ import java.util.Arrays;
import javax.crypto.Mac;
import javax.crypto.SecretKey;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.security.SecurityException;
import org.opensaml.security.credential.Credential;
import org.opensaml.security.credential.CredentialSupport;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/config/impl/XMLObjectProviderInitializerTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/config/impl/XMLObjectProviderInitializerTest.java
index f0d70295e..245060070 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/config/impl/XMLObjectProviderInitializerTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/config/impl/XMLObjectProviderInitializerTest.java
@@ -20,7 +20,7 @@ package org.opensaml.xmlsec.config.impl;
import javax.xml.namespace.QName;
import org.opensaml.core.config.Initializer;
-import org.opensaml.core.xml.config.XMLObjectProviderInitializerBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderInitializerBaseTestCase;
import org.opensaml.xmlsec.encryption.EncryptedData;
import org.opensaml.xmlsec.signature.Signature;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodTest.java
index df6e4a24f..6dd7b343c 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.encryption.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.mock.SimpleXMLObject;
import org.opensaml.xmlsec.encryption.AgreementMethod;
import org.opensaml.xmlsec.encryption.KANonce;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CarriedKeyNameTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CarriedKeyNameTest.java
index 7f776dc2c..11b673ac1 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CarriedKeyNameTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CarriedKeyNameTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.encryption.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.encryption.CarriedKeyName;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherDataTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherDataTest.java
index 1c8ca8754..5555847b8 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherDataTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherDataTest.java
@@ -20,7 +20,7 @@ package org.opensaml.xmlsec.encryption.impl;
import org.testng.annotations.Test;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.encryption.CipherData;
import org.opensaml.xmlsec.encryption.CipherReference;
import org.opensaml.xmlsec.encryption.CipherValue;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceTest.java
index ec2859b0b..cf921dc22 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.encryption.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.encryption.CipherReference;
import org.opensaml.xmlsec.encryption.Transforms;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherValueTest.java
index 7c917b770..55865e448 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherValueTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.encryption.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.encryption.CipherValue;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueTest.java
index b9ad54b44..0e2223654 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.encryption.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.encryption.DHKeyValue;
import org.opensaml.xmlsec.encryption.Generator;
import org.opensaml.xmlsec.encryption.P;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DataReferenceTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DataReferenceTest.java
index dc76501a4..4df563730 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DataReferenceTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DataReferenceTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.encryption.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.mock.SimpleXMLObject;
import org.opensaml.xmlsec.encryption.DataReference;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptedDataTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptedDataTest.java
index 1b1b0d8a6..f469eb34e 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptedDataTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptedDataTest.java
@@ -18,8 +18,8 @@
package org.opensaml.xmlsec.encryption.impl;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.xmlsec.encryption.CipherData;
import org.opensaml.xmlsec.encryption.EncryptedData;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyTest.java
index 07391f559..e4f49497d 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyTest.java
@@ -18,8 +18,8 @@
package org.opensaml.xmlsec.encryption.impl;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.xmlsec.encryption.CarriedKeyName;
import org.opensaml.xmlsec.encryption.CipherData;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodTest.java
index 0d145d868..3412fd1bb 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.encryption.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.mock.SimpleXMLObject;
import org.opensaml.xmlsec.encryption.EncryptionMethod;
import org.opensaml.xmlsec.encryption.KeySize;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesTest.java
index 6067ff354..7d8aad6ba 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesTest.java
@@ -18,8 +18,8 @@
package org.opensaml.xmlsec.encryption.impl;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.xmlsec.encryption.EncryptionProperties;
import org.opensaml.xmlsec.encryption.EncryptionProperty;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyTest.java
index 37b57454f..8ac9362a2 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyTest.java
@@ -20,8 +20,8 @@ package org.opensaml.xmlsec.encryption.impl;
import javax.xml.namespace.QName;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.mock.SimpleXMLObject;
import org.opensaml.xmlsec.encryption.EncryptionProperty;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/GeneratorTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/GeneratorTest.java
index f8ef6b1fa..36a5b52a3 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/GeneratorTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/GeneratorTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.encryption.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.encryption.Generator;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KANonceTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KANonceTest.java
index a2c23d1e8..d57572c78 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KANonceTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KANonceTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.encryption.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.encryption.KANonce;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyReferenceTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyReferenceTest.java
index 26d5f6220..ccc788aa1 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyReferenceTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyReferenceTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.encryption.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.mock.SimpleXMLObject;
import org.opensaml.xmlsec.encryption.KeyReference;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeySizeTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeySizeTest.java
index 10746cce4..4414ee523 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeySizeTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeySizeTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.encryption.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.encryption.KeySize;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/MGFTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/MGFTest.java
index 80b5e4aec..7cdc5c4ff 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/MGFTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/MGFTest.java
@@ -18,8 +18,8 @@
package org.opensaml.xmlsec.encryption.impl;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.XMLObjectBuilder;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.schema.XSAny;
import org.opensaml.xmlsec.encryption.MGF;
import org.opensaml.xmlsec.encryption.Parameters;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OAEPparamsTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OAEPparamsTest.java
index e02974dc8..8ffc43847 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OAEPparamsTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OAEPparamsTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.encryption.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.encryption.OAEPparams;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OriginatorKeyInfoTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OriginatorKeyInfoTest.java
index 23a17c1ed..40b349ff0 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OriginatorKeyInfoTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OriginatorKeyInfoTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.encryption.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.mock.SimpleXMLObject;
import org.opensaml.xmlsec.encryption.OriginatorKeyInfo;
import org.opensaml.xmlsec.signature.KeyName;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PTest.java
index 41ca7bf28..13a45485e 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.encryption.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.encryption.P;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PgenCounterTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PgenCounterTest.java
index 8d658b33b..e57acef10 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PgenCounterTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PgenCounterTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.encryption.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.encryption.PgenCounter;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PublicTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PublicTest.java
index 72a1aa462..ffe5c5413 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PublicTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PublicTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.encryption.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.encryption.Public;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/QTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/QTest.java
index 395a9770f..9f76cf7eb 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/QTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/QTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.encryption.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.encryption.Q;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/RecipientKeyInfoTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/RecipientKeyInfoTest.java
index 864470cd3..deb444c10 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/RecipientKeyInfoTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/RecipientKeyInfoTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.encryption.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.mock.SimpleXMLObject;
import org.opensaml.xmlsec.encryption.RecipientKeyInfo;
import org.opensaml.xmlsec.signature.KeyName;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/ReferenceListTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/ReferenceListTest.java
index 07dec58b7..92a8c1f9a 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/ReferenceListTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/ReferenceListTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.encryption.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.encryption.DataReference;
import org.opensaml.xmlsec.encryption.KeyReference;
import org.opensaml.xmlsec.encryption.ReferenceList;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SeedTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SeedTest.java
index c71c7603b..598ec0b12 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SeedTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SeedTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.encryption.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.encryption.Seed;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/TransformsTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/TransformsTest.java
index cbaf14d7a..61dbabf25 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/TransformsTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/TransformsTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.encryption.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.encryption.Transforms;
import org.opensaml.xmlsec.signature.Transform;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/AESGCMTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/AESGCMTest.java
index ee08c2862..4240643ef 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/AESGCMTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/AESGCMTest.java
@@ -19,8 +19,8 @@ package org.opensaml.xmlsec.encryption.support;
import javax.crypto.Cipher;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.security.SecurityProviderTestSupport;
import org.opensaml.security.credential.Credential;
import org.opensaml.xmlsec.algorithm.AlgorithmDescriptor;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/ChainingEncryptedKeyResolverTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/ChainingEncryptedKeyResolverTest.java
index 796902449..cf61a425a 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/ChainingEncryptedKeyResolverTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/ChainingEncryptedKeyResolverTest.java
@@ -23,8 +23,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.xmlsec.encryption.EncryptedData;
import org.opensaml.xmlsec.encryption.EncryptedKey;
import org.opensaml.xmlsec.mock.SignableSimpleXMLObject;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/DecryptionSignedContentTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/DecryptionSignedContentTest.java
index 69bb3357d..b34e5a5a6 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/DecryptionSignedContentTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/DecryptionSignedContentTest.java
@@ -28,8 +28,8 @@ import java.security.KeyPair;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.io.Marshaller;
import org.opensaml.core.xml.io.MarshallingException;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/EncryptionClonedContentTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/EncryptionClonedContentTest.java
index 5650dd13a..def0a8d83 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/EncryptionClonedContentTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/EncryptionClonedContentTest.java
@@ -17,8 +17,8 @@
package org.opensaml.xmlsec.encryption.support;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.core.xml.util.XMLObjectSupport;
import org.opensaml.security.credential.Credential;
import org.opensaml.xmlsec.algorithm.AlgorithmSupport;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/InlineEncryptedKeyResolverTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/InlineEncryptedKeyResolverTest.java
index 66153616a..3de579ad9 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/InlineEncryptedKeyResolverTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/InlineEncryptedKeyResolverTest.java
@@ -26,7 +26,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.xmlsec.encryption.EncryptedData;
import org.opensaml.xmlsec.encryption.EncryptedKey;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleDecryptionTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleDecryptionTest.java
index 9113e9d78..00faa2559 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleDecryptionTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleDecryptionTest.java
@@ -29,8 +29,8 @@ import javax.crypto.SecretKey;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.security.SecurityProviderTestSupport;
import org.opensaml.security.credential.BasicCredential;
import org.opensaml.security.credential.Credential;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleEncryptionTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleEncryptionTest.java
index e5f7b467c..415241bc7 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleEncryptionTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleEncryptionTest.java
@@ -27,8 +27,8 @@ import java.util.List;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.security.SecurityProviderTestSupport;
import org.opensaml.security.credential.CredentialSupport;
import org.opensaml.security.crypto.KeySupport;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleKeyInfoReferenceEncryptedKeyResolverTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleKeyInfoReferenceEncryptedKeyResolverTest.java
index 984477330..a5e1bec36 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleKeyInfoReferenceEncryptedKeyResolverTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleKeyInfoReferenceEncryptedKeyResolverTest.java
@@ -23,8 +23,8 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.xmlsec.encryption.EncryptedData;
import org.opensaml.xmlsec.encryption.EncryptedKey;
import org.opensaml.xmlsec.mock.SignableSimpleXMLObject;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleRetrievalMethodEncryptedKeyResolverTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleRetrievalMethodEncryptedKeyResolverTest.java
index 0e39f4513..47b62d854 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleRetrievalMethodEncryptedKeyResolverTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleRetrievalMethodEncryptedKeyResolverTest.java
@@ -26,8 +26,8 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.xmlsec.encryption.EncryptedData;
import org.opensaml.xmlsec.encryption.EncryptedKey;
import org.opensaml.xmlsec.mock.SignableSimpleXMLObject;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/AbstractSecurityParametersResolverTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/AbstractSecurityParametersResolverTest.java
index 52ecd8c22..6c09c8aee 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/AbstractSecurityParametersResolverTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/AbstractSecurityParametersResolverTest.java
@@ -36,7 +36,7 @@ import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.security.credential.Credential;
import org.opensaml.security.credential.CredentialSupport;
import org.opensaml.security.crypto.JCAConstants;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/AlgorithmRuntimeSupportedPredicateTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/AlgorithmRuntimeSupportedPredicateTest.java
index ba6ed6f19..a0c9a23df 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/AlgorithmRuntimeSupportedPredicateTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/AlgorithmRuntimeSupportedPredicateTest.java
@@ -17,9 +17,9 @@
package org.opensaml.xmlsec.impl;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
import org.opensaml.core.config.ConfigurationService;
import org.opensaml.core.config.InitializationException;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.security.SecurityProviderTestSupport;
import org.opensaml.xmlsec.algorithm.AlgorithmRegistry;
import org.opensaml.xmlsec.algorithm.AlgorithmSupport;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolverTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolverTest.java
index def068df3..a4ba046e5 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolverTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolverTest.java
@@ -36,7 +36,7 @@ import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.security.credential.Credential;
import org.opensaml.security.credential.CredentialSupport;
import org.opensaml.security.crypto.JCAConstants;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolverTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolverTest.java
index a6f0c27bc..92f8e8047 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolverTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolverTest.java
@@ -33,7 +33,7 @@ import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.security.credential.Credential;
import org.opensaml.security.credential.CredentialSupport;
import org.opensaml.security.crypto.JCAConstants;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupportTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupportTest.java
index 552e1dd7a..7fc176e70 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupportTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupportTest.java
@@ -40,7 +40,7 @@ import net.shibboleth.utilities.java.support.codec.Base64Support;
import net.shibboleth.utilities.java.support.codec.DecodingException;
import net.shibboleth.utilities.java.support.codec.EncodingException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.security.SecurityException;
import org.opensaml.security.crypto.KeySupport;
import org.opensaml.security.x509.X509Support;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/BasicKeyInfoGeneratorTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/BasicKeyInfoGeneratorTest.java
index f08c01254..68ec2d7c9 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/BasicKeyInfoGeneratorTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/BasicKeyInfoGeneratorTest.java
@@ -24,7 +24,7 @@ import java.security.KeyException;
import java.security.PublicKey;
import java.util.List;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.security.SecurityException;
import org.opensaml.security.credential.BasicCredential;
import org.opensaml.security.crypto.KeySupport;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/CertChainX509DataTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/CertChainX509DataTest.java
index 7c51fa465..d68f26523 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/CertChainX509DataTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/CertChainX509DataTest.java
@@ -32,7 +32,7 @@ import net.shibboleth.utilities.java.support.codec.Base64Support;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.security.SecurityException;
import org.opensaml.security.credential.Credential;
import org.opensaml.security.crypto.KeySupport;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/ChainingKeyInfoCredentialResolverTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/ChainingKeyInfoCredentialResolverTest.java
index cb54a0c3c..a6c9bc766 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/ChainingKeyInfoCredentialResolverTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/ChainingKeyInfoCredentialResolverTest.java
@@ -28,7 +28,7 @@ import java.util.NoSuchElementException;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.security.credential.BasicCredential;
import org.opensaml.security.credential.Credential;
import org.opensaml.security.crypto.KeySupport;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/DEREncodedKeyValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/DEREncodedKeyValueTest.java
index 353b425c9..e009d014d 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/DEREncodedKeyValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/DEREncodedKeyValueTest.java
@@ -25,7 +25,7 @@ import java.util.List;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.security.credential.BasicCredential;
import org.opensaml.security.credential.Credential;
import org.opensaml.security.crypto.KeySupport;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/DSAKeyValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/DSAKeyValueTest.java
index 1e255326c..0f5b6e772 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/DSAKeyValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/DSAKeyValueTest.java
@@ -28,7 +28,7 @@ import java.util.List;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.security.credential.BasicCredential;
import org.opensaml.security.credential.Credential;
import org.opensaml.security.crypto.KeySupport;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/KeyInfoGeneratorManagerTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/KeyInfoGeneratorManagerTest.java
index da26f853d..ec9e193cd 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/KeyInfoGeneratorManagerTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/KeyInfoGeneratorManagerTest.java
@@ -27,7 +27,7 @@ import java.security.NoSuchProviderException;
import java.util.Collection;
import org.cryptacular.util.CertUtil;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.security.credential.BasicCredential;
import org.opensaml.security.credential.Credential;
import org.opensaml.security.crypto.KeySupport;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/LocalKeyInfoCredentialResolverTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/LocalKeyInfoCredentialResolverTest.java
index 593b4d2d1..b8ec78aae 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/LocalKeyInfoCredentialResolverTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/LocalKeyInfoCredentialResolverTest.java
@@ -29,7 +29,7 @@ import net.shibboleth.utilities.java.support.codec.EncodingException;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.security.credential.BasicCredential;
import org.opensaml.security.credential.Credential;
import org.opensaml.security.credential.impl.CollectionCredentialResolver;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/NamedKeyInfoGeneratorManagerTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/NamedKeyInfoGeneratorManagerTest.java
index 424290483..05b904c37 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/NamedKeyInfoGeneratorManagerTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/NamedKeyInfoGeneratorManagerTest.java
@@ -26,7 +26,7 @@ import java.security.cert.X509Certificate;
import java.util.Collection;
import org.cryptacular.util.CertUtil;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.security.credential.BasicCredential;
import org.opensaml.security.credential.Credential;
import org.opensaml.security.x509.BasicX509Credential;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/RSAKeyValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/RSAKeyValueTest.java
index 724086bac..a79c7fd95 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/RSAKeyValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/RSAKeyValueTest.java
@@ -28,7 +28,7 @@ import java.util.List;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.security.credential.BasicCredential;
import org.opensaml.security.credential.Credential;
import org.opensaml.security.crypto.KeySupport;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/SingleCertX509DataTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/SingleCertX509DataTest.java
index 576fe3b15..4e9a1573e 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/SingleCertX509DataTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/SingleCertX509DataTest.java
@@ -29,7 +29,7 @@ import java.util.List;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.security.credential.Credential;
import org.opensaml.security.crypto.KeySupport;
import org.opensaml.security.x509.X509Credential;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/StaticKeyInfoGeneratorTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/StaticKeyInfoGeneratorTest.java
index 26ce581b1..acf20c398 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/StaticKeyInfoGeneratorTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/StaticKeyInfoGeneratorTest.java
@@ -23,7 +23,7 @@ import org.testng.Assert;
import java.security.KeyException;
import java.security.PublicKey;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.security.SecurityException;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorTest.java
index 568ef4977..602d68b51 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorTest.java
@@ -38,7 +38,7 @@ import net.shibboleth.utilities.java.support.codec.Base64Support;
import net.shibboleth.utilities.java.support.codec.DecodingException;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.security.SecurityException;
import org.opensaml.security.x509.BasicX509Credential;
import org.opensaml.security.x509.X509Support;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/messaging/impl/PopulateSignatureValidationParametersHandlerTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/messaging/impl/PopulateSignatureValidationParametersHandlerTest.java
index 6e41b30c8..d0fa0cdb5 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/messaging/impl/PopulateSignatureValidationParametersHandlerTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/messaging/impl/PopulateSignatureValidationParametersHandlerTest.java
@@ -19,7 +19,7 @@ package org.opensaml.xmlsec.messaging.impl;
import java.util.Collections;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.handler.MessageHandlerException;
import org.opensaml.xmlsec.SignatureValidationParameters;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueTest.java
index f4b0000c3..04426ab73 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueTest.java
@@ -18,8 +18,8 @@
package org.opensaml.xmlsec.signature.impl;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.xmlsec.signature.DEREncodedKeyValue;
import org.testng.Assert;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueTest.java
index 1f4982006..b0d58afff 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueTest.java
@@ -20,7 +20,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.DSAKeyValue;
import org.opensaml.xmlsec.signature.G;
import org.opensaml.xmlsec.signature.J;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DigestMethodTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DigestMethodTest.java
index 4320ab276..d308500ab 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DigestMethodTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DigestMethodTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.mock.SimpleXMLObject;
import org.opensaml.xmlsec.signature.DigestMethod;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ECKeyValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ECKeyValueTest.java
index 3023896bf..6eed2b320 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ECKeyValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ECKeyValueTest.java
@@ -18,8 +18,8 @@
package org.opensaml.xmlsec.signature.impl;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.xmlsec.signature.ECKeyValue;
import org.opensaml.xmlsec.signature.NamedCurve;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ExponentTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ExponentTest.java
index e6dc96205..bd16aee67 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ExponentTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ExponentTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.Exponent;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/GTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/GTest.java
index 25d7a9ada..b45997e5a 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/GTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/GTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.G;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/JTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/JTest.java
index ae2931067..97f62b576 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/JTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/JTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.J;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceTest.java
index 0d1c07603..d4798609a 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceTest.java
@@ -18,8 +18,8 @@
package org.opensaml.xmlsec.signature.impl;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.xmlsec.signature.KeyInfoReference;
import org.testng.Assert;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyInfoTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyInfoTest.java
index 20297bcf0..4a481fc25 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyInfoTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyInfoTest.java
@@ -18,8 +18,8 @@
package org.opensaml.xmlsec.signature.impl;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.mock.SimpleXMLObject;
import org.opensaml.xmlsec.signature.KeyInfo;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyNameTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyNameTest.java
index e2f900491..873c8f16e 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyNameTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyNameTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.KeyName;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyValueTest.java
index 1cfcecb1e..2cbd95c91 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyValueTest.java
@@ -20,7 +20,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.KeyValue;
import org.opensaml.xmlsec.signature.RSAKeyValue;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/MgmtDataTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/MgmtDataTest.java
index 20f21201f..2059bf6f6 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/MgmtDataTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/MgmtDataTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.MgmtData;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ModulusTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ModulusTest.java
index 50fd6023f..c437db789 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ModulusTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ModulusTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.Modulus;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/NamedCurveTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/NamedCurveTest.java
index 8f1cee052..4ca2e4efe 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/NamedCurveTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/NamedCurveTest.java
@@ -18,7 +18,7 @@
package org.opensaml.xmlsec.signature.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.NamedCurve;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPDataTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPDataTest.java
index 7ef35f5d0..6faa74b70 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPDataTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPDataTest.java
@@ -20,7 +20,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.mock.SimpleXMLObject;
import org.opensaml.xmlsec.signature.PGPData;
import org.opensaml.xmlsec.signature.PGPKeyID;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPKeyIDTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPKeyIDTest.java
index 97259993a..60d3573c5 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPKeyIDTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPKeyIDTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.PGPKeyID;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPKeyPacketTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPKeyPacketTest.java
index 02c18da7e..1f78bddfc 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPKeyPacketTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPKeyPacketTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.PGPKeyPacket;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PTest.java
index d8003e17a..f959ad3c7 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.P;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PgenCounterTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PgenCounterTest.java
index 39b9f96b4..e0bd57c81 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PgenCounterTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PgenCounterTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.PgenCounter;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PublicKeyTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PublicKeyTest.java
index 852449863..18ee660cc 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PublicKeyTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PublicKeyTest.java
@@ -18,7 +18,7 @@
package org.opensaml.xmlsec.signature.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.PublicKey;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/QTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/QTest.java
index 61e25ddcd..ffc443daf 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/QTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/QTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.Q;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueTest.java
index 6e26c9455..97b792891 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueTest.java
@@ -20,7 +20,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.Exponent;
import org.opensaml.xmlsec.signature.Modulus;
import org.opensaml.xmlsec.signature.RSAKeyValue;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodTest.java
index 33424725b..2680f18d6 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.RetrievalMethod;
import org.opensaml.xmlsec.signature.Transforms;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SPKIDataTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SPKIDataTest.java
index a1011e730..e1c142a83 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SPKIDataTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SPKIDataTest.java
@@ -20,7 +20,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.mock.SimpleXMLObject;
import org.opensaml.xmlsec.signature.SPKIData;
import org.opensaml.xmlsec.signature.SPKISexp;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SPKISexpTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SPKISexpTest.java
index 639363e75..f5d84d695 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SPKISexpTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SPKISexpTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.SPKISexp;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SeedTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SeedTest.java
index 8727cd7c1..ae62c3f36 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SeedTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SeedTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.Seed;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/TransformTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/TransformTest.java
index 180130648..ceadd1beb 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/TransformTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/TransformTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.mock.SimpleXMLObject;
import org.opensaml.xmlsec.signature.Transform;
import org.opensaml.xmlsec.signature.XPath;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/TransformsTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/TransformsTest.java
index 7e25abaae..acef81ef0 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/TransformsTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/TransformsTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.Transform;
import org.opensaml.xmlsec.signature.Transforms;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509CRLTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509CRLTest.java
index 0b1a535a2..0db38d2db 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509CRLTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509CRLTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.X509CRL;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509CertificateTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509CertificateTest.java
index ffbf7b4ab..346722112 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509CertificateTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509CertificateTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.X509Certificate;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509DataTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509DataTest.java
index 7885f0b3b..1f5c55f64 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509DataTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509DataTest.java
@@ -20,7 +20,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.mock.SimpleXMLObject;
import org.opensaml.xmlsec.signature.X509CRL;
import org.opensaml.xmlsec.signature.X509Certificate;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509DigestTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509DigestTest.java
index 0e8b035b8..d76b89342 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509DigestTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509DigestTest.java
@@ -18,8 +18,8 @@
package org.opensaml.xmlsec.signature.impl;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.support.SignatureConstants;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.X509Digest;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509IssuerNameTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509IssuerNameTest.java
index 09fa49d50..71a8c85f6 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509IssuerNameTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509IssuerNameTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.X509IssuerName;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialTest.java
index 9cd7c6cf0..732fb3143 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialTest.java
@@ -20,7 +20,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.X509IssuerName;
import org.opensaml.xmlsec.signature.X509IssuerSerial;
import org.opensaml.xmlsec.signature.X509SerialNumber;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SKITest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SKITest.java
index debe99f11..711e68c31 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SKITest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SKITest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.X509SKI;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberTest.java
index 5248a1f7c..b674ea9f7 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberTest.java
@@ -23,7 +23,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
import java.math.BigInteger;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.X509SerialNumber;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SubjectNameTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SubjectNameTest.java
index a20196865..8883c19cb 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SubjectNameTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SubjectNameTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.X509SubjectName;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/XPathTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/XPathTest.java
index 713f56d59..69f76eb73 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/XPathTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/XPathTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.XPath;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/YTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/YTest.java
index b00ff635c..db59b1832 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/YTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/YTest.java
@@ -21,7 +21,7 @@ package org.opensaml.xmlsec.signature.impl;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.Assert;
-import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.xmlsec.signature.Y;
/**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/DetachedSignatureTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/DetachedSignatureTest.java
index 48fa9e002..0b89fea66 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/DetachedSignatureTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/DetachedSignatureTest.java
@@ -19,7 +19,7 @@ package org.opensaml.xmlsec.signature.support;
import java.security.KeyPair;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObjectBuilder;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.io.Marshaller;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/EnvelopedSignatureTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/EnvelopedSignatureTest.java
index 76c3a7d56..0f7ddaefc 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/EnvelopedSignatureTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/EnvelopedSignatureTest.java
@@ -27,7 +27,7 @@ import javax.xml.bind.ValidationException;
import net.shibboleth.utilities.java.support.xml.SerializeSupport;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObjectBuilder;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.io.Marshaller;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/HMACSignatureTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/HMACSignatureTest.java
index 8c558c1d6..3241bbd3c 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/HMACSignatureTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/HMACSignatureTest.java
@@ -33,7 +33,7 @@ import net.shibboleth.utilities.java.support.xml.XMLParserException;
import org.apache.xml.security.signature.SignedInfo;
import org.apache.xml.security.signature.XMLSignature;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObjectBuilder;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.io.Marshaller;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/SignatureAlgorithmValidatorTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/SignatureAlgorithmValidatorTest.java
index 8e8161f52..149199db8 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/SignatureAlgorithmValidatorTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/SignatureAlgorithmValidatorTest.java
@@ -20,7 +20,7 @@ package org.opensaml.xmlsec.signature.support;
import java.util.HashSet;
import java.util.Set;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.xmlsec.encryption.support.EncryptionConstants;
import org.opensaml.xmlsec.mock.SignableSimpleXMLObject;
import org.opensaml.xmlsec.signature.Signature;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/SignatureSupportTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/SignatureSupportTest.java
index 654349736..c80013ca0 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/SignatureSupportTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/SignatureSupportTest.java
@@ -22,7 +22,7 @@ import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import java.util.List;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.security.SecurityException;
import org.opensaml.security.credential.Credential;
import org.opensaml.security.credential.CredentialSupport;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/ChainingSignatureTrustEngineTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/ChainingSignatureTrustEngineTest.java
index af10fb780..c9670d27a 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/ChainingSignatureTrustEngineTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/ChainingSignatureTrustEngineTest.java
@@ -27,7 +27,7 @@ import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import org.opensaml.core.criterion.EntityIdCriterion;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.security.SecurityException;
import org.opensaml.security.credential.Credential;
import org.opensaml.xmlsec.keyinfo.KeyInfoCredentialResolver;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/ExplicitKeySignatureTrustEngineTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/ExplicitKeySignatureTrustEngineTest.java
index 8999a9c5e..fb88580e1 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/ExplicitKeySignatureTrustEngineTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/ExplicitKeySignatureTrustEngineTest.java
@@ -26,7 +26,7 @@ import java.util.List;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import org.opensaml.core.criterion.EntityIdCriterion;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.security.SecurityException;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/PKIXSignatureTrustEngineTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/PKIXSignatureTrustEngineTest.java
index b2dc9d518..6d1e055e7 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/PKIXSignatureTrustEngineTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/PKIXSignatureTrustEngineTest.java
@@ -30,7 +30,7 @@ import java.util.Set;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import org.opensaml.core.criterion.EntityIdCriterion;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.io.UnmarshallingException;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list