You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/12/29 20:08:50 UTC

[cxf] 04/05: Finished removing asserts

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 81cd495c14feb9c40dddd525385711ebe0df0fda
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Sat Dec 29 12:22:56 2018 +0000

    Finished removing asserts
---
 core/src/test/java/org/apache/cxf/BusFactoryTest.java |  2 +-
 .../cxf/attachment/AttachmentDeserializerTest.java    |  2 +-
 .../cxf/attachment/AttachmentSerializerTest.java      |  2 +-
 .../org/apache/cxf/attachment/AttachmentUtilTest.java |  2 +-
 .../test/java/org/apache/cxf/bus/CXFBusImplTest.java  |  2 +-
 .../cxf/bus/extension/ExtensionManagerTest.java       |  2 +-
 .../org/apache/cxf/bus/extension/ExtensionTest.java   |  2 +-
 .../extension/TextExtensionFragmentParserTest.java    |  2 +-
 .../managers/EndpointResolverRegistryImplTest.java    |  2 +-
 .../cxf/bus/managers/ServerRegistryImpTest.java       |  2 +-
 .../ServiceContractResolverRegistryImplTest.java      |  2 +-
 .../org/apache/cxf/bus/osgi/OSGiBusListenerTest.java  |  2 +-
 .../cxf/bus/spring/BusApplicationContextTest.java     |  2 +-
 .../cxf/bus/spring/BusApplicationListenerTest.java    |  2 +-
 .../cxf/bus/spring/BusDefinitionParserTest.java       |  2 +-
 .../apache/cxf/bus/spring/SpringBusFactoryTest.java   |  2 +-
 .../cxf/buslifecycle/CXFBusLifeCycleManagerTest.java  |  2 +-
 .../common/annotation/AnnotationProcessorTest.java    |  2 +-
 .../cxf/common/classloader/ClassLoaderUtilsTest.java  |  2 +-
 .../org/apache/cxf/common/i18n/BundleUtilsTest.java   |  2 +-
 .../java/org/apache/cxf/common/i18n/MessageTest.java  |  2 +-
 .../cxf/common/injection/ResourceInjectorTest.java    |  2 +-
 .../org/apache/cxf/common/jaxb/JAXBUtilsTest.java     |  2 +-
 .../org/apache/cxf/common/logging/LogUtilsTest.java   |  2 +-
 .../cxf/common/logging/RegexLoggingFilterTest.java    |  2 +-
 .../apache/cxf/common/security/SimpleGroupTest.java   |  2 +-
 .../cxf/common/security/SimplePrincipalTest.java      |  2 +-
 .../org/apache/cxf/common/util/ASMHelperTest.java     |  2 +-
 .../org/apache/cxf/common/util/Base64UtilityTest.java |  2 +-
 .../org/apache/cxf/common/util/ClassHelperTest.java   |  2 +-
 .../apache/cxf/common/util/CollectionUtilsTest.java   |  2 +-
 .../org/apache/cxf/common/util/PackageUtilsTest.java  |  2 +-
 .../cxf/common/util/PropertiesLoaderUtilsTest.java    |  2 +-
 .../org/apache/cxf/common/util/PropertyUtilsTest.java |  2 +-
 .../org/apache/cxf/common/util/StringUtilsTest.java   |  2 +-
 .../apache/cxf/common/util/URIParserUtilsTest.java    |  2 +-
 .../java/org/apache/cxf/common/util/UrlUtilsTest.java |  2 +-
 .../cxf/common/util/XmlSchemaPrimitiveUtilsTest.java  |  2 +-
 .../apache/cxf/common/xmlschema/ImportRepairTest.java |  2 +-
 .../cxf/configuration/spring/ConfigurerImplTest.java  |  2 +-
 .../SuspendedInvocationExceptionTest.java             |  2 +-
 .../cxf/databinding/AbstractDataBindingTest.java      |  2 +-
 .../databinding/source/XMLStreamDataReaderTest.java   |  2 +-
 .../org/apache/cxf/endpoint/EndpointImplTest.java     |  2 +-
 .../java/org/apache/cxf/helpers/FileUtilsTest.java    |  2 +-
 .../test/java/org/apache/cxf/helpers/IOUtilsTest.java |  2 +-
 .../java/org/apache/cxf/helpers/NameSpaceTest.java    |  2 +-
 .../java/org/apache/cxf/helpers/ServiceUtilsTest.java |  2 +-
 .../cxf/interceptor/LoggingInInterceptorTest.java     |  2 +-
 .../cxf/interceptor/LoggingOutInterceptorTest.java    |  2 +-
 .../cxf/interceptor/OutgoingChainInterceptorTest.java |  2 +-
 .../interceptor/ServiceInvokerInterceptorTest.java    |  2 +-
 .../security/DefaultSecurityContextTest.java          |  2 +-
 .../security/NamePasswordCallbackHandlerTest.java     |  2 +-
 .../security/RolePrefixSecurityContextImplTest.java   |  2 +-
 .../security/SecureAnnotationsInterceptorTest.java    |  2 +-
 .../security/SimpleAuthorizingInterceptorTest.java    |  2 +-
 .../cxf/internal/CXFAPINamespaceHandlerTest.java      |  2 +-
 .../java/org/apache/cxf/io/CachedStreamTestBase.java  |  2 +-
 .../apache/cxf/phase/PhaseInterceptorChainTest.java   |  2 +-
 .../apache/cxf/resource/ClassLoaderResolverTest.java  |  2 +-
 .../cxf/resource/DefaultResourceManagerTest.java      |  2 +-
 .../java/org/apache/cxf/resource/URIResolverTest.java |  2 +-
 .../cxf/service/model/BindingFaultInfoTest.java       |  2 +-
 .../cxf/service/model/BindingMessageInfoTest.java     |  2 +-
 .../cxf/service/model/BindingOperationInfoTest.java   |  2 +-
 .../org/apache/cxf/service/model/FaultInfoTest.java   |  2 +-
 .../apache/cxf/service/model/InterfaceInfoTest.java   |  2 +-
 .../org/apache/cxf/service/model/MessageInfoTest.java |  2 +-
 .../apache/cxf/service/model/MessagePartInfoTest.java |  2 +-
 .../apache/cxf/service/model/OperationInfoTest.java   |  2 +-
 .../staxutils/DepthRestrictingStreamReaderTest.java   |  2 +-
 .../cxf/staxutils/DepthXMLStreamReaderTest.java       |  2 +-
 .../cxf/staxutils/FragmentStreamReaderTest.java       |  2 +-
 .../cxf/staxutils/PartialXMLStreamReaderTest.java     |  2 +-
 .../PropertiesExpandingStreamReaderTest.java          |  2 +-
 .../apache/cxf/staxutils/StaxStreamFilterTest.java    |  2 +-
 .../apache/cxf/staxutils/W3CDOMStreamReaderTest.java  |  2 +-
 .../transform/DelegatingNamespaceContextTest.java     |  2 +-
 .../staxutils/transform/InTransformReaderTest.java    |  2 +-
 .../staxutils/transform/OutTransformWriterTest.java   |  2 +-
 .../cxf/transport/ChainInitiationObserverTest.java    |  2 +-
 .../org/apache/cxf/transport/HttpUriMapperTest.java   |  2 +-
 .../transport/common/gzip/GZIPAcceptEncodingTest.java |  2 +-
 .../test/java/org/apache/cxf/version/VersionTest.java |  2 +-
 .../apache/cxf/workqueue/AutomaticWorkQueueTest.java  |  2 +-
 .../jca/core/classloader/FireWallClassLoaderTest.java |  2 +-
 .../jca/core/classloader/PlugInClassLoaderTest.java   |  2 +-
 .../apache/cxf/jca/core/logging/LoggerHelperTest.java |  2 +-
 .../cxf/jca/core/resourceadapter/HandlerTest.java     |  2 +-
 .../ManagedConnectionFactoryImplTest.java             |  2 +-
 .../resourceadapter/ManagedConnectionImplTest.java    |  2 +-
 .../ResourceAdapterInternalExceptionTest.java         |  2 +-
 .../jca/core/resourceadapter/ResourceBeanTest.java    |  2 +-
 .../jca/core/resourceadapter/UriHandlerInitTest.java  |  2 +-
 .../cxf/jca/cxf/CXFConnectionRequestInfoTest.java     |  2 +-
 .../apache/cxf/jca/cxf/ConnectionFactoryImplTest.java |  2 +-
 .../cxf/jca/cxf/ManagedConnectionFactoryImplTest.java |  2 +-
 .../apache/cxf/jca/cxf/ManagedConnectionTestBase.java |  2 +-
 .../apache/cxf/jca/cxf/ResourceAdapterImplTest.java   |  2 +-
 .../apache/cxf/jca/cxf/handlers/HandlerTestBase.java  |  2 +-
 .../org/apache/cxf/jca/jarloader/JarLoaderTest.java   |  2 +-
 .../org/apache/cxf/jca/servant/EJBEndpointTest.java   |  2 +-
 .../apache/cxf/jca/servant/EJBServantConfigTest.java  |  2 +-
 .../cxf/binding/coloc/ColocMessageObserverTest.java   |  2 +-
 .../cxf/binding/coloc/ColocOutInterceptorTest.java    |  2 +-
 .../org/apache/cxf/binding/coloc/ColocUtilTest.java   |  2 +-
 .../coloc/blueprint/ColocBPNamespaceHandlerTest.java  |  2 +-
 .../cxf/binding/corba/CorbaBindingFactoryTest.java    |  2 +-
 .../apache/cxf/binding/corba/CorbaBindingTest.java    |  2 +-
 .../apache/cxf/binding/corba/CorbaConduitTest.java    |  2 +-
 .../cxf/binding/corba/CorbaDestinationTest.java       |  2 +-
 .../apache/cxf/binding/corba/CorbaMessageTest.java    |  2 +-
 .../cxf/binding/corba/CorbaServerConduitTest.java     |  2 +-
 .../apache/cxf/binding/corba/CorbaTypeMapTest.java    |  2 +-
 .../binding/corba/runtime/CorbaDSIServantTest.java    |  2 +-
 .../binding/corba/runtime/CorbaObjectReaderTest.java  |  2 +-
 .../binding/corba/runtime/CorbaObjectWriterTest.java  |  2 +-
 .../binding/corba/runtime/CorbaStreamReaderTest.java  |  2 +-
 .../binding/corba/runtime/CorbaStreamWriterTest.java  |  2 +-
 .../binding/corba/runtime/CorbaStreamableTest.java    |  2 +-
 .../cxf/binding/corba/types/CorbaAnyHandlerTest.java  |  2 +-
 .../binding/corba/types/CorbaArrayHandlerTest.java    |  2 +-
 .../cxf/binding/corba/types/CorbaEnumHandlerTest.java |  2 +-
 .../binding/corba/types/CorbaFixedHandlerTest.java    |  2 +-
 .../binding/corba/types/CorbaHandlerUtilsTest.java    |  2 +-
 .../binding/corba/types/CorbaObjectHandlerTest.java   |  2 +-
 .../corba/types/CorbaPrimitiveHandlerTest.java        |  2 +-
 .../binding/corba/types/CorbaSequenceHandlerTest.java |  2 +-
 .../binding/corba/types/CorbaStructHandlerTest.java   |  2 +-
 .../cxf/binding/corba/utils/ContextUtilsTest.java     |  2 +-
 .../cxf/binding/corba/utils/CorbaUtilsTest.java       |  2 +-
 .../apache/cxf/binding/soap/ServiceModelUtilTest.java |  2 +-
 .../cxf/binding/soap/SoapActionInterceptorTest.java   |  2 +-
 .../cxf/binding/soap/SoapBindingFactoryTest.java      |  2 +-
 .../org/apache/cxf/binding/soap/SoapBindingTest.java  |  2 +-
 .../java/org/apache/cxf/binding/soap/TestBase.java    |  2 +-
 .../soap/blueprint/SoapBindingBPHandlerTest.java      |  2 +-
 .../soap/interceptor/ReadHeadersInterceptorTest.java  |  2 +-
 .../soap/interceptor/SoapActionInInterceptorTest.java |  2 +-
 .../soap/interceptor/SoapFaultSerializerTest.java     |  2 +-
 .../SoapPreProtocolOutInterceptorTest.java            |  2 +-
 .../soap/jms/interceptor/SoapFaultFactoryTest.java    |  2 +-
 .../apache/cxf/binding/soap/saaj/ParseBodyTest.java   |  2 +-
 .../apache/cxf/binding/xml/XMLBindingFactoryTest.java |  2 +-
 .../apache/cxf/binding/xml/interceptor/TestBase.java  |  2 +-
 .../apache/cxf/aegis/integration/DOMMappingTest.java  |  3 +--
 .../apache/cxf/aegis/standalone/SchemaAddinsTest.java |  5 ++---
 .../cxf/aegis/type/encoded/ArrayTypeInfoTest.java     | 19 ++++++++++---------
 .../org/apache/cxf/jaxb/BareInInterceptorTest.java    |  2 +-
 .../apache/cxf/jaxb/DocLiteralInInterceptorTest.java  |  2 +-
 .../java/org/apache/cxf/jaxb/JAXBDataBindingTest.java |  2 +-
 .../org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java   |  2 +-
 .../test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java  |  2 +-
 .../org/apache/cxf/jaxb/JAXBWrapperHelperTest.java    |  2 +-
 .../src/test/java/org/apache/cxf/jaxb/TestBase.java   |  2 +-
 .../src/test/java/org/apache/cxf/jaxb/UtilsTest.java  |  2 +-
 .../apache/cxf/jaxb/io/XMLStreamDataReaderTest.java   |  2 +-
 .../apache/cxf/jaxb/io/XMLStreamDataWriterTest.java   |  2 +-
 .../blueprint/ClusteringBPNamespaceHandlerTest.java   |  2 +-
 .../apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java  |  2 +-
 .../apache/cxf/jaxrs/JAXRSServiceFactoryBeanTest.java |  2 +-
 .../apache/cxf/jaxrs/SelectMethodCandidatesTest.java  |  2 +-
 .../jaxrs/blueprint/JAXRSBPNamespaceHandlerTest.java  |  2 +-
 .../apache/cxf/jaxrs/ext/MessageContextImplTest.java  |  2 +-
 .../java/org/apache/cxf/jaxrs/ext/form/FormTest.java  |  2 +-
 .../cxf/jaxrs/ext/multipart/AttachmentTest.java       |  2 +-
 .../jaxrs/ext/multipart/ContentDispositionTest.java   |  2 +-
 .../cxf/jaxrs/ext/multipart/MultipartBodyTest.java    |  2 +-
 .../org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java   |  2 +-
 .../apache/cxf/jaxrs/impl/AsyncResponseImplTest.java  |  2 +-
 .../jaxrs/impl/CacheControlHeaderProviderTest.java    |  2 +-
 .../apache/cxf/jaxrs/impl/ConfigurationImplTest.java  |  2 +-
 .../cxf/jaxrs/impl/CookieHeaderProviderTest.java      |  2 +-
 .../apache/cxf/jaxrs/impl/DateHeaderProviderTest.java |  2 +-
 .../cxf/jaxrs/impl/EntityTagHeaderProviderTest.java   |  2 +-
 .../apache/cxf/jaxrs/impl/HttpHeadersImplTest.java    |  2 +-
 .../apache/cxf/jaxrs/impl/LinkBuilderImplTest.java    |  2 +-
 .../apache/cxf/jaxrs/impl/LinkHeaderProviderTest.java |  2 +-
 .../cxf/jaxrs/impl/MediaTypeHeaderProviderTest.java   |  2 +-
 .../org/apache/cxf/jaxrs/impl/MetadataMapTest.java    |  2 +-
 .../cxf/jaxrs/impl/NewCookieHeaderProviderTest.java   |  2 +-
 .../apache/cxf/jaxrs/impl/PathSegmentImplTest.java    |  2 +-
 .../org/apache/cxf/jaxrs/impl/RequestImplTest.java    |  2 +-
 .../cxf/jaxrs/impl/RequestPreprocessorTest.java       |  2 +-
 .../cxf/jaxrs/impl/ResponseBuilderImplTest.java       |  2 +-
 .../org/apache/cxf/jaxrs/impl/ResponseImplTest.java   |  2 +-
 .../cxf/jaxrs/impl/RuntimeDelegateImplTest.java       |  2 +-
 .../cxf/jaxrs/impl/SecurityContextImplTest.java       |  2 +-
 .../org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java |  2 +-
 .../org/apache/cxf/jaxrs/impl/UriInfoImplTest.java    |  2 +-
 .../cxf/jaxrs/impl/VariantListBuilderImplTest.java    |  2 +-
 .../lifecycle/PerRequestResourceProviderTest.java     |  2 +-
 .../apache/cxf/jaxrs/model/ClassResourceInfoTest.java |  2 +-
 .../cxf/jaxrs/model/OperationResourceInfoTest.java    |  2 +-
 .../org/apache/cxf/jaxrs/model/URITemplateTest.java   |  2 +-
 .../cxf/jaxrs/model/doc/JavaDocProviderTest.java      |  2 +-
 .../cxf/jaxrs/provider/BinaryDataProviderTest.java    |  2 +-
 .../cxf/jaxrs/provider/DataSourceProviderTest.java    |  2 +-
 .../cxf/jaxrs/provider/FormEncodingProviderTest.java  |  2 +-
 .../cxf/jaxrs/provider/JAXBElementProviderTest.java   |  2 +-
 .../cxf/jaxrs/provider/PrimitiveTextProviderTest.java |  2 +-
 .../cxf/jaxrs/provider/ProviderFactoryTest.java       |  2 +-
 .../jaxrs/provider/RequestDispatcherProviderTest.java |  2 +-
 .../apache/cxf/jaxrs/provider/SourceProviderTest.java |  2 +-
 .../apache/cxf/jaxrs/provider/XPathProviderTest.java  |  2 +-
 .../cxf/jaxrs/provider/XSLTJaxbProviderTest.java      |  2 +-
 .../jaxrs/security/JAASAuthenticationFilterTest.java  |  2 +-
 .../cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java  |  2 +-
 .../cxf/jaxrs/spring/SpringResourceFactoryTest.java   |  2 +-
 .../cxf/jaxrs/utils/AnnotationTestUtilsTest.java      |  2 +-
 .../apache/cxf/jaxrs/utils/ExceptionUtilsTest.java    |  2 +-
 .../org/apache/cxf/jaxrs/utils/FormUtilsTest.java     |  2 +-
 .../org/apache/cxf/jaxrs/utils/HttpUtilsTest.java     |  2 +-
 .../apache/cxf/jaxrs/utils/InjectionUtilsTest.java    |  2 +-
 .../org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java    |  2 +-
 .../org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java |  2 +-
 .../org/apache/cxf/jaxws/ConfiguredEndpointTest.java  |  2 +-
 .../org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java  |  2 +-
 .../apache/cxf/jaxws/WrapperClassGeneratorTest.java   |  2 +-
 .../jaxws/blueprint/JAXWSBPNamespaceHandlerTest.java  |  2 +-
 .../cxf/jaxws/context/WebServiceContextImplTest.java  |  2 +-
 .../cxf/jaxws/context/WrappedAttachmentsTest.java     |  2 +-
 .../cxf/jaxws/context/WrappedMessageContextTest.java  |  2 +-
 .../AbstractProtocolHandlerInterceptorTest.java       |  2 +-
 .../handler/AnnotationHandlerChainBuilderTest.java    |  2 +-
 .../cxf/jaxws/handler/HandlerChainBuilderTest.java    |  2 +-
 .../cxf/jaxws/handler/HandlerChainInvokerTest.java    |  2 +-
 .../jaxws/handler/InitParamResourceResolverTest.java  |  2 +-
 .../jaxws/handler/LogicalHandlerInterceptorTest.java  |  2 +-
 .../cxf/jaxws/handler/LogicalMessageImplTest.java     |  2 +-
 .../handler/soap/SOAPHandlerInterceptorTest.java      |  2 +-
 .../org/apache/cxf/jaxws/spring/SpringBeansTest.java  |  2 +-
 .../jaxws/support/ContextPropertiesMappingTest.java   |  2 +-
 .../cxf/jaxws/support/JaxWsImplementorInfoTest.java   |  2 +-
 .../jaxws/support/JaxWsServiceConfigurationTest.java  |  2 +-
 .../org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java |  2 +-
 .../transport/http_jaxws_spi/HttpHandlerImplTest.java |  2 +-
 .../http_jaxws_spi/JAXWSHttpSpiDestinationTest.java   |  2 +-
 .../JAXWSHttpSpiTransportFactoryTest.java             |  2 +-
 .../apache/cxf/js/rhino/AbstractDOMProviderTest.java  |  2 +-
 .../org/apache/cxf/js/rhino/ProviderFactoryTest.java  |  2 +-
 .../java/org/apache/cxf/js/rhino/ServerAppTest.java   |  2 +-
 .../blueprint/SimpleBPNamespaceHandlerTest.java       |  2 +-
 .../spring/AbstractSimpleFrontendSpringTest.java      |  2 +-
 .../apache/cxf/javascript/BasicNameManagerTest.java   |  2 +-
 .../cxf/management/InstrumentationManagerTest.java    |  2 +-
 .../management/counters/CounterRepositoryTest.java    |  2 +-
 .../interceptor/AbstractMessageResponseTestBase.java  |  2 +-
 .../cxf/management/jmx/BusRegistrationTest.java       |  2 +-
 .../jmx/JMXManagedComponentManagerTest.java           |  2 +-
 .../cxf/management/jmx/MBServerConnectorTest.java     |  2 +-
 .../cxf/management/utils/ManagementConsoleTest.java   |  2 +-
 .../cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java  |  2 +-
 .../org/apache/cxf/jaxrs/client/WebClientTest.java    |  2 +-
 .../client/blueprint/JAXRSBPNamespaceHandlerTest.java |  2 +-
 .../cxf/jaxrs/client/cache/ClientCacheTest.java       |  2 +-
 .../org/apache/cxf/jaxrs/client/cache/ClientTest.java |  2 +-
 .../apache/cxf/jaxrs/client/spec/ClientImplTest.java  |  2 +-
 .../jaxrs/client/spec/ClientRequestFilterTest.java    |  2 +-
 .../jaxrs/client/spec/InvocationBuilderImplTest.java  |  2 +-
 .../client/spring/JAXRSClientFactoryBeanTest.java     |  2 +-
 .../apache/cxf/jaxrs/swagger/Swagger2FeatureTest.java |  2 +-
 .../openapi/SwaggerToOpenApiConversionUtilsTest.java  |  2 +-
 .../jaxrs/swagger/parse/SwaggerParseUtilsTest.java    |  2 +-
 .../jaxrs/model/wadl/ServerProviderFactoryTest.java   |  2 +-
 .../cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java   |  2 +-
 .../cxf/jaxrs/model/wadl/WadlGeneratorTest.java       |  2 +-
 .../json/basic/JsonMapObjectReaderWriterTest.java     |  2 +-
 .../cxf/jaxrs/provider/ProviderFactoryAllTest.java    |  2 +-
 .../provider/aegis/AegisElementProviderTest.java      |  2 +-
 .../jaxrs/provider/atom/AtomEntryProviderTest.java    |  2 +-
 .../cxf/jaxrs/provider/atom/AtomFeedProviderTest.java |  2 +-
 .../cxf/jaxrs/provider/atom/AtomPojoProviderTest.java |  2 +-
 .../cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java   |  2 +-
 .../cxf/jaxrs/provider/json/JSONProviderTest.java     |  2 +-
 .../jaxrs/provider/jsonp/JsonpInterceptorTest.java    |  2 +-
 .../apache/cxf/jaxrs/ext/search/BeanspectorTest.java  |  2 +-
 .../ext/search/SearchContextImplCustomParserTest.java |  2 +-
 .../cxf/jaxrs/ext/search/SearchContextImplTest.java   |  2 +-
 .../apache/cxf/jaxrs/ext/search/SearchUtilsTest.java  |  2 +-
 .../search/client/FiqlSearchConditionBuilderTest.java |  2 +-
 .../jaxrs/ext/search/fiql/FiqlCollectionsTest.java    |  2 +-
 .../cxf/jaxrs/ext/search/fiql/FiqlParserTest.java     |  2 +-
 .../cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java  |  2 +-
 .../search/jpa/AbstractJPATypedQueryVisitorTest.java  |  2 +-
 .../jaxrs/ext/search/jpa/JPALanguageVisitorTest.java  |  2 +-
 .../jaxrs/ext/search/ldap/LdapQueryVisitorTest.java   |  2 +-
 .../cxf/jaxrs/ext/search/odata/ODataParserTest.java   |  2 +-
 .../ext/search/sql/SQLHierarchicalQueryTest.java      |  2 +-
 .../jaxrs/ext/search/sql/SQLPrinterVisitorTest.java   |  2 +-
 .../ext/search/tika/TikaContentExtractorTest.java     |  2 +-
 .../search/tika/TikaLuceneContentExtractorTest.java   |  2 +-
 .../client/CxfTypeSafeClientBuilderTest.java          |  8 ++++----
 .../apache/cxf/microprofile/client/ValidatorTest.java |  2 +-
 .../microprofile/client/cdi/RestClientCdiTest.java    |  2 +-
 .../security/jose/cookbook/JwkJoseCookBookTest.java   |  2 +-
 .../security/jose/jwe/JweCompactReaderWriterTest.java |  2 +-
 .../cxf/rs/security/jose/jwe/JweJsonConsumerTest.java |  2 +-
 .../cxf/rs/security/jose/jwe/JweJsonProducerTest.java |  2 +-
 .../rs/security/jose/jwe/JwePbeHmacAesWrapTest.java   |  2 +-
 .../cxf/rs/security/jose/jwk/JsonWebKeyTest.java      |  2 +-
 .../apache/cxf/rs/security/jose/jwk/JwkUtilsTest.java |  2 +-
 .../rs/security/jose/jws/JwsCompactHeaderTest.java    |  2 +-
 .../security/jose/jws/JwsCompactReaderWriterTest.java |  2 +-
 .../cxf/rs/security/jose/jws/JwsJsonConsumerTest.java |  2 +-
 .../cxf/rs/security/jose/jws/JwsJsonProducerTest.java |  2 +-
 .../apache/cxf/rs/security/jose/jws/JwsUtilsTest.java |  2 +-
 .../apache/cxf/rs/security/jose/jwt/JwtUtilsTest.java |  2 +-
 .../cxf/rs/security/oauth/utils/OAuthUtilsTest.java   |  2 +-
 .../rs/security/oauth2/common/UserSubjectTest.java    |  2 +-
 .../security/oauth2/grants/TokenGrantHandlerTest.java |  2 +-
 .../grants/code/JCacheCodeDataProviderTest.java       |  2 +-
 .../oauth2/grants/code/JPACodeDataProviderTest.java   |  2 +-
 .../oauth2/grants/jwt/JwtUserSubjectTest.java         |  2 +-
 .../provider/AbstractOAuthDataProviderTest.java       |  2 +-
 .../oauth2/provider/OAuthJSONProviderTest.java        |  2 +-
 .../tokens/hawk/HawkAccessTokenValidatorTest.java     |  2 +-
 .../oauth2/tokens/hawk/NonceVerifierImplTest.java     |  2 +-
 .../security/oauth2/utils/AuthorizationUtilsTest.java |  2 +-
 .../cxf/rs/security/oauth2/utils/OAuthUtilsTest.java  |  2 +-
 .../security/oauth2/utils/crypto/CryptoUtilsTest.java |  2 +-
 .../rs/security/oidc/idp/JPAOidcUserSubjectTest.java  |  2 +-
 .../cxf/rs/security/oidc/utils/OidcUtilsTest.java     |  2 +-
 .../cxf/rs/security/saml/sso/EHCacheUtilTest.java     |  2 +-
 .../rs/security/saml/DeflateEncoderDecoderTest.java   |  2 +-
 .../cxf/rt/security/saml/claims/SAMLClaimsTest.java   |  2 +-
 .../org/apache/cxf/rt/security/claims/ClaimTest.java  |  2 +-
 .../interceptor/ClaimsAuthorizingInterceptorTest.java |  2 +-
 .../http_jetty/JettyHTTPDestinationTest.java          |  2 +-
 .../http_jetty/JettyHTTPServerEngineFactoryTest.java  |  2 +-
 .../http_jetty/JettyHTTPServerEngineTest.java         |  2 +-
 .../HTTPJettyTransportNamespaceHandlerTest.java       |  2 +-
 .../http_jetty/spring/ApplicationContextTest.java     |  2 +-
 .../netty/client/NettyHttpConduitFactoryTest.java     |  2 +-
 .../http/netty/server/NettyHttpDestinationTest.java   |  2 +-
 .../server/NettyHttpServerEngineFactoryTest.java      |  2 +-
 .../http/netty/server/NettyHttpServerEngineTest.java  |  2 +-
 .../netty/server/spring/ApplicationContextTest.java   |  2 +-
 .../http_undertow/UndertowHTTPDestinationTest.java    |  2 +-
 .../UndertowHTTPServerEngineFactoryTest.java          |  2 +-
 .../http_undertow/UndertowHTTPServerEngineTest.java   |  2 +-
 .../HTTPUndertowTransportNamespaceHandlerTest.java    |  2 +-
 .../http_undertow/spring/ApplicationContextTest.java  |  2 +-
 .../transport/http/DestinationRegistryImplTest.java   |  2 +-
 .../apache/cxf/transport/http/HTTPConduitTest.java    |  2 +-
 .../transport/http/HTTPConduitURLConnectionTest.java  |  2 +-
 .../transport/http/HTTPConduitURLEasyMockTest.java    |  2 +-
 .../cxf/transport/http/HTTPTransportFactoryTest.java  |  2 +-
 .../org/apache/cxf/transport/http/HeadersTest.java    |  2 +-
 .../apache/cxf/transport/http/PatternBuilderTest.java |  2 +-
 .../transport/http/blueprint/HttpBPHandlerTest.java   |  2 +-
 .../http/policy/ClientPolicyCalculatorTest.java       |  2 +-
 .../http/policy/HTTPClientAssertionBuilderTest.java   |  2 +-
 .../http/policy/HTTPServerAssertionBuilderTest.java   |  2 +-
 .../cxf/transport/http/policy/PolicyUtilsTest.java    |  2 +-
 .../http/policy/ServerPolicyCalculatorTest.java       |  2 +-
 .../http/spring/HttpConduitConfigurationTest.java     |  2 +-
 .../cxf/transport/servlet/ServletControllerTest.java  |  2 +-
 .../apache/cxf/transport/jms/AbstractJMSTester.java   |  2 +-
 .../apache/cxf/transport/jms/JMSMessageUtilTest.java  |  2 +-
 .../continuations/JMSContinuationProviderTest.java    |  2 +-
 .../jms/continuations/JMSContinuationTest.java        |  2 +-
 .../apache/cxf/transport/jms/uri/JMSEndpointTest.java |  2 +-
 .../apache/cxf/transport/jms/util/JMSUtilTest.java    |  2 +-
 .../cxf/transport/local/LocalDestinationTest.java     |  2 +-
 .../transport/local/LocalTransportFactoryTest.java    |  2 +-
 .../websocket/WebSocketTransportFactoryTest.java      |  2 +-
 .../cxf/transport/websocket/WebSocketUtilsTest.java   |  2 +-
 .../websocket/ahc/AhcWebSocketConduitTest.java        |  2 +-
 .../AtmosphereWebSocketJettyDestinationTest.java      |  2 +-
 .../AtmosphereWebSocketServletDestinationTest.java    |  2 +-
 .../atmosphere/DefaultProtocolInterceptorTest.java    |  2 +-
 .../jetty/JettyWebSocketDestinationTest.java          |  2 +-
 .../ws/addressing/AddressingConstantsImplTest.java    |  2 +-
 .../cxf/ws/addressing/blueprint/WsBPHandlerTest.java  |  2 +-
 .../cxf/ws/addressing/impl/ContextUtilsTest.java      |  2 +-
 .../cxf/ws/addressing/impl/MAPAggregatorTest.java     |  2 +-
 .../ws/addressing/soap/DecoupledFaultHandlerTest.java |  2 +-
 .../apache/cxf/ws/addressing/soap/MAPCodecTest.java   |  2 +-
 .../src/test/java/org/apache/cxf/ws/mex/MEXTest.java  |  2 +-
 .../ws/policy/AssertionBuilderRegistryImplTest.java   |  2 +-
 .../apache/cxf/ws/policy/AssertionInfoMapTest.java    |  2 +-
 .../apache/cxf/ws/policy/EffectivePolicyImplTest.java |  2 +-
 .../apache/cxf/ws/policy/EndpointPolicyImplTest.java  |  2 +-
 .../IgnorablePolicyInterceptorProviderTest.java       |  2 +-
 .../java/org/apache/cxf/ws/policy/NormalizeTest.java  |  2 +-
 .../org/apache/cxf/ws/policy/PolicyBuilderTest.java   |  2 +-
 .../cxf/ws/policy/PolicyDataEngineImplTest.java       |  2 +-
 .../org/apache/cxf/ws/policy/PolicyEngineTest.java    |  2 +-
 .../apache/cxf/ws/policy/PolicyExtensionsTest.java    |  2 +-
 .../PolicyInterceptorProviderRegistryImplTest.java    |  2 +-
 .../apache/cxf/ws/policy/PolicyInterceptorsTest.java  |  2 +-
 .../apache/cxf/ws/policy/PolicyRegistryImplTest.java  |  2 +-
 .../PolicyVerificationInFaultInterceptorTest.java     |  2 +-
 .../policy/PolicyVerificationInInterceptorTest.java   |  2 +-
 .../policy/PolicyVerificationOutInterceptorTest.java  |  2 +-
 .../external/DomainExpressionBuilderRegistryTest.java |  2 +-
 .../EndpointReferenceDomainExpressionTest.java        |  2 +-
 .../external/ExternalAttachmentProviderTest.java      |  2 +-
 .../attachment/external/PolicyAttachmentTest.java     |  2 +-
 .../attachment/reference/ReferenceResolverTest.java   |  2 +-
 .../wsdl11/Wsdl11AttachmentPolicyProviderTest.java    |  2 +-
 .../cxf/ws/policy/blueprint/PolicyBPHandlerTest.java  |  2 +-
 .../policy/builder/jaxb/JaxbAssertionBuilderTest.java |  2 +-
 .../cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java |  2 +-
 .../policy/selector/FirstAlternativeSelectorTest.java |  2 +-
 .../MinimalMaximalAlternativeSelectorTest.java        |  2 +-
 .../apache/cxf/ws/policy/spring/PolicyBeansTest.java  |  2 +-
 .../org/apache/cxf/ws/rm/AbstractEndpointTest.java    |  2 +-
 .../apache/cxf/ws/rm/AbstractRMInterceptorTest.java   |  2 +-
 .../org/apache/cxf/ws/rm/AbstractSequenceTest.java    |  2 +-
 .../org/apache/cxf/ws/rm/DestinationSequenceTest.java |  2 +-
 .../java/org/apache/cxf/ws/rm/DestinationTest.java    |  2 +-
 .../org/apache/cxf/ws/rm/ManagedRMManagerTest.java    |  2 +-
 .../org/apache/cxf/ws/rm/ProtocolVariationTest.java   |  2 +-
 .../src/test/java/org/apache/cxf/ws/rm/ProxyTest.java |  2 +-
 .../java/org/apache/cxf/ws/rm/RMContextUtilsTest.java |  2 +-
 .../java/org/apache/cxf/ws/rm/RMEndpointTest.java     |  2 +-
 .../org/apache/cxf/ws/rm/RMInInterceptorTest.java     |  2 +-
 .../apache/cxf/ws/rm/RMManagerConfigurationTest.java  |  2 +-
 .../test/java/org/apache/cxf/ws/rm/RMManagerTest.java |  2 +-
 .../org/apache/cxf/ws/rm/RMOutInterceptorTest.java    |  2 +-
 .../test/java/org/apache/cxf/ws/rm/RMUtilsTest.java   |  2 +-
 .../test/java/org/apache/cxf/ws/rm/ServantTest.java   |  2 +-
 .../java/org/apache/cxf/ws/rm/SourceSequenceTest.java |  2 +-
 .../apache/cxf/ws/rm/blueprint/RMBPHandlerTest.java   |  2 +-
 .../cxf/ws/rm/persistence/PersistenceUtilsTest.java   |  2 +-
 .../apache/cxf/ws/rm/persistence/RMMessageTest.java   |  2 +-
 .../persistence/jdbc/RMTxStoreConfigurationTest.java  |  2 +-
 .../cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java |  2 +-
 .../rm/persistence/jdbc/RMTxStoreTwoSchemasTest.java  |  2 +-
 .../ws/rm/persistence/jdbc/RMTxStoreUpgradeTest.java  |  2 +-
 .../org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java  |  2 +-
 .../cxf/ws/rm/soap/RMSoapInInterceptorTest.java       |  2 +-
 .../cxf/ws/rm/soap/RMSoapOutInterceptorTest.java      |  2 +-
 .../cxf/ws/rm/soap/RetransmissionQueueImplTest.java   |  2 +-
 .../apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java   |  2 +-
 .../cxf/ws/security/cache/EHCacheUtilsTest.java       |  2 +-
 .../org/apache/cxf/ws/security/sts/STSClientTest.java |  2 +-
 .../trust/AuthPolicyValidatingInterceptorTest.java    |  2 +-
 .../org/apache/cxf/wsdl/JAXBExtensionHelperTest.java  |  2 +-
 .../interceptors/DocLiteralInInterceptorTest.java     |  2 +-
 .../factory/ReflectionServiceFactorBeanTest.java      |  2 +-
 .../java/org/apache/cxf/wsdl11/NSManagerTest.java     |  2 +-
 .../org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java |  2 +-
 .../org/apache/cxf/wsdl11/WSDLManagerImplTest.java    |  2 +-
 .../org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java |  2 +-
 .../apache/cxf/systest/grizzly/EndpointAPITest.java   |  2 +-
 .../apache/cxf/systest/jaxws/OASISCatalogTest.java    |  2 +-
 .../JavaFirstSchemaValidationTest.java                |  2 +-
 .../microprofile/rest/client/AsyncMethodTest.java     |  2 +-
 .../cxf/systest/http/PublishedEndpointUrlTest.java    |  2 +-
 .../cxf/systest/http_jetty/EngineLifecycleTest.java   |  2 +-
 .../cxf/systest/bus/BusExtensionLoadingTest.java      |  2 +-
 .../org/apache/cxf/systest/bus/BusShutdownTest.java   |  2 +-
 .../apache/cxf/systest/bus/SpringBusFactoryTest.java  |  2 +-
 .../apache/cxf/systest/coloc/AbstractColocTest.java   |  2 +-
 .../org/apache/cxf/systest/corba/BaseGreeterImpl.java |  2 +-
 .../apache/cxf/systest/lifecycle/LifeCycleTest.java   |  2 +-
 .../apache/cxf/systest/management/ManagedBusTest.java |  2 +-
 .../apache/cxf/systest/simple/SimpleFrontendTest.java |  2 +-
 .../org/apache/cxf/systest/soap/SoapActionTest.java   |  2 +-
 .../org/apache/cxf/systest/ws/util/MessageFlow.java   |  2 +-
 .../org/apache/cxf/systest/ws/util/MessageFlow.java   |  2 +-
 .../apache/cxf/tools/common/ProcessorTestBase.java    |  6 ++++--
 .../org/apache/cxf/tools/common/ToolTestBase.java     |  2 +-
 .../cxf/tools/common/ProcessorEnvironmentTest.java    |  2 +-
 .../org/apache/cxf/tools/common/ToolContextTest.java  |  2 +-
 .../org/apache/cxf/tools/common/WSDLVersionTest.java  |  2 +-
 .../tools/common/dom/ExtendedDocumentBuilderTest.java |  2 +-
 .../cxf/tools/common/model/JAnnotationTest.java       |  2 +-
 .../apache/cxf/tools/common/model/JavaClassTest.java  |  2 +-
 .../cxf/tools/common/model/JavaInterfaceTest.java     |  2 +-
 .../cxf/tools/common/model/JavaParameterTest.java     |  2 +-
 .../apache/cxf/tools/common/model/JavaTypeTest.java   |  2 +-
 .../common/toolspec/AbstractToolContainerTest.java    |  2 +-
 .../cxf/tools/common/toolspec/ToolExceptionTest.java  |  2 +-
 .../cxf/tools/common/toolspec/ToolSpecTest.java       |  2 +-
 .../cxf/tools/common/toolspec/ToolSupportTest.java    |  2 +-
 .../common/toolspec/parser/CommandLineParserTest.java |  2 +-
 .../tools/util/BuiltInTypesJavaMappingUtilTest.java   |  2 +-
 .../org/apache/cxf/tools/util/FileWriterUtilTest.java |  2 +-
 .../java/org/apache/cxf/tools/util/NameUtilTest.java  |  2 +-
 .../org/apache/cxf/tools/util/URIParserUtilTest.java  |  2 +-
 .../apache/cxf/tools/corba/common/ToolTestBase.java   |  2 +-
 .../idlpreprocessor/IdlPreprocessorReaderTest.java    |  2 +-
 .../corba/processors/WSDLToCorbaBindingTest.java      |  2 +-
 .../corba/processors/WSDLToCorbaBindingTypeTest.java  |  2 +-
 .../corba/processors/WSDLToIDLGenerationTest.java     |  2 +-
 .../java2wsdl/generator/WSDLGeneratorFactoryTest.java |  2 +-
 .../wsdl11/annotator/WrapperBeanAnnotatorTest.java    |  2 +-
 .../annotator/WrapperBeanFieldAnnotatorTest.java      |  2 +-
 .../java2wsdl/processor/FrontendFactoryTest.java      |  2 +-
 .../processor/internal/ServiceBuilderFactoryTest.java |  2 +-
 .../processor/internal/jaxws/FaultBeanTest.java       |  2 +-
 .../processor/internal/jaxws/RequestWrapperTest.java  |  2 +-
 .../processor/internal/jaxws/ResponseWrapperTest.java |  2 +-
 .../processor/internal/jaxws/WrapperTest.java         |  2 +-
 .../processor/internal/jaxws/WrapperUtilTest.java     |  2 +-
 .../cxf/tools/validator/internal/Stax2DOMTest.java    |  2 +-
 .../tools/validator/internal/WSDL11ValidatorTest.java |  2 +-
 .../validator/internal/WSDLRefValidatorTest.java      |  2 +-
 .../cxf/tools/validator/internal/model/XNodeTest.java |  2 +-
 .../cxf/tools/wsdlto/WSDLToJavaContainerTest.java     |  2 +-
 .../tools/wsdlto/core/WSDLDefinitionBuilderTest.java  |  2 +-
 .../cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java  |  2 +-
 .../tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java |  2 +-
 .../processor/internal/ParameterProcessorTest.java    |  2 +-
 .../processor/internal/PortTypeProcessorTest.java     |  2 +-
 .../jaxws/processor/internal/ProcessorUtilTest.java   |  2 +-
 .../internal/annotator/WebMethodAnnotatorTest.java    |  2 +-
 .../internal/annotator/WebParamAnnotatorTest.java     |  2 +-
 .../internal/annotator/XmlSeeAlsoAnnotatorTest.java   |  2 +-
 .../internal/mapper/InterfaceMapperTest.java          |  2 +-
 .../processor/internal/mapper/MethodMapperTest.java   |  2 +-
 .../jaxws/wsdl11/JAXWSDefinitionBuilderTest.java      |  2 +-
 .../org/apache/cxf/tools/wsdlto/WSDLToJavaTest.java   |  2 +-
 .../cxf/tools/wsdlto/core/PluginLoaderTest.java       |  2 +-
 .../jaxws/wsdl11/JAXWSDefinitionBuilderTest.java      |  2 +-
 520 files changed, 536 insertions(+), 535 deletions(-)

diff --git a/core/src/test/java/org/apache/cxf/BusFactoryTest.java b/core/src/test/java/org/apache/cxf/BusFactoryTest.java
index f4da912..5ef364c 100644
--- a/core/src/test/java/org/apache/cxf/BusFactoryTest.java
+++ b/core/src/test/java/org/apache/cxf/BusFactoryTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertTrue;
 
 
 
-public class BusFactoryTest extends Assert {
+public class BusFactoryTest {
 
     @After
     public void tearDown() {
diff --git a/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java b/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
index a350fd0..cfa7ee0 100644
--- a/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
+++ b/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
@@ -55,7 +55,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class AttachmentDeserializerTest extends Assert {
+public class AttachmentDeserializerTest {
 
     private MessageImpl msg;
 
diff --git a/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java b/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
index 83b2152..697070d 100644
--- a/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
+++ b/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
@@ -45,7 +45,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class AttachmentSerializerTest extends Assert {
+public class AttachmentSerializerTest {
 
     @Test
     public void testMessageWriteXopOn1() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/attachment/AttachmentUtilTest.java b/core/src/test/java/org/apache/cxf/attachment/AttachmentUtilTest.java
index b2b1b80..7b4f92f 100644
--- a/core/src/test/java/org/apache/cxf/attachment/AttachmentUtilTest.java
+++ b/core/src/test/java/org/apache/cxf/attachment/AttachmentUtilTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class AttachmentUtilTest extends Assert {
+public class AttachmentUtilTest {
 
     @Test
     public void testContendDispositionFileNameNoQuotes() {
diff --git a/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java b/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
index 31ce70a..4e8fdd0 100644
--- a/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
 
-public class CXFBusImplTest extends Assert {
+public class CXFBusImplTest {
 
     @Test
     public void testThreadBus() throws BusException {
diff --git a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java
index 82b475d..b217db1 100644
--- a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 
-public class ExtensionManagerTest extends Assert {
+public class ExtensionManagerTest {
 
     private static final String EXTENSIONMANAGER_TEST_RESOURECE_NAME = "extensionManagerTest";
     private ExtensionManagerImpl manager;
diff --git a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java
index 4a1540d..5604c41 100644
--- a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class ExtensionTest extends Assert {
+public class ExtensionTest {
 
     @Test
     public void testMutators() {
diff --git a/core/src/test/java/org/apache/cxf/bus/extension/TextExtensionFragmentParserTest.java b/core/src/test/java/org/apache/cxf/bus/extension/TextExtensionFragmentParserTest.java
index e05e972..b89db23 100644
--- a/core/src/test/java/org/apache/cxf/bus/extension/TextExtensionFragmentParserTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/extension/TextExtensionFragmentParserTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class TextExtensionFragmentParserTest extends Assert {
+public class TextExtensionFragmentParserTest {
 
     @Test
     public void testGetExtensions() throws IOException {
diff --git a/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java b/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java
index b03a92b..0b4a733 100644
--- a/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-public class EndpointResolverRegistryImplTest extends Assert {
+public class EndpointResolverRegistryImplTest {
 
     private EndpointResolverRegistryImpl registry;
     private EndpointResolver resolver1;
diff --git a/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java b/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java
index 7cd0ee4..2839b8d 100644
--- a/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class ServerRegistryImpTest extends Assert {
+public class ServerRegistryImpTest {
 
     @Test
     public void testServerRegistryPreShutdown() {
diff --git a/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java b/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java
index c1c9337..a2211fc 100644
--- a/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-public class ServiceContractResolverRegistryImplTest extends Assert {
+public class ServiceContractResolverRegistryImplTest {
     private ServiceContractResolverRegistryImpl registry;
     private ServiceContractResolver resolver1;
     private ServiceContractResolver resolver2;
diff --git a/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java b/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java
index bf9b415..22c7e38 100644
--- a/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java
@@ -47,7 +47,7 @@ import static org.junit.Assert.assertEquals;
 /**
  *
  */
-public class OSGiBusListenerTest extends Assert {
+public class OSGiBusListenerTest {
     private static final String[] SERVICE_BUNDLE_NAMES = new String[]{"me.temp.foo.test", "me.temp.bar.sample"};
     private static final String EXCLUDES = "me\\.temp\\.bar\\..*";
     private static final String RESTRICTED = "me\\.my\\.app\\..*";
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java b/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java
index a237217..6c9591d 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 
-public class BusApplicationContextTest extends Assert {
+public class BusApplicationContextTest {
 
     @Test
     public void testGetResources() {
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java b/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java
index e35e8f3..cfab4bd 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
 
 
 
-public class BusApplicationListenerTest extends Assert {
+public class BusApplicationListenerTest {
 
     @Test
     public void testParentApplicationEvent() {
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java b/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
index 2012f7b..f1d9800 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertTrue;
 
 
 
-public class BusDefinitionParserTest extends Assert {
+public class BusDefinitionParserTest {
 
     @Test
     public void testFeatures() {
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java b/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
index 3898e57..0624042 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
@@ -60,7 +60,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-public class SpringBusFactoryTest extends Assert {
+public class SpringBusFactoryTest {
 
     @After
     public void tearDown() {
diff --git a/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java b/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java
index 08ac8d3..86dfeb8 100644
--- a/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java
+++ b/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java
@@ -26,7 +26,7 @@ import org.easymock.IMocksControl;
 import org.junit.Assert;
 import org.junit.Test;
 
-public class CXFBusLifeCycleManagerTest extends Assert {
+public class CXFBusLifeCycleManagerTest {
 
     @Test
     public void testListenerNotRegistered() {
diff --git a/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java b/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
index e22edf7..88cf302 100644
--- a/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
+++ b/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
@@ -40,7 +40,7 @@ import org.junit.Test;
 import static org.junit.Assert.fail;
 
 
-public class AnnotationProcessorTest extends Assert {
+public class AnnotationProcessorTest {
 
     AnnotatedGreeterImpl greeterImpl = new AnnotatedGreeterImpl();
     AnnotationProcessor processor = new AnnotationProcessor(greeterImpl);
diff --git a/core/src/test/java/org/apache/cxf/common/classloader/ClassLoaderUtilsTest.java b/core/src/test/java/org/apache/cxf/common/classloader/ClassLoaderUtilsTest.java
index d3da661..b3ee5f4 100644
--- a/core/src/test/java/org/apache/cxf/common/classloader/ClassLoaderUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/classloader/ClassLoaderUtilsTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class ClassLoaderUtilsTest extends Assert {
+public class ClassLoaderUtilsTest {
 
     private static void setTCCL(ClassLoader loader) {
         Thread.currentThread().setContextClassLoader(loader);
diff --git a/core/src/test/java/org/apache/cxf/common/i18n/BundleUtilsTest.java b/core/src/test/java/org/apache/cxf/common/i18n/BundleUtilsTest.java
index 28e5633..0dc51a6 100644
--- a/core/src/test/java/org/apache/cxf/common/i18n/BundleUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/i18n/BundleUtilsTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 
-public class BundleUtilsTest extends Assert {
+public class BundleUtilsTest {
     @Test
     public void testGetBundleName() throws Exception {
         assertEquals("unexpected resource bundle name",
diff --git a/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java b/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java
index a4ac2cbb..2fe040f 100644
--- a/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java
+++ b/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 
-public class MessageTest extends Assert {
+public class MessageTest {
     private static final Logger LOG = LogUtils.getL7dLogger(MessageTest.class);
 
     @Test
diff --git a/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java b/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
index d107043..af9b609 100644
--- a/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
+++ b/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class ResourceInjectorTest extends Assert {
+public class ResourceInjectorTest {
     private static final String RESOURCE_ONE = "resource one";
     private static final String RESOURCE_TWO = "resource two";
     private static final String RESOURCE_THREE = "resource three";
diff --git a/core/src/test/java/org/apache/cxf/common/jaxb/JAXBUtilsTest.java b/core/src/test/java/org/apache/cxf/common/jaxb/JAXBUtilsTest.java
index ead83f1..71b40c5 100644
--- a/core/src/test/java/org/apache/cxf/common/jaxb/JAXBUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/jaxb/JAXBUtilsTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class JAXBUtilsTest extends Assert {
+public class JAXBUtilsTest {
 
     @Test
     public void testCanSetEscapeHandlerWithStandardJaxbImpl() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java b/core/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java
index 15ecebb..7dec5c1 100644
--- a/core/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertNotNull;
 
 
 
-public class LogUtilsTest extends Assert {
+public class LogUtilsTest {
 
     @Test
     public void testGetL7dLog() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/common/logging/RegexLoggingFilterTest.java b/core/src/test/java/org/apache/cxf/common/logging/RegexLoggingFilterTest.java
index a1de8cd..f15a60e 100644
--- a/core/src/test/java/org/apache/cxf/common/logging/RegexLoggingFilterTest.java
+++ b/core/src/test/java/org/apache/cxf/common/logging/RegexLoggingFilterTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class RegexLoggingFilterTest extends Assert {
+public class RegexLoggingFilterTest {
     
     @Test
     public void testFilter() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/common/security/SimpleGroupTest.java b/core/src/test/java/org/apache/cxf/common/security/SimpleGroupTest.java
index 69bc4b8..61576d2 100644
--- a/core/src/test/java/org/apache/cxf/common/security/SimpleGroupTest.java
+++ b/core/src/test/java/org/apache/cxf/common/security/SimpleGroupTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class SimpleGroupTest extends Assert {
+public class SimpleGroupTest {
 
     @Test
     public void testName() {
diff --git a/core/src/test/java/org/apache/cxf/common/security/SimplePrincipalTest.java b/core/src/test/java/org/apache/cxf/common/security/SimplePrincipalTest.java
index 38348c0..9311fb7 100644
--- a/core/src/test/java/org/apache/cxf/common/security/SimplePrincipalTest.java
+++ b/core/src/test/java/org/apache/cxf/common/security/SimplePrincipalTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
-public class SimplePrincipalTest extends Assert {
+public class SimplePrincipalTest {
 
     @Test(expected = IllegalArgumentException.class)
     public void testNullName() {
diff --git a/core/src/test/java/org/apache/cxf/common/util/ASMHelperTest.java b/core/src/test/java/org/apache/cxf/common/util/ASMHelperTest.java
index 4d246c4..95597a1 100644
--- a/core/src/test/java/org/apache/cxf/common/util/ASMHelperTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/ASMHelperTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class ASMHelperTest extends Assert {
+public class ASMHelperTest {
     @Test
     public void testEnumParamType() throws Exception {
         Method method = EnumTest.class.getMethod("test", new Class[] {
diff --git a/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java b/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
index fff8a29..8cbc04f 100644
--- a/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
-public class Base64UtilityTest extends Assert {
+public class Base64UtilityTest {
 
     @Test
     public void testEncodeMultipleChunks() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/common/util/ClassHelperTest.java b/core/src/test/java/org/apache/cxf/common/util/ClassHelperTest.java
index 7d58b1b..af10a34 100644
--- a/core/src/test/java/org/apache/cxf/common/util/ClassHelperTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/ClassHelperTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertSame;
 
 
 
-public class ClassHelperTest extends Assert {
+public class ClassHelperTest {
 
     private Object proxiedObject;
 
diff --git a/core/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java
index c79d79c..fd6f6eb 100644
--- a/core/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class CollectionUtilsTest extends Assert {
+public class CollectionUtilsTest {
 
     @Test
     public void testDiff() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
index ab6b3f9..2d54560 100644
--- a/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class PackageUtilsTest extends Assert {
+public class PackageUtilsTest {
     @Test
     public void testGetClassPackageName() throws Exception {
         String packageName = PackageUtils.getPackageName(this.getClass());
diff --git a/core/src/test/java/org/apache/cxf/common/util/PropertiesLoaderUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/PropertiesLoaderUtilsTest.java
index 248ee56..a16b899 100644
--- a/core/src/test/java/org/apache/cxf/common/util/PropertiesLoaderUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/PropertiesLoaderUtilsTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-public class PropertiesLoaderUtilsTest extends Assert {
+public class PropertiesLoaderUtilsTest {
 
     Properties properties;
     String soapBindingFactory = "org.apache.cxf.bindings.soap.SOAPBindingFactory";
diff --git a/core/src/test/java/org/apache/cxf/common/util/PropertyUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/PropertyUtilsTest.java
index 08c33a5..c2c4fb5 100644
--- a/core/src/test/java/org/apache/cxf/common/util/PropertyUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/PropertyUtilsTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class PropertyUtilsTest extends Assert {
+public class PropertyUtilsTest {
     private static final String TEST_KEY = "my.key";
 
     @Test
diff --git a/core/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java
index 81765a6..f155d27 100644
--- a/core/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class StringUtilsTest extends Assert {
+public class StringUtilsTest {
 
     @Test
     public void testDiff() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/common/util/URIParserUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/URIParserUtilsTest.java
index 08af072..77ad7d1 100644
--- a/core/src/test/java/org/apache/cxf/common/util/URIParserUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/URIParserUtilsTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
 
-public class URIParserUtilsTest extends Assert {
+public class URIParserUtilsTest {
 
     @Test
     public void testRelativize() throws URISyntaxException {
diff --git a/core/src/test/java/org/apache/cxf/common/util/UrlUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/UrlUtilsTest.java
index 28c5f98..6fc0a91 100644
--- a/core/src/test/java/org/apache/cxf/common/util/UrlUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/UrlUtilsTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 
-public class UrlUtilsTest extends Assert {
+public class UrlUtilsTest {
 
     @Test
     public void testUrlDecode() {
diff --git a/core/src/test/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtilsTest.java
index 599f847..2361ccc 100644
--- a/core/src/test/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtilsTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class XmlSchemaPrimitiveUtilsTest extends Assert {
+public class XmlSchemaPrimitiveUtilsTest {
 
     @Test
     public void testDefaultRepresentation() {
diff --git a/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java b/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java
index dfe1014..e5fc74d 100644
--- a/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java
+++ b/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java
@@ -65,7 +65,7 @@ import static org.junit.Assert.fail;
 /**
  *
  */
-public class ImportRepairTest extends Assert {
+public class ImportRepairTest {
 
     static boolean dumpSchemas;
 
diff --git a/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java b/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
index 703733b..9b2a34b 100644
--- a/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
+++ b/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.assertTrue;
 
 
 
-public class ConfigurerImplTest extends Assert {
+public class ConfigurerImplTest {
 
     static {
         Class<?> cls;
diff --git a/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java b/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java
index e87d91f..28b590f 100644
--- a/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java
+++ b/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 
 
-public class SuspendedInvocationExceptionTest extends Assert {
+public class SuspendedInvocationExceptionTest {
 
     @Test
     public void testValidRuntimeException() {
diff --git a/core/src/test/java/org/apache/cxf/databinding/AbstractDataBindingTest.java b/core/src/test/java/org/apache/cxf/databinding/AbstractDataBindingTest.java
index 1a651b7..5194cdc 100644
--- a/core/src/test/java/org/apache/cxf/databinding/AbstractDataBindingTest.java
+++ b/core/src/test/java/org/apache/cxf/databinding/AbstractDataBindingTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 /**
  *
  */
-public class AbstractDataBindingTest extends Assert {
+public class AbstractDataBindingTest {
     @Test(expected = IllegalArgumentException.class)
     public void testNamespaceMapCheckDuplicates() {
         Map<String, String> testMap = new HashMap<>();
diff --git a/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java b/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
index fcba099..d0427d2 100755
--- a/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertTrue;
 /**
  *
  */
-public class XMLStreamDataReaderTest extends Assert {
+public class XMLStreamDataReaderTest {
     private static final byte[] DUMMY_DATA = "<ns:dummy xmlns:ns='http://www.apache.org/cxf'/>".getBytes();
 
     @Test
diff --git a/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java b/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java
index b4f6605..6250231 100755
--- a/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java
+++ b/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertTrue;
 /**
  *
  */
-public class EndpointImplTest extends Assert {
+public class EndpointImplTest {
 
     @Test
     public void testEqualsAndHashCode() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java b/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java
index 900a287..ea2eac1 100644
--- a/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
 
-public class FileUtilsTest extends Assert {
+public class FileUtilsTest {
 
 
     @Test
diff --git a/core/src/test/java/org/apache/cxf/helpers/IOUtilsTest.java b/core/src/test/java/org/apache/cxf/helpers/IOUtilsTest.java
index 4608367..53f8b88 100644
--- a/core/src/test/java/org/apache/cxf/helpers/IOUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/IOUtilsTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class IOUtilsTest extends Assert {
+public class IOUtilsTest {
 
 
     @Test
diff --git a/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java b/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java
index 1fd0b8d..70df082 100644
--- a/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class NameSpaceTest extends Assert {
+public class NameSpaceTest {
 
     private static final String MY_URL1 = "http://test.apache.org/testurl1";
     private static final String MY_URL2 = "http://test.apache.org/testurl2";
diff --git a/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java b/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
index dad0e56..d5a4487 100644
--- a/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class ServiceUtilsTest extends Assert {
+public class ServiceUtilsTest {
     private IMocksControl control;
     private Message msg;
 
diff --git a/core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java
index e6da27e..c03d684 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 
 @SuppressWarnings("deprecation")
-public class LoggingInInterceptorTest extends Assert {
+public class LoggingInInterceptorTest {
     static String encoding = "UTF-8";
     static String contentType = "text/xml";
     
diff --git a/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java
index 8ab5b8f..5a8d14e 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java
@@ -49,7 +49,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 @SuppressWarnings("deprecation")
-public class LoggingOutInterceptorTest extends Assert {
+public class LoggingOutInterceptorTest {
 
     protected IMocksControl control;
 
diff --git a/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
index 846418f..1eac10e 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
@@ -45,7 +45,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-public class OutgoingChainInterceptorTest extends Assert {
+public class OutgoingChainInterceptorTest {
 
     private IMocksControl control;
     private Bus bus;
diff --git a/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java
index 7b1765f..5de9f9c 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class ServiceInvokerInterceptorTest extends Assert {
+public class ServiceInvokerInterceptorTest {
 
     @Test
     public void testInterceptor() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/DefaultSecurityContextTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/DefaultSecurityContextTest.java
index cd184d2..ad55e1b 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/security/DefaultSecurityContextTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/DefaultSecurityContextTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-public class DefaultSecurityContextTest extends Assert {
+public class DefaultSecurityContextTest {
 
     @Test
     public void testUserNotInRole() {
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
index 1d3f042..1e3b3ba 100755
--- a/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertTrue;
 /**
  *
  */
-public class NamePasswordCallbackHandlerTest extends Assert {
+public class NamePasswordCallbackHandlerTest {
 
     @Test
     public void testHandleCallback() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImplTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImplTest.java
index 4416439..0f5a989 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImplTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImplTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-public class RolePrefixSecurityContextImplTest extends Assert {
+public class RolePrefixSecurityContextImplTest {
 
     @Test
     public void testUserNotInRole() {
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
index 90dd52f..ab822c0 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
@@ -41,7 +41,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 
-public class SecureAnnotationsInterceptorTest extends Assert {
+public class SecureAnnotationsInterceptorTest {
 
     private Method method;
     private Message message = new MessageImpl();
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
index 563d7a2..94e7195 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
@@ -37,7 +37,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-public class SimpleAuthorizingInterceptorTest extends Assert {
+public class SimpleAuthorizingInterceptorTest {
 
     protected Message message = new MessageImpl();
     private Method method;
diff --git a/core/src/test/java/org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java b/core/src/test/java/org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java
index ddbde8a..a85f293 100644
--- a/core/src/test/java/org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java
+++ b/core/src/test/java/org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
 /**
  *
  */
-public class CXFAPINamespaceHandlerTest extends Assert {
+public class CXFAPINamespaceHandlerTest {
     @Test
     public void testGetSchemaLocation() {
         CXFAPINamespaceHandler handler = new CXFAPINamespaceHandler();
diff --git a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
index da4c36f..afca2b6 100755
--- a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
+++ b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
@@ -45,7 +45,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public abstract class CachedStreamTestBase extends Assert {
+public abstract class CachedStreamTestBase {
     // use two typical ciphers for testing
     private static final String[] CIPHER_LIST = {"RC4", "AES/CTR/NoPadding"};
 
diff --git a/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java b/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
index 73c46b1..fcb2cce 100644
--- a/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
+++ b/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
@@ -47,7 +47,7 @@ import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class PhaseInterceptorChainTest extends Assert {
+public class PhaseInterceptorChainTest {
 
     private IMocksControl control;
 
diff --git a/core/src/test/java/org/apache/cxf/resource/ClassLoaderResolverTest.java b/core/src/test/java/org/apache/cxf/resource/ClassLoaderResolverTest.java
index 2cc7635..c81683c 100644
--- a/core/src/test/java/org/apache/cxf/resource/ClassLoaderResolverTest.java
+++ b/core/src/test/java/org/apache/cxf/resource/ClassLoaderResolverTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
 
-public class ClassLoaderResolverTest extends Assert {
+public class ClassLoaderResolverTest {
     private static final String RESOURCE_DATA = "this is the resource data";
 
     private String resourceName;
diff --git a/core/src/test/java/org/apache/cxf/resource/DefaultResourceManagerTest.java b/core/src/test/java/org/apache/cxf/resource/DefaultResourceManagerTest.java
index 1f8c36f..ac06d66 100644
--- a/core/src/test/java/org/apache/cxf/resource/DefaultResourceManagerTest.java
+++ b/core/src/test/java/org/apache/cxf/resource/DefaultResourceManagerTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class DefaultResourceManagerTest extends Assert {
+public class DefaultResourceManagerTest {
 
     private DefaultResourceManager manager;
     private DummyResolver[] resolvers;
diff --git a/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java b/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java
index 3fa4512..94c9e2f 100644
--- a/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java
+++ b/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class URIResolverTest extends Assert {
+public class URIResolverTest {
 
     private URIResolver uriResolver;
 
diff --git a/core/src/test/java/org/apache/cxf/service/model/BindingFaultInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/BindingFaultInfoTest.java
index db03fc1..2de2920 100644
--- a/core/src/test/java/org/apache/cxf/service/model/BindingFaultInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/BindingFaultInfoTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
-public class BindingFaultInfoTest extends Assert {
+public class BindingFaultInfoTest {
 
     private BindingFaultInfo bindingFaultInfo;
 
diff --git a/core/src/test/java/org/apache/cxf/service/model/BindingMessageInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/BindingMessageInfoTest.java
index 8d5f17d..7409c0c 100644
--- a/core/src/test/java/org/apache/cxf/service/model/BindingMessageInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/BindingMessageInfoTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
-public class BindingMessageInfoTest extends Assert {
+public class BindingMessageInfoTest {
 
     private BindingMessageInfo bindingMessageInfo;
 
diff --git a/core/src/test/java/org/apache/cxf/service/model/BindingOperationInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/BindingOperationInfoTest.java
index 50819a2..bd5fa47 100644
--- a/core/src/test/java/org/apache/cxf/service/model/BindingOperationInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/BindingOperationInfoTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class BindingOperationInfoTest extends Assert {
+public class BindingOperationInfoTest {
     private static final String TEST_NS = "urn:test:ns";
     private BindingOperationInfo bindingOperationInfo;
 
diff --git a/core/src/test/java/org/apache/cxf/service/model/FaultInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/FaultInfoTest.java
index 41af8aa..e08fc35 100644
--- a/core/src/test/java/org/apache/cxf/service/model/FaultInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/FaultInfoTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class FaultInfoTest extends Assert {
+public class FaultInfoTest {
 
     private FaultInfo faultInfo;
 
diff --git a/core/src/test/java/org/apache/cxf/service/model/InterfaceInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/InterfaceInfoTest.java
index aa34d84..fb6623a 100644
--- a/core/src/test/java/org/apache/cxf/service/model/InterfaceInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/InterfaceInfoTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-public class InterfaceInfoTest extends Assert {
+public class InterfaceInfoTest {
 
     private InterfaceInfo interfaceInfo;
 
diff --git a/core/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java
index 3cebccb..a662f09 100644
--- a/core/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class MessageInfoTest extends Assert {
+public class MessageInfoTest {
 
     private MessageInfo messageInfo;
 
diff --git a/core/src/test/java/org/apache/cxf/service/model/MessagePartInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/MessagePartInfoTest.java
index 7646056..db689b9 100644
--- a/core/src/test/java/org/apache/cxf/service/model/MessagePartInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/MessagePartInfoTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class MessagePartInfoTest extends Assert {
+public class MessagePartInfoTest {
 
 
     private MessagePartInfo messagePartInfo;
diff --git a/core/src/test/java/org/apache/cxf/service/model/OperationInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/OperationInfoTest.java
index d9c7bde..a81fa9e 100644
--- a/core/src/test/java/org/apache/cxf/service/model/OperationInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/OperationInfoTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class OperationInfoTest extends Assert {
+public class OperationInfoTest {
 
     private OperationInfo operationInfo;
 
diff --git a/core/src/test/java/org/apache/cxf/staxutils/DepthRestrictingStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/DepthRestrictingStreamReaderTest.java
index 974484b..0562557 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/DepthRestrictingStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/DepthRestrictingStreamReaderTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
 
-public class DepthRestrictingStreamReaderTest extends Assert {
+public class DepthRestrictingStreamReaderTest {
 
     @Test
     public void testReaderOK() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java
index e577306..12174e4 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class DepthXMLStreamReaderTest extends Assert {
+public class DepthXMLStreamReaderTest {
 
     @Test
     public void testReader() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java
index 517331d..04bd40c 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class FragmentStreamReaderTest extends Assert {
+public class FragmentStreamReaderTest {
 
     @Test
     public void testReader() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/staxutils/PartialXMLStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/PartialXMLStreamReaderTest.java
index 586d55e..3e7efe6 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/PartialXMLStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/PartialXMLStreamReaderTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class PartialXMLStreamReaderTest extends Assert {
+public class PartialXMLStreamReaderTest {
 
     @Test
     public void testReader() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java
index d729ab9..e6aec72 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class PropertiesExpandingStreamReaderTest extends Assert {
+public class PropertiesExpandingStreamReaderTest {
 
     @Test
     public void testSystemPropertyExpansion() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/staxutils/StaxStreamFilterTest.java b/core/src/test/java/org/apache/cxf/staxutils/StaxStreamFilterTest.java
index 1e0718e..51125b6 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/StaxStreamFilterTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/StaxStreamFilterTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class StaxStreamFilterTest extends Assert {
+public class StaxStreamFilterTest {
     public static final QName  SOAP_ENV =
         new QName("http://schemas.xmlsoap.org/soap/envelope/", "Envelope");
     public static final QName  SOAP_BODY =
diff --git a/core/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java
index 7710c79..3382b05 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 
-public class W3CDOMStreamReaderTest extends Assert {
+public class W3CDOMStreamReaderTest {
 
     private static final String RESULT =
         "<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\">"
diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContextTest.java b/core/src/test/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContextTest.java
index e31c35b..cd594f4 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContextTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContextTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class DelegatingNamespaceContextTest extends Assert {
+public class DelegatingNamespaceContextTest {
 
     @Test
     public void testSomeAddsAndGets() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
index 9656c4e..0fbaa65 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class InTransformReaderTest extends Assert {
+public class InTransformReaderTest {
 
     @Test
     public void testReadWithDefaultNamespace() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java b/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
index 9fc14ff..5c377f2 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
@@ -51,7 +51,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 
-public class OutTransformWriterTest extends Assert {
+public class OutTransformWriterTest {
 
     @Test
     public void testDefaultNamespace() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java b/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java
index cb234ce..5bf03b4 100644
--- a/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java
+++ b/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
 
-public class ChainInitiationObserverTest extends Assert {
+public class ChainInitiationObserverTest {
 
     private IMocksControl control;
     private TestChain chain;
diff --git a/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java b/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java
index d7c5cd8..d99d64b 100644
--- a/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java
+++ b/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class HttpUriMapperTest extends Assert {
+public class HttpUriMapperTest {
 
     @Test
     public void testGetContext() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java b/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
index 1d3b682..39af3d9 100644
--- a/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
+++ b/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
@@ -52,7 +52,7 @@ import static org.junit.Assert.assertSame;
  * be set correctly. For Accept-Encoding values that do not enable gzip the
  * interceptor should not be added.
  */
-public class GZIPAcceptEncodingTest extends Assert {
+public class GZIPAcceptEncodingTest {
 
     private GZIPOutInterceptor interceptor;
     private Message inMessage;
diff --git a/core/src/test/java/org/apache/cxf/version/VersionTest.java b/core/src/test/java/org/apache/cxf/version/VersionTest.java
index c65ff35..27b780f 100644
--- a/core/src/test/java/org/apache/cxf/version/VersionTest.java
+++ b/core/src/test/java/org/apache/cxf/version/VersionTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class VersionTest extends Assert {
+public class VersionTest {
 
     @Test
     public void testLoadProperties() {
diff --git a/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java b/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
index 8217b91..defd9df 100644
--- a/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
+++ b/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class AutomaticWorkQueueTest extends Assert {
+public class AutomaticWorkQueueTest {
 
     public static final int UNBOUNDED_MAX_QUEUE_SIZE = -1;
     public static final int UNBOUNDED_HIGH_WATER_MARK = -1;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java
index aefbe13..1c80067 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 
-public class FireWallClassLoaderTest extends Assert {
+public class FireWallClassLoaderTest {
 
     public FireWallClassLoaderTest() {
     }
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
index b5c3e82..658017f 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.fail;
 
 
 
-public class PlugInClassLoaderTest extends Assert {
+public class PlugInClassLoaderTest {
     private static final Logger LOG = LogUtils.getLogger(PlugInClassLoaderTest.class);
     private static boolean debug;
     PlugInClassLoader plugInClassLoader;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java
index 40b11e8..d6281d9 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 
-public class LoggerHelperTest extends Assert {
+public class LoggerHelperTest {
     public static final String TEST_LOGGER_NAME = "test.logger";
 
 
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java
index c19c810..c676923 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 
-public class HandlerTest extends Assert {
+public class HandlerTest {
     Handler h;
 
 
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
index 436e42f..b29f0cf 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class ManagedConnectionFactoryImplTest extends Assert {
+public class ManagedConnectionFactoryImplTest {
     DummyManagedConnectionFactoryImpl mcf = new DummyManagedConnectionFactoryImpl();
 
 
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
index 61a667b..757ba52 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class ManagedConnectionImplTest extends Assert {
+public class ManagedConnectionImplTest {
     private DummyManagedConnectionImpl mc;
 
     @Before
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java
index 3d89936..2339e2d 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 
-public class ResourceAdapterInternalExceptionTest extends Assert {
+public class ResourceAdapterInternalExceptionTest {
     private static final Logger EXCEPTION_LOGGER =
         LogUtils.getLogger(ResourceAdapterInternalException.class);
     private Level logLevel;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceBeanTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceBeanTest.java
index 0c748db..11bc79e 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceBeanTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceBeanTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
 
 
 
-public class ResourceBeanTest extends Assert {
+public class ResourceBeanTest {
 
 
     @Test
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java
index 2fb99c8..db7a09e 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 
-public class UriHandlerInitTest extends Assert {
+public class UriHandlerInitTest {
     private static final String PROP_NAME = "java.protocol.handler.pkgs";
 
     private static final String PKG_ADD = "do.do";
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java
index 9977dc4..8faaf90 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertTrue;
 
 
-public class CXFConnectionRequestInfoTest extends Assert {
+public class CXFConnectionRequestInfoTest {
 
 
     @Test
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
index 8836bf5..afd99ff 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class ConnectionFactoryImplTest extends Assert {
+public class ConnectionFactoryImplTest {
 
     ManagedConnectionFactory mockConnectionFactory;
     ConnectionManager mockConnectionManager;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
index 56f456e..2c48fcf 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
@@ -50,7 +50,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 
-public class ManagedConnectionFactoryImplTest extends Assert {
+public class ManagedConnectionFactoryImplTest {
 
     protected ManagedConnectionFactoryImpl mci;
 
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
index 4361a08..ff39a23 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
@@ -36,7 +36,7 @@ import org.junit.Assert;
 import org.junit.Before;
 
 
-public abstract class ManagedConnectionTestBase extends Assert {
+public abstract class ManagedConnectionTestBase {
     protected Subject subj;
 
     protected CXFConnectionRequestInfo cri;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
index 55f7deb..f004268 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
@@ -45,7 +45,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 
-public class ResourceAdapterImplTest extends Assert {
+public class ResourceAdapterImplTest {
 
     public ResourceAdapterImplTest() {
 
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
index fffffc4..ed327b9 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
@@ -33,7 +33,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.fail;
 
-public class HandlerTestBase extends Assert {
+public class HandlerTestBase {
     protected Bus mockBus = EasyMock.createMock(Bus.class);
     protected CXFManagedConnection mockManagedConnection =
                 EasyMock.createMock(CXFManagedConnection.class);
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java
index 0b10e4b..b2ff052 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertTrue;
 
 
 
-public class JarLoaderTest extends Assert {
+public class JarLoaderTest {
     private static final Logger LOG = LogUtils.getLogger(JarLoaderTest.class);
     private URL exampleRarURL;
 
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java
index 551b0e8..0e59707 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertEquals;
 /**
  *
  */
-public class EJBEndpointTest extends Assert {
+public class EJBEndpointTest {
 
     private EJBEndpoint endpoint;
 
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java
index 50f3e1e..873d5bc 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
 
-public class EJBServantConfigTest extends Assert {
+public class EJBServantConfigTest {
 
     @Test
     public void testNoWsdl() throws Exception {
diff --git a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
index 4075a8a..3748b0b 100644
--- a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
+++ b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
@@ -49,7 +49,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-public class ColocMessageObserverTest extends Assert {
+public class ColocMessageObserverTest {
     private IMocksControl control = EasyMock.createNiceControl();
     private ColocMessageObserver observer;
     private Message msg;
diff --git a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
index decfa9c..64f17f6 100644
--- a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
+++ b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
@@ -63,7 +63,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.fail;
 
-public class ColocOutInterceptorTest extends Assert {
+public class ColocOutInterceptorTest {
     private static final String COLOCATED = Message.class.getName() + ".COLOCATED";
     private IMocksControl control = EasyMock.createNiceControl();
     private ColocOutInterceptor colocOut;
diff --git a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java
index 14c98bf..bce9d80 100644
--- a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java
+++ b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java
@@ -57,7 +57,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
 
-public class ColocUtilTest extends Assert {
+public class ColocUtilTest {
     private IMocksControl control = EasyMock.createNiceControl();
     private Bus bus;
 
diff --git a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandlerTest.java b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandlerTest.java
index bf8804f..2d3ccdb 100644
--- a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandlerTest.java
+++ b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
 /**
  *
  */
-public class ColocBPNamespaceHandlerTest extends Assert {
+public class ColocBPNamespaceHandlerTest {
     @Test
     public void testGetSchemaLocation() {
         ColocBPNamespaceHandler handler = new ColocBPNamespaceHandler();
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
index aec3790..1d86305 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
@@ -52,7 +52,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 
-public class CorbaBindingFactoryTest extends Assert {
+public class CorbaBindingFactoryTest {
 
     protected Bus bus;
     protected EndpointInfo endpointInfo;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
index c7422b2..e7768f8 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 
-public class CorbaBindingTest extends Assert {
+public class CorbaBindingTest {
 
     private ORB orb;
 
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
index 872bf6b..fc187cc 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
@@ -66,7 +66,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 
-public class CorbaConduitTest extends Assert {
+public class CorbaConduitTest {
 
     private static IMocksControl control;
     private static ORB orb;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java
index f8d02a0..4be9547 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-public class CorbaDestinationTest extends Assert {
+public class CorbaDestinationTest {
 
     protected static TestUtils testUtils;
     EndpointInfo endpointInfo;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java
index 08f65fd..9e8f2ac 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java
@@ -38,7 +38,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class CorbaMessageTest extends Assert {
+public class CorbaMessageTest {
 
     private static ORB orb;
     private Message message;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
index 3b0d518..0da3718 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
@@ -56,7 +56,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class CorbaServerConduitTest extends Assert {
+public class CorbaServerConduitTest {
     protected EndpointInfo endpointInfo;
     protected EndpointReferenceType target;
     protected MessageObserver observer;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java
index 21846f1..c190844 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class CorbaTypeMapTest extends Assert {
+public class CorbaTypeMapTest {
 
     @Test
     public void testCorbaTypeMap() throws Exception {
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java
index 00fc8c3..c22f122 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 
-public class CorbaDSIServantTest extends Assert {
+public class CorbaDSIServantTest {
     protected static ORB orb;
     protected static Bus bus;
 
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
index d5408b9..d0b9781 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
@@ -60,7 +60,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class CorbaObjectReaderTest extends Assert {
+public class CorbaObjectReaderTest {
 
     private static ORB orb;
 
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
index df4d534..25ec429 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
@@ -53,7 +53,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 
-public class CorbaObjectWriterTest extends Assert {
+public class CorbaObjectWriterTest {
 
     private static ORB orb;
 
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
index ab0830e..0cf5cfc 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class CorbaStreamReaderTest extends Assert {
+public class CorbaStreamReaderTest {
 
     private CorbaStreamReader reader;
     private CorbaTypeEventProducer mock;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java
index eb303fa..7574086 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class CorbaStreamWriterTest extends Assert {
+public class CorbaStreamWriterTest {
 
     @Test
     public void writeCharactersTest() throws XMLStreamException {
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
index a5c8aef..b873545 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 
-public class CorbaStreamableTest extends Assert {
+public class CorbaStreamableTest {
 
     private static ORB orb;
 
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
index 3aebe6f..06a89d4 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 
-public class CorbaAnyHandlerTest extends Assert {
+public class CorbaAnyHandlerTest {
 
     private ORB orb;
 
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
index 6278b0f..020a561 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class CorbaArrayHandlerTest extends Assert {
+public class CorbaArrayHandlerTest {
 
     private ORB orb;
     private CorbaArrayHandler obj;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
index acd15f2..62367e1 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class CorbaEnumHandlerTest extends Assert {
+public class CorbaEnumHandlerTest {
 
     private ORB orb;
 
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java
index c06f492..ed70760 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class CorbaFixedHandlerTest extends Assert {
+public class CorbaFixedHandlerTest {
 
     private ORB orb;
 
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java
index 8d71e47..920a490 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 
-public class CorbaHandlerUtilsTest extends Assert {
+public class CorbaHandlerUtilsTest {
 
     protected EndpointInfo endpointInfo;
     BindingFactory factory;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
index 9e5b9bb..2773346 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class CorbaObjectHandlerTest extends Assert {
+public class CorbaObjectHandlerTest {
 
     private ORB orb;
 
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
index 5ca41a7..e360070 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class CorbaPrimitiveHandlerTest extends Assert {
+public class CorbaPrimitiveHandlerTest {
 
     private ORB orb;
 
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
index 25aecec..e697e9d 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class CorbaSequenceHandlerTest extends Assert {
+public class CorbaSequenceHandlerTest {
 
     private ORB orb;
     private CorbaSequenceHandler obj;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java
index 9f06e91..1ab67c2 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertTrue;
 
 // Since the exception handler is essentially the same as the struct handler (just included in case
 // structs and exceptions diverge at a later date), this test should cover both.
-public class CorbaStructHandlerTest extends Assert {
+public class CorbaStructHandlerTest {
 
     private ORB orb;
 
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java
index 42c9cf9..f406425 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertEquals;
 /**
  * Holder for utility methods relating to contexts.
  */
-public final class ContextUtilsTest extends Assert {
+public final class ContextUtilsTest {
 
 
     @Test
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java
index c34772c..5b1e68e 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class CorbaUtilsTest extends Assert {
+public class CorbaUtilsTest {
 
     private static ORB orb;
 
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
index 4d2dbd4..46c5efc 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
@@ -52,7 +52,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class ServiceModelUtilTest extends Assert {
+public class ServiceModelUtilTest {
     private static final String WSDL_PATH = "test-soap-header.wsdl";
     private Definition def;
     private Service service;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
index d95dd87..820f694 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class SoapActionInterceptorTest extends Assert {
+public class SoapActionInterceptorTest {
 
 
     @Test
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
index a9a00bb..e32615a 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
@@ -59,7 +59,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class SoapBindingFactoryTest extends Assert {
+public class SoapBindingFactoryTest {
     IMocksControl control;
 
     @Before
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
index 568fbdc..f9e0dfa 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class SoapBindingTest extends Assert {
+public class SoapBindingTest {
 
     @Test
     public void testCreateMessage() throws Exception {
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
index 9688162..c19a5df 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
@@ -53,7 +53,7 @@ import org.junit.Before;
 
 import static org.junit.Assert.assertNotNull;
 
-public class TestBase extends Assert {
+public class TestBase {
 
     protected PhaseInterceptorChain chain;
     protected SoapMessage soapMessage;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java
index 8c82fef..6befb26 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
 /**
  *
  */
-public class SoapBindingBPHandlerTest extends Assert {
+public class SoapBindingBPHandlerTest {
     @Test
     public void testGetSchemaLocation() {
         SoapBindingBPHandler handler = new SoapBindingBPHandler();
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptorTest.java
index 67c455a..9e64cc3 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptorTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertNull;
 /**
  *
  */
-public class ReadHeadersInterceptorTest extends Assert {
+public class ReadHeadersInterceptorTest {
     private static final byte[] TEST_SOAP =
         ("<soap:Envelope xmlns:soap='http://schemas.xmlsoap.org/soap/envelope/'"
             + " xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'"
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
index de75608..2f00a09 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertNull;
 /**
  *
  */
-public class SoapActionInInterceptorTest extends Assert {
+public class SoapActionInInterceptorTest {
     private IMocksControl control;
 
     @Before
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
index a2f5de7..8c7085b 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
@@ -58,7 +58,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 
-public class SoapFaultSerializerTest extends Assert {
+public class SoapFaultSerializerTest {
     private void assertValid(String xpathExpression, Document doc) {
         Map<String, String> namespaces = new HashMap<>();
         namespaces.put("s", "http://schemas.xmlsoap.org/soap/envelope/");
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
index 72d92a9..4ca2507 100755
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
@@ -51,7 +51,7 @@ import static org.junit.Assert.assertTrue;
 /**
  *
  */
-public class SoapPreProtocolOutInterceptorTest extends Assert {
+public class SoapPreProtocolOutInterceptorTest {
     private IMocksControl control;
     private SoapPreProtocolOutInterceptor interceptor;
 
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
index 9ba1367..263ef5d 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertSame;
 /**
  *
  */
-public class SoapFaultFactoryTest extends Assert {
+public class SoapFaultFactoryTest {
 
     private IMocksControl control;
     private JMSFault jmsFault;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
index 1568cd7..d2ac3e8 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
@@ -47,7 +47,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class ParseBodyTest extends Assert {
+public class ParseBodyTest {
     static final String[] DATA = {
         "<SOAP-ENV:Body xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\">\n"
             + "    <foo>\n        <bar/>\n    </foo>\n</SOAP-ENV:Body>",
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
index b1d8373..96188f1 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
 
-public class XMLBindingFactoryTest extends Assert {
+public class XMLBindingFactoryTest {
 
     @Test
     public void testContainsInAttachmentInterceptor() {
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
index fea782c..765ee64 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
@@ -61,7 +61,7 @@ import org.junit.Before;
 
 import static org.junit.Assert.assertNotNull;
 
-public class TestBase extends Assert {
+public class TestBase {
 
     protected PhaseInterceptorChain chain;
 
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/DOMMappingTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/DOMMappingTest.java
index 58ca056..4ea7b77 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/DOMMappingTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/DOMMappingTest.java
@@ -39,7 +39,6 @@ import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 /**
  * Test mapping DOM.
@@ -96,4 +95,4 @@ public class DOMMappingTest extends AbstractAegisTest {
         assertEquals("Is a root vegetable.", text);
         */
     }
-}
\ No newline at end of file
+}
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/SchemaAddinsTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/SchemaAddinsTest.java
index 57b42c5..2677815 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/SchemaAddinsTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/SchemaAddinsTest.java
@@ -26,14 +26,13 @@ import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaCollection;
 import org.apache.ws.commons.schema.XmlSchemaSerializer;
 
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
 
-public class SchemaAddinsTest extends Assert {
+public class SchemaAddinsTest {
     private TestUtilities testUtilities;
 
     @Before
@@ -66,4 +65,4 @@ public class SchemaAddinsTest extends Assert {
 
 
     }
-}
\ No newline at end of file
+}
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfoTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfoTest.java
index 9ec715f..57a9e7f 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfoTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfoTest.java
@@ -29,6 +29,7 @@ import org.apache.cxf.aegis.type.basic.BeanTypeInfo;
 import org.apache.cxf.aegis.xml.stax.ElementReader;
 import org.apache.ws.commons.schema.constants.Constants;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -98,10 +99,10 @@ public class ArrayTypeInfoTest extends AbstractAegisTest {
         ArrayTypeInfo actual = new ArrayTypeInfo(getNamespaceContext(), actualString);
 
         // only compare local part because prefix is only resolved when using the MessageReader constructor
-        assertEquals(expected.getRanks(), actual.getRanks());
-        assertEquals(expected.getDimensions(), actual.getDimensions());
+        Assert.assertEquals(expected.getRanks(), actual.getRanks());
+        Assert.assertEquals(expected.getDimensions(), actual.getDimensions());
         if (expected.getType() != null) {
-            assertEquals(expected.getTypeName().getLocalPart(), actual.getTypeName().getLocalPart());
+            Assert.assertEquals(expected.getTypeName().getLocalPart(), actual.getTypeName().getLocalPart());
             if (expected.getRanks() == 0) {
                 assertSame(addressType, actual.getType());
             } else {
@@ -109,7 +110,7 @@ public class ArrayTypeInfoTest extends AbstractAegisTest {
                         + actual.getType().getClass().getName(), actual.getType() instanceof SoapArrayType);
             }
         }
-        assertEquals(expected.toString(), actual.toString());
+        Assert.assertEquals(expected.toString(), actual.toString());
 
         String xml = "<b:array xmlns:b=\"urn:Bean\"\n"
                 + "    xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"\n"
@@ -119,10 +120,10 @@ public class ArrayTypeInfoTest extends AbstractAegisTest {
 
         ElementReader reader = new ElementReader(new ByteArrayInputStream(xml.getBytes()));
         actual = new ArrayTypeInfo(reader, mapping);
-        assertEquals(expected.getRanks(), actual.getRanks());
-        assertEquals(expected.getDimensions(), actual.getDimensions());
+        Assert.assertEquals(expected.getRanks(), actual.getRanks());
+        Assert.assertEquals(expected.getDimensions(), actual.getDimensions());
         if (expected.getType() != null) {
-            assertEquals(expected.getTypeName(), actual.getTypeName());
+            Assert.assertEquals(expected.getTypeName(), actual.getTypeName());
             if (expected.getRanks() == 0) {
                 assertSame(addressType, actual.getType());
             } else {
@@ -130,7 +131,7 @@ public class ArrayTypeInfoTest extends AbstractAegisTest {
                         + actual.getType().getClass().getName(), actual.getType() instanceof SoapArrayType);
             }
         }
-        assertEquals(expected.toString(), actual.toString());
+        Assert.assertEquals(expected.toString(), actual.toString());
     }
 
     public void assertInvalid(String actualString) {
@@ -141,4 +142,4 @@ public class ArrayTypeInfoTest extends AbstractAegisTest {
             // expected
         }
     }
-}
\ No newline at end of file
+}
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
index 2c3edd7..e96b1c5 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
@@ -66,7 +66,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class BareInInterceptorTest extends Assert {
+public class BareInInterceptorTest {
 
     PhaseInterceptorChain chain;
     MessageImpl message;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
index 2898c6c..4bdc083 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
@@ -65,7 +65,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class DocLiteralInInterceptorTest extends Assert {
+public class DocLiteralInInterceptorTest {
     PhaseInterceptorChain chain;
     MessageImpl message;
     Bus bus;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
index 0d83f7b..2171c7b 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
@@ -82,7 +82,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class JAXBDataBindingTest extends Assert {
+public class JAXBDataBindingTest {
 
     private static final Logger LOG = LogUtils.getLogger(JAXBDataBindingTest.class);
     private static final String WSDL_PATH = "/wsdl/jaxb/hello_world.wsdl";
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
index a3a15f7..204afe0 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
@@ -81,7 +81,7 @@ import static org.junit.Assert.fail;
 /**
  * JAXBEncoderDecoderTest
  */
-public class JAXBEncoderDecoderTest extends Assert {
+public class JAXBEncoderDecoderTest {
     public static final QName  SOAP_ENV =
             new QName("http://schemas.xmlsoap.org/soap/envelope/", "Envelope");
     public static final QName  SOAP_BODY =
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
index 53d7a8e..85a68b9 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
 
-public class JAXBUtilsTest extends Assert {
+public class JAXBUtilsTest {
 
     @Test
     public void testBuiltInTypeToJavaType() {
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
index 021a3db..1180307 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class JAXBWrapperHelperTest extends Assert {
+public class JAXBWrapperHelperTest {
 
 
     @Test
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
index bda68df..318c8fc 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
@@ -61,7 +61,7 @@ import org.junit.Before;
 import static org.easymock.EasyMock.createNiceControl;
 import static org.easymock.EasyMock.expect;
 
-public class TestBase extends Assert {
+public class TestBase {
 
     PhaseInterceptorChain chain;
     MessageImpl message;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java
index 61ba87f..b710a40 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.fail;
 
-public class UtilsTest extends Assert {
+public class UtilsTest {
 
     @Test
     public void testGetMethod() {
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
index a2bd3f8..fa2de23 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
@@ -49,7 +49,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class XMLStreamDataReaderTest extends Assert {
+public class XMLStreamDataReaderTest {
 
     private XMLInputFactory factory;
     private XMLStreamReader reader;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java
index b0cece2..b79e09b 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java
@@ -55,7 +55,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class XMLStreamDataWriterTest extends Assert {
+public class XMLStreamDataWriterTest {
     private ByteArrayOutputStream baos;
     private XMLStreamWriter streamWriter;
     private XMLInputFactory inFactory;
diff --git a/rt/features/clustering/src/test/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandlerTest.java b/rt/features/clustering/src/test/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandlerTest.java
index 31b1c8d..54025b9 100644
--- a/rt/features/clustering/src/test/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandlerTest.java
+++ b/rt/features/clustering/src/test/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
 /**
  *
  */
-public class ClusteringBPNamespaceHandlerTest extends Assert {
+public class ClusteringBPNamespaceHandlerTest {
     @Test
     public void testGetSchemaLocation() {
         ClusteringBPNamespaceHandler handler = new ClusteringBPNamespaceHandler();
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java
index 7e8b6d6..048e261 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertSame;
 
-public class JAXRSServerFactoryBeanTest extends Assert {
+public class JAXRSServerFactoryBeanTest {
 
     @Test
     public void testRegisterProviders() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBeanTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBeanTest.java
index a732eb1..a8e8b7a 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBeanTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBeanTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class JAXRSServiceFactoryBeanTest extends Assert {
+public class JAXRSServiceFactoryBeanTest {
 
     @Before
     public void setUp() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
index 62a7752..eb286b8 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
@@ -65,7 +65,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
 
-public class SelectMethodCandidatesTest extends Assert {
+public class SelectMethodCandidatesTest {
 
     @Test
     public void testFindFromAbstractGenericClass() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandlerTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandlerTest.java
index 483e7d4..ce0a9b1 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandlerTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
 /**
  *
  */
-public class JAXRSBPNamespaceHandlerTest extends Assert {
+public class JAXRSBPNamespaceHandlerTest {
     @Test
     public void testGetSchemaLocation() {
         JAXRSBPNamespaceHandler handler = new JAXRSBPNamespaceHandler();
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java
index 4b30816..4b03bf3 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java
@@ -57,7 +57,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 
-public class MessageContextImplTest extends Assert {
+public class MessageContextImplTest {
 
     @Test
     public void testGetProperty() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/form/FormTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/form/FormTest.java
index 620f248..3049f77 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/form/FormTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/form/FormTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class FormTest extends Assert {
+public class FormTest {
 
     @Test
     public void testToString() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentTest.java
index 14b3d44..df47318 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class AttachmentTest extends Assert {
+public class AttachmentTest {
 
 
     @Test
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/ContentDispositionTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/ContentDispositionTest.java
index 60d3e95..3b8d543 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/ContentDispositionTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/ContentDispositionTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class ContentDispositionTest extends Assert {
+public class ContentDispositionTest {
 
     @Test
     public void testContentDisposition() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBodyTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBodyTest.java
index d70b67f..b16a3f9 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBodyTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBodyTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-public class MultipartBodyTest extends Assert {
+public class MultipartBodyTest {
 
     @Test
     public void testGetAttachments() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java
index 7c24c5d..30ca101 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class XMLSourceTest extends Assert {
+public class XMLSourceTest {
 
 
     @Test
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/AsyncResponseImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/AsyncResponseImplTest.java
index adb269f..4b4ae79 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/AsyncResponseImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/AsyncResponseImplTest.java
@@ -40,7 +40,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class AsyncResponseImplTest extends Assert {
+public class AsyncResponseImplTest {
 
     private IMocksControl control;
 
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProviderTest.java
index bfe3ec3..3e555ea 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProviderTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class CacheControlHeaderProviderTest extends Assert {
+public class CacheControlHeaderProviderTest {
 
     @Test(expected = IllegalArgumentException.class)
     public void testValueOfNull() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java
index 2985dd5..33b24ef 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java
@@ -57,7 +57,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class ConfigurationImplTest extends Assert {
+public class ConfigurationImplTest {
 
     @Test
     public void testIsRegistered() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CookieHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CookieHeaderProviderTest.java
index ee06bb9..4538940 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CookieHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CookieHeaderProviderTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class CookieHeaderProviderTest extends Assert {
+public class CookieHeaderProviderTest {
 
 
     @Test
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/DateHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/DateHeaderProviderTest.java
index 7383d19..013b95d 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/DateHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/DateHeaderProviderTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class DateHeaderProviderTest extends Assert {
+public class DateHeaderProviderTest {
 
     @Test
     public void testToFromSimpleString() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProviderTest.java
index b636f2a..66e1688 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProviderTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class EntityTagHeaderProviderTest extends Assert {
+public class EntityTagHeaderProviderTest {
 
 
     @Test
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
index 456af44..b162c80 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
@@ -47,7 +47,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class HttpHeadersImplTest extends Assert {
+public class HttpHeadersImplTest {
 
     @Test
     public void testNoRequestHeader() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java
index dab2e28..1ce55f1 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class LinkBuilderImplTest extends Assert {
+public class LinkBuilderImplTest {
 
 
     @Test
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkHeaderProviderTest.java
index d843753..c463c8d 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkHeaderProviderTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class LinkHeaderProviderTest extends Assert {
+public class LinkHeaderProviderTest {
 
     @Test
     public void testFromSimpleString() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProviderTest.java
index d7585c5..64e6ad4 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProviderTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-public class MediaTypeHeaderProviderTest extends Assert {
+public class MediaTypeHeaderProviderTest {
 
     @Test(expected = IllegalArgumentException.class)
     public void testNullValue() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java
index 3b025e2..ca42227 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertTrue;
 
 
 
-public class MetadataMapTest extends Assert {
+public class MetadataMapTest {
 
     @Test
     public void testPutSingle() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProviderTest.java
index 29edcac..f9f2950 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProviderTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class NewCookieHeaderProviderTest extends Assert {
+public class NewCookieHeaderProviderTest {
 
     @Test(expected = IllegalArgumentException.class)
     public void testNullValue() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/PathSegmentImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/PathSegmentImplTest.java
index 44bf6b3..e76e36d 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/PathSegmentImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/PathSegmentImplTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class PathSegmentImplTest extends Assert {
+public class PathSegmentImplTest {
 
     @Test
     public void testPlainPathSegment() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java
index 9e35bae..681b3c9 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java
@@ -47,7 +47,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 
-public class RequestImplTest extends Assert {
+public class RequestImplTest {
 
     private Message m;
     private MultivaluedMap<String, String> metadata;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java
index 110f2b5..b70dddf 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.assertEquals;
 
 
 
-public class RequestPreprocessorTest extends Assert {
+public class RequestPreprocessorTest {
 
     private IMocksControl control;
 
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImplTest.java
index bc42000..a75bc30 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImplTest.java
@@ -51,7 +51,7 @@ import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 
-public class ResponseBuilderImplTest extends Assert {
+public class ResponseBuilderImplTest {
 
     @Test
     public void testStatusSet() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
index 1eb9fcc..0b5f308 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
@@ -73,7 +73,7 @@ import static org.junit.Assert.assertTrue;
 
 
 @SuppressWarnings("resource") // Responses built in this test don't need to be closed
-public class ResponseImplTest extends Assert {
+public class ResponseImplTest {
 
     @Test
     public void testReadEntityWithNullOutMessage() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImplTest.java
index 76e3e3e..0c7d1e0 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImplTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertSame;
 
-public class RuntimeDelegateImplTest extends Assert {
+public class RuntimeDelegateImplTest {
 
     @Test
     public void testRuntimeDelegate() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/SecurityContextImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/SecurityContextImplTest.java
index 9c728ec..ff1631d 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/SecurityContextImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/SecurityContextImplTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class SecurityContextImplTest extends Assert {
+public class SecurityContextImplTest {
 
     @Test
     public void testAuthenticationScheme() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java
index 3ebe6ea..5551a3b 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java
@@ -43,7 +43,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-public class UriBuilderImplTest extends Assert {
+public class UriBuilderImplTest {
 
     @Test
     public void testFromUriRelativePath() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java
index 0ce2d37..816c8e5 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java
@@ -53,7 +53,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class UriInfoImplTest extends Assert {
+public class UriInfoImplTest {
 
     private IMocksControl control;
 
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImplTest.java
index 49d402c..3a1b45b 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImplTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class VariantListBuilderImplTest extends Assert {
+public class VariantListBuilderImplTest {
 
     @Test
     public void testBuildAll() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/lifecycle/PerRequestResourceProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/lifecycle/PerRequestResourceProviderTest.java
index ab72088..9675246 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/lifecycle/PerRequestResourceProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/lifecycle/PerRequestResourceProviderTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class PerRequestResourceProviderTest extends Assert {
+public class PerRequestResourceProviderTest {
 
     @Test
     public void testGetInstance() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java
index 75184da..00384a7 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java
@@ -57,7 +57,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-public class ClassResourceInfoTest extends Assert {
+public class ClassResourceInfoTest {
 
     @Path("/bar")
     @Produces("test/bar")
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/OperationResourceInfoTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/OperationResourceInfoTest.java
index 70b9f92..f7aa337 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/OperationResourceInfoTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/OperationResourceInfoTest.java
@@ -38,7 +38,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class OperationResourceInfoTest extends Assert {
+public class OperationResourceInfoTest {
 
     @Produces("text/xml")
     @Consumes("application/xml")
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java
index 5ba6642..4fbb06a 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class URITemplateTest extends Assert {
+public class URITemplateTest {
 
     @Before
     public void setUp() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/doc/JavaDocProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/doc/JavaDocProviderTest.java
index a4a4ef6..ed0aaf0 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/doc/JavaDocProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/doc/JavaDocProviderTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class JavaDocProviderTest extends Assert {
+public class JavaDocProviderTest {
 
     @Test
     public void testJava6Docs() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/BinaryDataProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/BinaryDataProviderTest.java
index 4b228de..535428c 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/BinaryDataProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/BinaryDataProviderTest.java
@@ -44,7 +44,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class BinaryDataProviderTest extends Assert {
+public class BinaryDataProviderTest {
 
     @Test
     public void testIsWriteable() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
index da74286..0cb88ea 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class DataSourceProviderTest extends Assert {
+public class DataSourceProviderTest {
 
     @Test
     public void testReadDataHandler() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
index 7b10077..e73af66 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class FormEncodingProviderTest extends Assert {
+public class FormEncodingProviderTest {
 
 
     @Test
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
index af8c77f..cf49905 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
@@ -107,7 +107,7 @@ import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class JAXBElementProviderTest extends Assert {
+public class JAXBElementProviderTest {
 
     @Test
     public void testReadFromISO() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
index c8c03d7..ba41b74 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class PrimitiveTextProviderTest extends Assert {
+public class PrimitiveTextProviderTest {
 
     @Test
     public void testNumberIsWriteable() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
index a411519..58b0c94 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
@@ -90,7 +90,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-public class ProviderFactoryTest extends Assert {
+public class ProviderFactoryTest {
 
 
     @Before
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProviderTest.java
index eb62eac..e0d6377 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProviderTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class RequestDispatcherProviderTest extends Assert {
+public class RequestDispatcherProviderTest {
 
     @Test
     public void testIsWriteableEnum() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java
index 1deda4d..c8f2cad 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java
@@ -56,7 +56,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-public class SourceProviderTest extends Assert {
+public class SourceProviderTest {
 
 
     @Test
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java
index 6e871f7..a3fa356 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class XPathProviderTest extends Assert {
+public class XPathProviderTest {
 
     @Test
     public void testIsReadableClassName() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java
index 4ff4380..a3a26ef 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java
@@ -53,7 +53,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class XSLTJaxbProviderTest extends Assert {
+public class XSLTJaxbProviderTest {
 
     private static final String TEMPLATE_LOCATION = "classpath:/org/apache/cxf/jaxrs/provider/template.xsl";
     private static final String BOOK_XML = "<Book><id>123</id><name>TheBook</name></Book>";
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilterTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilterTest.java
index 63846e3..c50e0a0 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilterTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilterTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-public class JAASAuthenticationFilterTest extends Assert {
+public class JAASAuthenticationFilterTest {
 
     @Test
     public void testRFC2617() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java
index ef73027..f059859 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertSame;
 
 
 
-public class JAXRSServerFactoryBeanTest extends Assert {
+public class JAXRSServerFactoryBeanTest {
 
     @After
     public void tearDown() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/SpringResourceFactoryTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/SpringResourceFactoryTest.java
index f7c4337..be58b2f 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/SpringResourceFactoryTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/SpringResourceFactoryTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertSame;
 
 
 
-public class SpringResourceFactoryTest extends Assert {
+public class SpringResourceFactoryTest {
 
     @After
     public void tearDown() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java
index 3e7c7d8..57c3046 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertSame;
 
-public class AnnotationTestUtilsTest extends Assert {
+public class AnnotationTestUtilsTest {
 
     @Test
     public void testGetAnnotatedMethodFromInterface() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ExceptionUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ExceptionUtilsTest.java
index 4ed7419..b6f5f30 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ExceptionUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ExceptionUtilsTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertEquals;
 
 
 
-public class ExceptionUtilsTest extends Assert {
+public class ExceptionUtilsTest {
 
     @Test
     public void testConvertFaultToResponseWAEWithResponse() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java
index 4e06bbd..3c87da2 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class FormUtilsTest extends Assert {
+public class FormUtilsTest {
 
     private static final String HTTP_PARAM1 = "httpParam1";
     private static final String HTTP_PARAM2 = "httpParam2";
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
index e3af69f..ce6ec20 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class HttpUtilsTest extends Assert {
+public class HttpUtilsTest {
 
     @Test
     public void testEncodePartiallyEncoded() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
index be546b4..a870a99 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
@@ -62,7 +62,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class InjectionUtilsTest extends Assert {
+public class InjectionUtilsTest {
 
 
     @Test
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
index 830d23f..bc0e674 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
@@ -120,7 +120,7 @@ import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class JAXRSUtilsTest extends Assert {
+public class JAXRSUtilsTest {
 
     @Before
     public void setUp() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java
index 50f6aa9..6fabc05 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java
@@ -57,7 +57,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class ResourceUtilsTest extends Assert {
+public class ResourceUtilsTest {
 
     @Test
     public void testFindResourceConstructor() {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
index 81083a2..6318258 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
@@ -54,7 +54,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class ConfiguredEndpointTest extends Assert {
+public class ConfiguredEndpointTest {
     private static final QName SERVICE_NAME =
         new QName("http://apache.org/hello_world_soap_http", "SOAPService");
     private static final QName PORT_NAME =
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
index 4a27ca4..bb9dc0d 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
@@ -66,7 +66,7 @@ import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class JAXWSMethodInvokerTest extends Assert {
+public class JAXWSMethodInvokerTest {
     private static final QName TEST_HEADER_NAME = new QName("testHeader");
     Factory factory = EasyMock.createMock(Factory.class);
     Object target = EasyMock.createMock(Hello.class);
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java
index 7fc83009..d4035c4 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java
@@ -42,7 +42,7 @@ import org.junit.Assert;
 
 import static org.junit.Assert.assertTrue;
 
-public class WrapperClassGeneratorTest extends Assert {
+public class WrapperClassGeneratorTest {
 
     @After
     public void tearDown() {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandlerTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandlerTest.java
index 83a75d3..9a543d9 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandlerTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
 /**
  *
  */
-public class JAXWSBPNamespaceHandlerTest extends Assert {
+public class JAXWSBPNamespaceHandlerTest {
     @Test
     public void testGetSchemaLocation() {
         JAXWSBPNamespaceHandler handler = new JAXWSBPNamespaceHandler();
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
index e6eb853..c6d0091 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 
-public class WebServiceContextImplTest extends Assert {
+public class WebServiceContextImplTest {
 
     @After
     public void tearDown() {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java
index bc49678..f2a9ba2 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertTrue;
 /**
  *
  */
-public class WrappedAttachmentsTest extends Assert {
+public class WrappedAttachmentsTest {
     @Test
     public void testCreateAndModify() {
         Map<String, DataHandler> content = new HashMap<>();
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedMessageContextTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedMessageContextTest.java
index 0e579e9..49eb78f 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedMessageContextTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedMessageContextTest.java
@@ -45,7 +45,7 @@ import static org.junit.Assert.fail;
 /**
  *
  */
-public class WrappedMessageContextTest extends Assert {
+public class WrappedMessageContextTest {
     @Test
     public void testPutAndGetJaxwsAttachments() throws Exception {
         WrappedMessageContext context =
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java
index 25bf7d8..5b3f75a 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java
@@ -42,7 +42,7 @@ import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.isA;
 import static org.junit.Assert.assertEquals;
 
-public class AbstractProtocolHandlerInterceptorTest extends Assert {
+public class AbstractProtocolHandlerInterceptorTest {
 
     private IMocksControl control;
     private Binding binding;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java
index 59f4fb9..e166295 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 
-public class AnnotationHandlerChainBuilderTest extends Assert {
+public class AnnotationHandlerChainBuilderTest {
 
     @Before
     public void setUp() {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java
index 4fad9eb..a96d6de 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java
@@ -48,7 +48,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 @SuppressWarnings("rawtypes")
-public class HandlerChainBuilderTest extends Assert {
+public class HandlerChainBuilderTest {
 
     Handler[] allHandlers = {EasyMock.createMock(LogicalHandler.class), EasyMock.createMock(Handler.class),
                              EasyMock.createMock(Handler.class), EasyMock.createMock(LogicalHandler.class)};
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
index 6ed724b..acbf297 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
@@ -61,7 +61,7 @@ import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class HandlerChainInvokerTest extends Assert {
+public class HandlerChainInvokerTest {
 
     private static final int HANDLER_COUNT = 4;
 
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/InitParamResourceResolverTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/InitParamResourceResolverTest.java
index 6ecb04d..7216786 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/InitParamResourceResolverTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/InitParamResourceResolverTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 
 
-public class InitParamResourceResolverTest extends Assert {
+public class InitParamResourceResolverTest {
 
     public static final String STRING_PARAM = "stringParam";
     public static final String STRING_VALUE = "a string";
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
index c07c658..c5d82b1 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
@@ -52,7 +52,7 @@ import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.isA;
 import static org.junit.Assert.assertEquals;
 
-public class LogicalHandlerInterceptorTest extends Assert {
+public class LogicalHandlerInterceptorTest {
 
     private IMocksControl control;
     private Binding binding;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java
index d2b8cc1..ad6b378 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java
@@ -41,7 +41,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class LogicalMessageImplTest extends Assert {
+public class LogicalMessageImplTest {
     AddNumbers req;
     List<Object> args;
 
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
index 20c8a26..f9c97d3 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
@@ -85,7 +85,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class SOAPHandlerInterceptorTest extends Assert {
+public class SOAPHandlerInterceptorTest {
 
     @Before
     public void setUp() {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
index 00a185a..5aa719f 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
@@ -71,7 +71,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 
-public class SpringBeansTest extends Assert {
+public class SpringBeansTest {
 
     @After
     public void tearDown() throws Exception {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java
index 4ce8022..4ba94d5 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java
@@ -49,7 +49,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class ContextPropertiesMappingTest extends Assert {
+public class ContextPropertiesMappingTest {
     private static final String ADDRESS = "test address";
     private static final String REQUEST_METHOD = "GET";
     private static final String HEADER = "header";
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfoTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfoTest.java
index 0c613fd..931c88c 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfoTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfoTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class JaxWsImplementorInfoTest extends Assert {
+public class JaxWsImplementorInfoTest {
 
     @Test
     public void testGetWSDLLocation() throws Exception {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java
index 9dff387..050bc1e 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java
@@ -51,7 +51,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class JaxWsServiceConfigurationTest extends Assert {
+public class JaxWsServiceConfigurationTest {
 
 
     @Before
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java
index 2739ee6..92ccbd5 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java
@@ -58,7 +58,7 @@ import static org.junit.Assert.assertTrue;
 /**
  *
  */
-public class PolicyAnnotationTest extends Assert {
+public class PolicyAnnotationTest {
 
     @org.junit.Test
     public void testAnnotations() throws Exception {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/HttpHandlerImplTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/HttpHandlerImplTest.java
index 331696f..43e3dca 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/HttpHandlerImplTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/HttpHandlerImplTest.java
@@ -30,7 +30,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-public class HttpHandlerImplTest extends Assert {
+public class HttpHandlerImplTest {
 
     private IMocksControl control;
     private HttpHandler handler;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java
index 5e4e983..f142b0d 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
-public class JAXWSHttpSpiDestinationTest extends Assert {
+public class JAXWSHttpSpiDestinationTest {
 
     private static final String ADDRESS = "http://localhost:80/foo/bar";
     private static final String CONTEXT_PATH = "/foo";
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java
index 6abefb7..3075554 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-public class JAXWSHttpSpiTransportFactoryTest extends Assert {
+public class JAXWSHttpSpiTransportFactoryTest {
 
     private IMocksControl control;
     private HttpContext context;
diff --git a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java
index 96a6d3e..1a80afb 100644
--- a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java
+++ b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.fail;
 
 
 
-public class AbstractDOMProviderTest extends Assert {
+public class AbstractDOMProviderTest {
 
     private String epAddr = "http://cxf.apache.org/";
 
diff --git a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java
index 3ebdda5..dcf1865 100644
--- a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java
+++ b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.fail;
 
 
 
-public class ProviderFactoryTest extends Assert {
+public class ProviderFactoryTest {
 
     private String epAddr = "http://cxf.apache.org/";
 
diff --git a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java
index f77997f..31d98dc 100644
--- a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java
+++ b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class ServerAppTest extends Assert {
+public class ServerAppTest {
 
     private String epAddr = "http://cxf.apache.org/";
 
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandlerTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandlerTest.java
index e4861a1..968f005 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandlerTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
 /**
  *
  */
-public class SimpleBPNamespaceHandlerTest extends Assert {
+public class SimpleBPNamespaceHandlerTest {
     @Test
     public void testGetSchemaLocation() {
         SimpleBPNamespaceHandler handler = new SimpleBPNamespaceHandler();
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java
index b504843..6840eda 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java
@@ -25,7 +25,7 @@ import org.junit.After;
 import org.junit.Assert;
 
 
-public class AbstractSimpleFrontendSpringTest extends Assert {
+public class AbstractSimpleFrontendSpringTest {
     protected AbstractApplicationContext ctx;
 
     @After
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/BasicNameManagerTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/BasicNameManagerTest.java
index 35f8808..5ba4b1a 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/BasicNameManagerTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/BasicNameManagerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertEquals;
 /**
  * Simple tests of the name manager.
  */
-public class BasicNameManagerTest extends Assert {
+public class BasicNameManagerTest {
 
     @Test
     public void testPrefixGeneration() {
diff --git a/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java b/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
index 15f8042..0261afc 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 
-public class InstrumentationManagerTest extends Assert {
+public class InstrumentationManagerTest {
     InstrumentationManager im;
     Bus bus;
 
diff --git a/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java b/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java
index 428fc06..3131c5d 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class CounterRepositoryTest extends Assert {
+public class CounterRepositoryTest {
     private Bus bus;
     private CounterRepository cr;
     private List<Interceptor<? extends Message>> inlist = new ArrayList<>();
diff --git a/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java b/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
index 8234a65..47ab303 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
@@ -40,7 +40,7 @@ import org.junit.Before;
 
 
 
-public class AbstractMessageResponseTestBase extends Assert {
+public class AbstractMessageResponseTestBase {
     protected static final QName SERVICE_NAME = new QName("http://org.apache.cxf", "hello");
     protected static final QName OPERATION_NAME = new QName("http://org.apache.cxf", "world");
     protected static final QName PORT_NAME = new QName("http://org.apache.cxf", "port");
diff --git a/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java b/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java
index ffbcff8..1bc5991 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertTrue;
 /**
  *
  */
-public class BusRegistrationTest extends Assert {
+public class BusRegistrationTest {
     private Bus serverBus;
     private Bus clientBus;
     private InstrumentationManager serverIM;
diff --git a/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java b/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java
index 45ce61c..d6a10f9 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java
@@ -38,7 +38,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-public class JMXManagedComponentManagerTest extends Assert {
+public class JMXManagedComponentManagerTest {
     private static final String PORT = TestUtil.getPortNumber(JMXManagedComponentManagerTest.class);
     private static final String NAME_ATTRIBUTE = "Name";
     private InstrumentationManagerImpl manager;
diff --git a/rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorTest.java b/rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorTest.java
index cb98d63..9075449 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertFalse;
 
 
 
-public class MBServerConnectorTest extends Assert {
+public class MBServerConnectorTest {
     private static final String PORT = TestUtil.getPortNumber(MBServerConnectorTest.class);
 
     @Test
diff --git a/rt/management/src/test/java/org/apache/cxf/management/utils/ManagementConsoleTest.java b/rt/management/src/test/java/org/apache/cxf/management/utils/ManagementConsoleTest.java
index 8e49bd0..b5d4167 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/utils/ManagementConsoleTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/utils/ManagementConsoleTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
-public class ManagementConsoleTest extends Assert {
+public class ManagementConsoleTest {
     private ManagementConsole mc = new ManagementConsole();
 
     @Test
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
index 3b2006f..8614677 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
@@ -53,7 +53,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-public class JAXRSClientFactoryBeanTest extends Assert {
+public class JAXRSClientFactoryBeanTest {
 
     @Test
     public void testCreateClient() throws Exception {
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/WebClientTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/WebClientTest.java
index 50dbff9..31ec37b 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/WebClientTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/WebClientTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 
-public class WebClientTest extends Assert {
+public class WebClientTest {
 
     @Test
     public void testReplaceHeader() {
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandlerTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandlerTest.java
index 5a593e0..3561952 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandlerTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
 /**
  *
  */
-public class JAXRSBPNamespaceHandlerTest extends Assert {
+public class JAXRSBPNamespaceHandlerTest {
     @Test
     public void testGetSchemaLocation() {
         JAXRSBPNamespaceHandler handler = new JAXRSBPNamespaceHandler();
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientCacheTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientCacheTest.java
index 7f0296d..ef5c57b 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientCacheTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientCacheTest.java
@@ -49,7 +49,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-public class ClientCacheTest extends Assert {
+public class ClientCacheTest {
     public static final String ADDRESS = "local://transport";
     private static Server server;
 
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientTest.java
index 64e553e..cef9b56 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class ClientTest extends Assert {
+public class ClientTest {
     public static final String ADDRESS = "local://transport";
 
     @Test
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientImplTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientImplTest.java
index 5488be0..7882685 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientImplTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientImplTest.java
@@ -54,7 +54,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class ClientImplTest extends Assert {
+public class ClientImplTest {
 
     private static final String MY_INTERCEPTOR_NAME = "MyInterceptor";
 
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientRequestFilterTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientRequestFilterTest.java
index 1433535..b85ff6d 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientRequestFilterTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientRequestFilterTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class ClientRequestFilterTest extends Assert {
+public class ClientRequestFilterTest {
 
     public static class NonStringObject {
         private String theString;
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/InvocationBuilderImplTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/InvocationBuilderImplTest.java
index ea3fad9..1828a0e 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/InvocationBuilderImplTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/InvocationBuilderImplTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class InvocationBuilderImplTest extends Assert {
+public class InvocationBuilderImplTest {
 
     public static class TestFilter implements ClientRequestFilter {
 
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java
index 1e51126..c936333 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 
-public class JAXRSClientFactoryBeanTest extends Assert {
+public class JAXRSClientFactoryBeanTest {
 
     @After
     public void tearDown() throws Exception {
diff --git a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/Swagger2FeatureTest.java b/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/Swagger2FeatureTest.java
index 9c073ca..306b9c1 100644
--- a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/Swagger2FeatureTest.java
+++ b/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/Swagger2FeatureTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertNull;
 /**
  *
  */
-public class Swagger2FeatureTest extends Assert {
+public class Swagger2FeatureTest {
     @Test
     public void testSetBasePathByAddress() {
         Swagger2Feature f = new Swagger2Feature();
diff --git a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtilsTest.java b/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtilsTest.java
index 9f6d171..86aabeb 100644
--- a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtilsTest.java
+++ b/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtilsTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class SwaggerToOpenApiConversionUtilsTest extends Assert {
+public class SwaggerToOpenApiConversionUtilsTest {
 
     @Test
     public void testConvertFromSwaggerToOpenApi() {
diff --git a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtilsTest.java b/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtilsTest.java
index c543f57..e046ae8 100644
--- a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtilsTest.java
+++ b/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtilsTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
-public class SwaggerParseUtilsTest extends Assert {
+public class SwaggerParseUtilsTest {
 
     @Test
     public void testConvertPetShopDocToUserApp() {
diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java
index 26f4512..8654d26 100644
--- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java
+++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-public class ServerProviderFactoryTest extends Assert {
+public class ServerProviderFactoryTest {
 
 
     @Before
diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java
index 7288681..fbbbb75 100644
--- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java
+++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java
@@ -57,7 +57,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class WadlGeneratorJsonTest extends Assert {
+public class WadlGeneratorJsonTest {
 
     private IMocksControl control;
 
diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
index 5c1a637..6be69cf 100644
--- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
+++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
@@ -71,7 +71,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class WadlGeneratorTest extends Assert {
+public class WadlGeneratorTest {
 
     private IMocksControl control;
 
diff --git a/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java b/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java
index 01f29b0..8902d09 100644
--- a/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java
+++ b/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-public class JsonMapObjectReaderWriterTest extends Assert {
+public class JsonMapObjectReaderWriterTest {
 
     @Test
     public void testWriteMap() throws Exception {
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryAllTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryAllTest.java
index bd0e2bf..7fd9133 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryAllTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryAllTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-public class ProviderFactoryAllTest extends Assert {
+public class ProviderFactoryAllTest {
 
     @Before
     public void setUp() {
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProviderTest.java
index ff1401c..befd4ff 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProviderTest.java
@@ -45,7 +45,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class AegisElementProviderTest extends Assert {
+public class AegisElementProviderTest {
 
     private Properties properties;
     private String simpleBeanXml;
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java
index dcaf853..ceda71e 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class AtomEntryProviderTest extends Assert {
+public class AtomEntryProviderTest {
 
     private AtomEntryProvider afd;
 
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java
index b9aedda..dd382e4 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class AtomFeedProviderTest extends Assert {
+public class AtomFeedProviderTest {
 
     private AtomFeedProvider afd;
 
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java
index ab5e596..944e019 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 
-public class AtomPojoProviderTest extends Assert {
+public class AtomPojoProviderTest {
 
     private ClassPathXmlApplicationContext ctx;
 
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
index 092d610..d95c83c 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
@@ -49,7 +49,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class DOM4JProviderTest extends Assert {
+public class DOM4JProviderTest {
 
 
     @Test
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
index 57987c9..403c1ec 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
@@ -88,7 +88,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class JSONProviderTest extends Assert {
+public class JSONProviderTest {
 
     @Test
     public void testReadMalformedJson() throws Exception {
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java
index 9c237f0..4361028 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class JsonpInterceptorTest extends Assert {
+public class JsonpInterceptorTest {
 
     public static final String JSON = "{}";
 
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java
index 1ced424..da817ad 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class BeanspectorTest extends Assert {
+public class BeanspectorTest {
 
     @Test
     public void testSimpleBean() throws SearchParseException {
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplCustomParserTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplCustomParserTest.java
index 152871a..eac06f0 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplCustomParserTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplCustomParserTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class SearchContextImplCustomParserTest extends Assert {
+public class SearchContextImplCustomParserTest {
 
     @Test
     public void testQuery() {
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplTest.java
index 8d74d9c..1a06d42 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class SearchContextImplTest extends Assert {
+public class SearchContextImplTest {
 
     @Test
     public void testPlainQuery1() {
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchUtilsTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchUtilsTest.java
index 3680db3..24c296f 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchUtilsTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchUtilsTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class SearchUtilsTest extends Assert {
+public class SearchUtilsTest {
 
     @Test
     public void testSqlWildcardString() {
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilderTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilderTest.java
index b1a32ab..1b78536 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilderTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilderTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class FiqlSearchConditionBuilderTest extends Assert {
+public class FiqlSearchConditionBuilderTest {
     private static FiqlSearchConditionBuilder b = new FiqlSearchConditionBuilder();
     private static TimeZone tz;
 
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlCollectionsTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlCollectionsTest.java
index 6da65cd..e08b988 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlCollectionsTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlCollectionsTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertNotNull;
 
-public class FiqlCollectionsTest extends Assert {
+public class FiqlCollectionsTest {
     @Test
     public void testWithCollectionAfterFirstLevelOnCollection() throws SearchParseException {
         FiqlParser<Place> placeParser = new FiqlParser<>(Place.class);
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java
index f55374a..ada5911 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class FiqlParserTest extends Assert {
+public class FiqlParserTest {
     private FiqlParser<Condition> parser = new FiqlParser<>(Condition.class);
 
     @Test(expected = SearchParseException.class)
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java
index 2c3cc9c..92dc4ec 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java
@@ -40,7 +40,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class HBaseVisitorTest extends Assert {
+public class HBaseVisitorTest {
     public static final byte[] BOOK_FAMILY = "book".getBytes();
     public static final byte[] NAME_QUALIFIER = "name".getBytes();
 
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java
index ff26659..b1fa721 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java
@@ -47,7 +47,7 @@ import org.junit.Before;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public abstract class AbstractJPATypedQueryVisitorTest extends Assert {
+public abstract class AbstractJPATypedQueryVisitorTest {
 
     private EntityManagerFactory emFactory;
 
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPALanguageVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPALanguageVisitorTest.java
index 45cf08e..691e881 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPALanguageVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPALanguageVisitorTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class JPALanguageVisitorTest extends Assert {
+public class JPALanguageVisitorTest {
 
     @Test
     public void testSimpleQuery() throws Exception {
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/ldap/LdapQueryVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/ldap/LdapQueryVisitorTest.java
index 7b51447..55ce6ef 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/ldap/LdapQueryVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/ldap/LdapQueryVisitorTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 
 
-public class LdapQueryVisitorTest extends Assert {
+public class LdapQueryVisitorTest {
     private FiqlParser<Condition> parser = new FiqlParser<>(Condition.class);
 
     @Test
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParserTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParserTest.java
index ecdab26..92db1ac 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParserTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParserTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class ODataParserTest extends Assert {
+public class ODataParserTest {
     private ODataParser<Person> parser;
 
     public static class Person {
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLHierarchicalQueryTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLHierarchicalQueryTest.java
index c417aff..b5dfa25 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLHierarchicalQueryTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLHierarchicalQueryTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 //userName eq "admin@amarkevich.talend.com" and entitlements sw "TDP_"
 
-public class SQLHierarchicalQueryTest extends Assert {
+public class SQLHierarchicalQueryTest {
     @Test
     public void testSimpleHierarchicalQuery() throws SearchParseException {
         FiqlParser<SearchBean> parser = new FiqlParser<>(SearchBean.class);
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java
index b980c50..f4f7ad3 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertTrue;
 
 
-public class SQLPrinterVisitorTest extends Assert {
+public class SQLPrinterVisitorTest {
     private FiqlParser<Condition> parser = new FiqlParser<>(Condition.class);
 
     @Test
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractorTest.java
index 38c58a2..70df918 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractorTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class TikaContentExtractorTest extends Assert {
+public class TikaContentExtractorTest {
     private TikaContentExtractor extractor;
     private SearchConditionParser< SearchBean > parser;
 
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaLuceneContentExtractorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaLuceneContentExtractorTest.java
index 95b73cc..b9fadd7 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaLuceneContentExtractorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaLuceneContentExtractorTest.java
@@ -49,7 +49,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-public class TikaLuceneContentExtractorTest extends Assert {
+public class TikaLuceneContentExtractorTest {
     private TikaLuceneContentExtractor extractor;
     private Directory directory;
     private IndexWriter writer;
diff --git a/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/CxfTypeSafeClientBuilderTest.java b/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/CxfTypeSafeClientBuilderTest.java
index 0edb79a..c5205cf 100644
--- a/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/CxfTypeSafeClientBuilderTest.java
+++ b/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/CxfTypeSafeClientBuilderTest.java
@@ -54,7 +54,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class CxfTypeSafeClientBuilderTest extends Assert {
+public class CxfTypeSafeClientBuilderTest {
 
     @Test
     public void testConfigMethods() {
@@ -184,11 +184,11 @@ public class CxfTypeSafeClientBuilderTest extends Assert {
             .baseUri(new URI("http://localhost:8080/neverUsed"))
             .build(MyClient.class);
         client.myDefaultMethod(true);
-        fail("Should have thrown IOException");
+        Assert.fail("Should have thrown IOException");
     }
     private void fail(Response r, String failureMessage) {
         System.out.println(r.getStatus());
-        fail(failureMessage);
+        Assert.fail(failureMessage);
     }
 
-}
\ No newline at end of file
+}
diff --git a/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/ValidatorTest.java b/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/ValidatorTest.java
index f4a3102..f5af28f 100644
--- a/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/ValidatorTest.java
+++ b/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/ValidatorTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class ValidatorTest extends Assert {
+public class ValidatorTest {
 
     public abstract static class NotAnInterface {
         @GET
diff --git a/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/cdi/RestClientCdiTest.java b/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/cdi/RestClientCdiTest.java
index ea0e984..e576462 100644
--- a/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/cdi/RestClientCdiTest.java
+++ b/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/cdi/RestClientCdiTest.java
@@ -43,7 +43,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class RestClientCdiTest extends Assert {
+public class RestClientCdiTest {
 
     @Test
     public void testProvidersRegisteredViaMPConfigProperty() throws Exception {
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwkJoseCookBookTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwkJoseCookBookTest.java
index c7cc3bc..cb714f0 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwkJoseCookBookTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwkJoseCookBookTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class JwkJoseCookBookTest extends Assert {
+public class JwkJoseCookBookTest {
 
     private static final String EC_X_COORDINATE_VALUE = "AHKZLLOsCOzz5cY97ewNUajB957y-C-U88c3v13nmGZx6sYl_oJXu9"
         + "A5RkTKqjqvjyekWF-7ytDyRXYgCF5cj0Kt";
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java
index 7a3ca07..7699b33 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java
@@ -46,7 +46,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-public class JweCompactReaderWriterTest extends Assert {
+public class JweCompactReaderWriterTest {
     // A1 example
     static final byte[] CONTENT_ENCRYPTION_KEY_A1 = {
         (byte)177, (byte)161, (byte)244, (byte)128, 84, (byte)143, (byte)225,
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
index 2b4a005..93bb172 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
@@ -42,7 +42,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-public class JweJsonConsumerTest extends Assert {
+public class JweJsonConsumerTest {
 
     static final String SINGLE_RECIPIENT_ALL_HEADERS_AAD_MODIFIED_OUTPUT =
         "{"
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java
index e2e251a..a40ecbe 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java
@@ -40,7 +40,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class JweJsonProducerTest extends Assert {
+public class JweJsonProducerTest {
     static final byte[] WRAPPER_BYTES1 = {91, 96, 105, 38, 99, 108, 110, 8, -93, 50, -15, 62, 0, -115, 73, -39};
     static final byte[] WRAPPER_BYTES2 = {-39, 96, 105, 38, 99, 108, 110, 8, -93, 50, -15, 62, 0, -115, 73, 91};
     static final byte[] CEK_BYTES = {-43, 123, 77, 115, 40, 49, -4, -9, -48, -74, 62, 59, 60, 102, -22, -100};
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JwePbeHmacAesWrapTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JwePbeHmacAesWrapTest.java
index 26b0901..3e75e5b 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JwePbeHmacAesWrapTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JwePbeHmacAesWrapTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class JwePbeHmacAesWrapTest extends Assert {
+public class JwePbeHmacAesWrapTest {
     @Before
     public void registerBouncyCastleIfNeeded() throws Exception {
         Security.addProvider(new BouncyCastleProvider());
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeyTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeyTest.java
index 2f96c65..20edd6f 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeyTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeyTest.java
@@ -37,7 +37,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-public class JsonWebKeyTest extends Assert {
+public class JsonWebKeyTest {
     private static final String RSA_MODULUS_VALUE = "0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx4cbbfAAt"
         + "VT86zwu1RK7aPFFxuhDR1L6tSoc_BJECPebWKRXjBZCiFV4n3oknjhMstn64tZ_2W-5JsGY4Hc5n9yBXArwl93lqt7_RN5w6Cf"
         + "0h4QyQ5v-65YGjQR0_FDW2QvzqY368QQMicAtaSqzs8KJZgnYb9c7d0zgdAZHzu6qMQvRL5hajrn1n91CbOpbISD08qNLyrdkt"
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JwkUtilsTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JwkUtilsTest.java
index 73dcf98..5bdb2ad 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JwkUtilsTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JwkUtilsTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 
-public class JwkUtilsTest extends Assert {
+public class JwkUtilsTest {
     private static final String RSA_KEY = "{"
       + "\"kty\": \"RSA\","
       + "\"n\": \"0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx4cbbfAAt"
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactHeaderTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactHeaderTest.java
index 16997f0..fee458d 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactHeaderTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactHeaderTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class JwsCompactHeaderTest extends Assert {
+public class JwsCompactHeaderTest {
 
     /**
      * JWS string, which lacks the "alg" header field.
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactReaderWriterTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactReaderWriterTest.java
index 8ccdc77..d0d08cb 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactReaderWriterTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactReaderWriterTest.java
@@ -47,7 +47,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class JwsCompactReaderWriterTest extends Assert {
+public class JwsCompactReaderWriterTest {
 
     public static final String TOKEN_WITH_DETACHED_UNENCODED_PAYLOAD =
         "eyJhbGciOiJIUzI1NiIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..A5dxf2s96_n5FLueVuW1Z_vh161FwXZC4YLPff6dmDY";
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonConsumerTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonConsumerTest.java
index 1b0121a..6810b73 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonConsumerTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonConsumerTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class JwsJsonConsumerTest extends Assert {
+public class JwsJsonConsumerTest {
     private static final String DUAL_SIGNED_DOCUMENT =
         "{\"payload\":\n"
         + "\t\"eyJpc3MiOiJqb2UiLA0KICJleHAiOjEzMDA4MTkzODAsDQogImh0dHA6Ly9leGFtcGxlLmNvbS9pc19yb290Ijp0cnVlfQ\",\n"
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonProducerTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonProducerTest.java
index 8a805ae..1ced7ca 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonProducerTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonProducerTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class JwsJsonProducerTest extends Assert {
+public class JwsJsonProducerTest {
 
     public static final String ENCODED_MAC_KEY_1 = "AyM1SysPpbyDfgZld3umj1qzKObwVMkoqQ-EstJQLr_T-1qS0gZH75"
                        + "aKtMN3Yj0iPS4hcgUuTwjAzZr1Z9CAow";
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsUtilsTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsUtilsTest.java
index 2d5d97a..88e890b 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsUtilsTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsUtilsTest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class JwsUtilsTest extends Assert {
+public class JwsUtilsTest {
 
     @Test
     public void testSignatureAlgorithm() {
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwt/JwtUtilsTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwt/JwtUtilsTest.java
index 2f5db9c..ea7c2aa 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwt/JwtUtilsTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwt/JwtUtilsTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.fail;
 /**
  * Some tests for JwtUtils
  */
-public class JwtUtilsTest extends Assert {
+public class JwtUtilsTest {
 
     @org.junit.Test
     public void testExpiredToken() throws Exception {
diff --git a/rt/rs/security/oauth-parent/oauth/src/test/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtilsTest.java b/rt/rs/security/oauth-parent/oauth/src/test/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtilsTest.java
index 9705c5d..913ec6d 100644
--- a/rt/rs/security/oauth-parent/oauth/src/test/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtilsTest.java
+++ b/rt/rs/security/oauth-parent/oauth/src/test/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtilsTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class OAuthUtilsTest extends Assert {
+public class OAuthUtilsTest {
 
     @Test
     public void testCheckRequestURI() throws Exception {
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/common/UserSubjectTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/common/UserSubjectTest.java
index d66c16b2..bcddc4b 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/common/UserSubjectTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/common/UserSubjectTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-public class UserSubjectTest extends Assert {
+public class UserSubjectTest {
 
     @Test
     public void testId() {
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/TokenGrantHandlerTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/TokenGrantHandlerTest.java
index 1986e57..2fc7e09 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/TokenGrantHandlerTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/TokenGrantHandlerTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class TokenGrantHandlerTest extends Assert {
+public class TokenGrantHandlerTest {
 
 
 
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java
index 99c2690..feb55ef 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-public class JCacheCodeDataProviderTest extends Assert {
+public class JCacheCodeDataProviderTest {
     private JCacheCodeDataProvider provider;
 
     @Before
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
index 4d7aea2..e84b1f2 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 
-public class JPACodeDataProviderTest extends Assert {
+public class JPACodeDataProviderTest {
     private EntityManagerFactory emFactory;
     private Connection connection;
     private JPACodeDataProvider provider;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/JwtUserSubjectTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/JwtUserSubjectTest.java
index a7fef49..1a4d7ca 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/JwtUserSubjectTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/JwtUserSubjectTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertNotNull;
 
-public class JwtUserSubjectTest extends Assert {
+public class JwtUserSubjectTest {
 
     @Test
     public void testJwtUserSubject() {
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProviderTest.java
index 71ac33a..8a676d5 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProviderTest.java
@@ -50,7 +50,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-abstract class AbstractOAuthDataProviderTest extends Assert {
+abstract class AbstractOAuthDataProviderTest {
     private static KeyPair keyPair;
     private AbstractOAuthDataProvider provider;
 
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProviderTest.java
index 806a970..5824c55 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProviderTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class OAuthJSONProviderTest extends Assert {
+public class OAuthJSONProviderTest {
 
     @Test
     public void testWriteBearerClientAccessToken() throws Exception {
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorTest.java
index af52fc7..afef034 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorTest.java
@@ -37,7 +37,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertNotNull;
 
-public class HawkAccessTokenValidatorTest extends Assert {
+public class HawkAccessTokenValidatorTest {
 
     private HawkAccessTokenValidator validator = new HawkAccessTokenValidator();
     private OAuthDataProvider dataProvider = EasyMock.createMock(OAuthDataProvider.class);
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImplTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImplTest.java
index 04d9966..a3e7333 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImplTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImplTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-public class NonceVerifierImplTest extends Assert {
+public class NonceVerifierImplTest {
 
     private NonceVerifierImpl nonceVerifier;
     private NonceStore nonceStore = EasyMock.createMock(NonceStore.class);
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/AuthorizationUtilsTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/AuthorizationUtilsTest.java
index 10d1a90..0528bc8 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/AuthorizationUtilsTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/AuthorizationUtilsTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 
-public class AuthorizationUtilsTest extends Assert {
+public class AuthorizationUtilsTest {
 
     @Test
     public void testThrowAuthorizationFailureSingleChallenge() {
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtilsTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtilsTest.java
index e584b27..f1a19d5 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtilsTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtilsTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class OAuthUtilsTest extends Assert {
+public class OAuthUtilsTest {
 
     @Test
     public void testValidateScopesStrict() {
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/crypto/CryptoUtilsTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/crypto/CryptoUtilsTest.java
index 71bd5a0..bc62bc2 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/crypto/CryptoUtilsTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/crypto/CryptoUtilsTest.java
@@ -54,7 +54,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class CryptoUtilsTest extends Assert {
+public class CryptoUtilsTest {
 
     private CodeGrantEncryptingDataProvider p;
 
diff --git a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
index 240133f..f40ea46 100644
--- a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
+++ b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
@@ -37,7 +37,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-public class JPAOidcUserSubjectTest extends Assert {
+public class JPAOidcUserSubjectTest {
     private EntityManagerFactory emFactory;
     private JPAOAuthDataProvider provider;
 
diff --git a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/utils/OidcUtilsTest.java b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/utils/OidcUtilsTest.java
index 79341d8..a8c642c 100644
--- a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/utils/OidcUtilsTest.java
+++ b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/utils/OidcUtilsTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-public class OidcUtilsTest extends Assert {
+public class OidcUtilsTest {
     
     @Test
     public void testScopeToClaimsMappingNoValue() {
diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java
index 3a5be80..13bcaa1 100644
--- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java
+++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertNotNull;
 /**
  *
  */
-public class EHCacheUtilTest extends Assert {
+public class EHCacheUtilTest {
 
     @Test
     public void testCreateCacheManager() {
diff --git a/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java b/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java
index 5fa1dc9..1b3ea19 100644
--- a/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java
+++ b/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 
-public class DeflateEncoderDecoderTest extends Assert {
+public class DeflateEncoderDecoderTest {
 
     @Test(expected = DataFormatException.class)
     public void testInvalidContent() throws Exception {
diff --git a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/claims/SAMLClaimsTest.java b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/claims/SAMLClaimsTest.java
index b0154c5..9a4b2d2 100644
--- a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/claims/SAMLClaimsTest.java
+++ b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/claims/SAMLClaimsTest.java
@@ -42,7 +42,7 @@ import org.junit.Assert;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class SAMLClaimsTest extends Assert {
+public class SAMLClaimsTest {
 
     @org.junit.Test
     public void testSAML2Claims() throws Exception {
diff --git a/rt/security/src/test/java/org/apache/cxf/rt/security/claims/ClaimTest.java b/rt/security/src/test/java/org/apache/cxf/rt/security/claims/ClaimTest.java
index 000a099..baaf648 100644
--- a/rt/security/src/test/java/org/apache/cxf/rt/security/claims/ClaimTest.java
+++ b/rt/security/src/test/java/org/apache/cxf/rt/security/claims/ClaimTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.fail;
 
-public class ClaimTest extends Assert {
+public class ClaimTest {
 
     @Test
     public void testCloneNull() {
diff --git a/rt/security/src/test/java/org/apache/cxf/rt/security/claims/interceptor/ClaimsAuthorizingInterceptorTest.java b/rt/security/src/test/java/org/apache/cxf/rt/security/claims/interceptor/ClaimsAuthorizingInterceptorTest.java
index 010332d..9eb732e 100644
--- a/rt/security/src/test/java/org/apache/cxf/rt/security/claims/interceptor/ClaimsAuthorizingInterceptorTest.java
+++ b/rt/security/src/test/java/org/apache/cxf/rt/security/claims/interceptor/ClaimsAuthorizingInterceptorTest.java
@@ -54,7 +54,7 @@ import org.junit.Test;
 import static org.junit.Assert.fail;
 
 
-public class ClaimsAuthorizingInterceptorTest extends Assert {
+public class ClaimsAuthorizingInterceptorTest {
 
     private ClaimsAuthorizingInterceptor interceptor;
 
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
index 2224284..452cdcf 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
@@ -87,7 +87,7 @@ import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class JettyHTTPDestinationTest extends Assert {
+public class JettyHTTPDestinationTest {
     protected static final String AUTH_HEADER = "Authorization";
     protected static final String USER = "copernicus";
     protected static final String PASSWD = "epicycles";
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java
index 6fc3f14..15f457e 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.fail;
 
 
 public class JettyHTTPServerEngineFactoryTest
-        extends Assert {
+        {
     Bus bus;
 
     @BeforeClass
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
index 92b16a7..e4630ba 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
@@ -65,7 +65,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class JettyHTTPServerEngineTest extends Assert {
+public class JettyHTTPServerEngineTest {
     private static final int PORT1
         = Integer.valueOf(TestUtil.getPortNumber(JettyHTTPServerEngineTest.class, 1));
     private static final int PORT2
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandlerTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandlerTest.java
index 22e0c60..2796070 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandlerTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
 /**
  *
  */
-public class HTTPJettyTransportNamespaceHandlerTest extends Assert {
+public class HTTPJettyTransportNamespaceHandlerTest {
     @Test
     public void testGetSchemaLocation() {
         HTTPJettyTransportNamespaceHandler handler = new HTTPJettyTransportNamespaceHandler();
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java
index 44edd4c..233d03e 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java
@@ -51,7 +51,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 
-public class ApplicationContextTest extends Assert {
+public class ApplicationContextTest {
 
     private static final String S1 =
         ApplicationContextTest.class.getResource("/META-INF/cxf/cxf.xml").toString();
diff --git a/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactoryTest.java b/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactoryTest.java
index 7502b3f..00a75d1 100644
--- a/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactoryTest.java
+++ b/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactoryTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertTrue;
 
 
 
-public class NettyHttpConduitFactoryTest extends Assert {
+public class NettyHttpConduitFactoryTest {
     Bus bus;
 
     @BeforeClass
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
index f721efe..6d5d321 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
@@ -86,7 +86,7 @@ import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class NettyHttpDestinationTest extends Assert {
+public class NettyHttpDestinationTest {
     protected static final String AUTH_HEADER = "Authorization";
     protected static final String USER = "copernicus";
     protected static final String PASSWD = "epicycles";
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactoryTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactoryTest.java
index 3b0fe72..70aab9f 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactoryTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactoryTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertTrue;
 
 
 public class NettyHttpServerEngineFactoryTest
-        extends Assert {
+        {
     Bus bus;
 
     @BeforeClass
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java
index 4b209c7..e2149a8 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java
@@ -45,7 +45,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 
-public class NettyHttpServerEngineTest extends Assert {
+public class NettyHttpServerEngineTest {
     private static final int PORT1
         = Integer.valueOf(TestUtil.getPortNumber(NettyHttpServerEngineTest.class, 1));
     private static final int PORT2
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/spring/ApplicationContextTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/spring/ApplicationContextTest.java
index ef535f7..0e391dc 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/spring/ApplicationContextTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/spring/ApplicationContextTest.java
@@ -50,7 +50,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 
-public class ApplicationContextTest extends Assert {
+public class ApplicationContextTest {
 
     private static final String S1 =
         ApplicationContextTest.class.getResource("/META-INF/cxf/cxf.xml").toString();
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
index da578d5..087638c 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
@@ -89,7 +89,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 
-public class UndertowHTTPDestinationTest extends Assert {
+public class UndertowHTTPDestinationTest {
     protected static final String AUTH_HEADER = "Authorization";
     protected static final String USER = "copernicus";
     protected static final String PASSWD = "epicycles";
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactoryTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactoryTest.java
index 95f4404..d550b99 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactoryTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactoryTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.fail;
 
 
 public class UndertowHTTPServerEngineFactoryTest
-        extends Assert {
+        {
     Bus bus;
 
     @BeforeClass
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java
index c884306..202c1c9 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java
@@ -53,7 +53,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 
-public class UndertowHTTPServerEngineTest extends Assert {
+public class UndertowHTTPServerEngineTest {
     private static final int PORT1
         = Integer.valueOf(TestUtil.getPortNumber(UndertowHTTPServerEngineTest.class, 1));
     private static final int PORT2
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/blueprint/HTTPUndertowTransportNamespaceHandlerTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/blueprint/HTTPUndertowTransportNamespaceHandlerTest.java
index 39bfa05..a06ceaf 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/blueprint/HTTPUndertowTransportNamespaceHandlerTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/blueprint/HTTPUndertowTransportNamespaceHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
 /**
  *
  */
-public class HTTPUndertowTransportNamespaceHandlerTest extends Assert {
+public class HTTPUndertowTransportNamespaceHandlerTest {
     @Test
     public void testGetSchemaLocation() {
         HTTPUndertowTransportNamespaceHandler handler = new HTTPUndertowTransportNamespaceHandler();
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/ApplicationContextTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/ApplicationContextTest.java
index 8d1fb33..511dca1 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/ApplicationContextTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/ApplicationContextTest.java
@@ -50,7 +50,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 
-public class ApplicationContextTest extends Assert {
+public class ApplicationContextTest {
 
     private static final String S1 =
         ApplicationContextTest.class.getResource("/META-INF/cxf/cxf.xml").toString();
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java
index 326e1fb..2da879d 100755
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertTrue;
 /**
  *
  */
-public class DestinationRegistryImplTest extends Assert {
+public class DestinationRegistryImplTest {
     private static final String ADDRESS = "http://bar/snafu";
     private static final QName QNAME = new QName(ADDRESS, "foobar");
 
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
index d27166c..e49d3dc 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
@@ -58,7 +58,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 
-public class HTTPConduitTest extends Assert {
+public class HTTPConduitTest {
 
     @Before
     public void setUp() throws Exception {
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
index 9fe115a..0c18eac 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
@@ -49,7 +49,7 @@ import static org.junit.Assert.assertTrue;
  * implementation of HTTPConduit change (i.e. no longer use the URLConnections)
  * this test will break.
  */
-public class HTTPConduitURLConnectionTest extends Assert {
+public class HTTPConduitURLConnectionTest {
 
     @Before
     public void setUp() throws Exception {
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
index 9396953..950b0c8 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
@@ -66,7 +66,7 @@ import static org.junit.Assert.assertTrue;
 
 /**
  */
-public class HTTPConduitURLEasyMockTest extends Assert {
+public class HTTPConduitURLEasyMockTest {
     private static String oldHttpProxyHost;
 
     private static final String HTTP_RESPONSE_MESSAGE = "Some Response Message I can test";
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPTransportFactoryTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPTransportFactoryTest.java
index 55b7fec..0de0a07 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPTransportFactoryTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPTransportFactoryTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class HTTPTransportFactoryTest extends Assert {
+public class HTTPTransportFactoryTest {
     @Test
     public void testGetDestination() {
         Bus bus = BusFactory.getDefaultBus();
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java
index bdf889d..2de70b6 100755
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java
@@ -48,7 +48,7 @@ import static org.junit.Assert.fail;
 /**
  *
  */
-public class HeadersTest extends Assert {
+public class HeadersTest {
 
     @Test
     public void setHeadersTest() throws Exception {
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/PatternBuilderTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/PatternBuilderTest.java
index 1a6f2f0..0dd4cce 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/PatternBuilderTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/PatternBuilderTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertTrue;
 /**
  * A {@code PatternBuilderTest} is ...
  */
-public class PatternBuilderTest extends Assert {
+public class PatternBuilderTest {
 
     @Test
     public void testPatternBuilder() {
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/blueprint/HttpBPHandlerTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/blueprint/HttpBPHandlerTest.java
index f8eb0e8..a89129b 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/blueprint/HttpBPHandlerTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/blueprint/HttpBPHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
 /**
  *
  */
-public class HttpBPHandlerTest extends Assert {
+public class HttpBPHandlerTest {
     @Test
     public void testGetSchemaLocation() {
         HttpBPHandler handler = new HttpBPHandler();
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java
index 9b2143f..4dd279f 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class ClientPolicyCalculatorTest extends Assert {
+public class ClientPolicyCalculatorTest {
     @Test
     public void testCompatibleClientPolicies() {
         ClientPolicyCalculator calc = new ClientPolicyCalculator();
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPClientAssertionBuilderTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPClientAssertionBuilderTest.java
index 98e0946..7c6a1eb 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPClientAssertionBuilderTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPClientAssertionBuilderTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertTrue;
 /**
  *
  */
-public class HTTPClientAssertionBuilderTest extends Assert {
+public class HTTPClientAssertionBuilderTest {
 
 
     @Test
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPServerAssertionBuilderTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPServerAssertionBuilderTest.java
index b115b93..76af7be 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPServerAssertionBuilderTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPServerAssertionBuilderTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertTrue;
 /**
  *
  */
-public class HTTPServerAssertionBuilderTest extends Assert {
+public class HTTPServerAssertionBuilderTest {
 
 
     @Test
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
index 6aad2d9..d1048bf 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
@@ -48,7 +48,7 @@ import static org.junit.Assert.assertTrue;
 /**
  *
  */
-public class PolicyUtilsTest extends Assert {
+public class PolicyUtilsTest {
 
     private IMocksControl control;
 
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ServerPolicyCalculatorTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ServerPolicyCalculatorTest.java
index 7f264ac..d28a3a1 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ServerPolicyCalculatorTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ServerPolicyCalculatorTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class ServerPolicyCalculatorTest extends Assert {
+public class ServerPolicyCalculatorTest {
     @Test
     public void testCompatibleServerPolicies() {
         ServerPolicyCalculator spc = new ServerPolicyCalculator();
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/HttpConduitConfigurationTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/HttpConduitConfigurationTest.java
index 7a6782c..58fa92a 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/HttpConduitConfigurationTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/HttpConduitConfigurationTest.java
@@ -52,7 +52,7 @@ import static org.junit.Assert.assertTrue;
 /**
  *
  */
-public class HttpConduitConfigurationTest extends Assert {
+public class HttpConduitConfigurationTest {
     private static EndpointInfo ei;
     private Bus bus;
 
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java
index 30b237b..1dec03a 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class ServletControllerTest extends Assert {
+public class ServletControllerTest {
 
     private HttpServletRequest req;
     private HttpServletResponse res;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
index 9fed3c3..5c7283f 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
@@ -55,7 +55,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public abstract class AbstractJMSTester extends Assert {
+public abstract class AbstractJMSTester {
     protected static final String WSDL = "/jms_test.wsdl";
     protected static final String SERVICE_NS = "http://cxf.apache.org/hello_world_jms";
     protected static final int MAX_RECEIVE_TIME = 10;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSMessageUtilTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSMessageUtilTest.java
index 5a3232f..4f2cf1f 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSMessageUtilTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSMessageUtilTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-public class JMSMessageUtilTest extends Assert {
+public class JMSMessageUtilTest {
 
     @Test
     public void testGetEncoding() throws Exception {
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java
index 16cfd19..684e785 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 
-public class JMSContinuationProviderTest extends Assert {
+public class JMSContinuationProviderTest {
     private static Bus bus = BusFactory.getDefaultBus();
 
     @AfterClass
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationTest.java
index 35e75cb..36f42d9 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-public class JMSContinuationTest extends Assert {
+public class JMSContinuationTest {
 
     private Message m;
     private Bus b;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java
index 4560d91..60ba97e 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class JMSEndpointTest extends Assert {
+public class JMSEndpointTest {
 
     private static final String TEST_VALUE = "testValue";
 
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/JMSUtilTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/JMSUtilTest.java
index 25ff77b..d4f6e8f 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/JMSUtilTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/JMSUtilTest.java
@@ -40,7 +40,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class JMSUtilTest extends Assert {
+public class JMSUtilTest {
 
     @Test
     public void testCorrelationIDGeneration() {
diff --git a/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalDestinationTest.java b/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalDestinationTest.java
index a8f54c0..ce7c48a 100644
--- a/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalDestinationTest.java
+++ b/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalDestinationTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertNull;
 /**
  *
  */
-public class LocalDestinationTest extends Assert {
+public class LocalDestinationTest {
 
     /**
      * Tests if the status code is available after closing the destination so that it can be logged.
diff --git a/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java b/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java
index f660b82..55e46b1 100644
--- a/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java
+++ b/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 
-public class LocalTransportFactoryTest extends Assert {
+public class LocalTransportFactoryTest {
     @Test
     public void testLocalTransportWithSeparateThread() throws Exception {
         testInvocation(false);
diff --git a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketTransportFactoryTest.java b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketTransportFactoryTest.java
index f0f50ec..b026b8c 100644
--- a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketTransportFactoryTest.java
+++ b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketTransportFactoryTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertNotNull;
 
-public class WebSocketTransportFactoryTest extends Assert {
+public class WebSocketTransportFactoryTest {
 
     @Test
     public void testGetDestination() throws Exception {
diff --git a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketUtilsTest.java b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketUtilsTest.java
index cd72e0c..89fecf2 100644
--- a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketUtilsTest.java
+++ b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketUtilsTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.fail;
 /**
  *
  */
-public class WebSocketUtilsTest extends Assert {
+public class WebSocketUtilsTest {
     private static final byte[] TEST_BODY_BYTES = "buenos dias".getBytes();
     private static final byte[] TEST_HEADERS_BYTES = "200\r\nContent-Type: text/xml;charset=utf-8\r\n".getBytes();
     private static final byte[] TEST_ID_BYTES =
diff --git a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduitTest.java b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduitTest.java
index 5d3d05f..a9336b0 100644
--- a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduitTest.java
+++ b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduitTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertTrue;
 /**
  *
  */
-public class AhcWebSocketConduitTest extends Assert {
+public class AhcWebSocketConduitTest {
     private static final String TEST_RESPONSE1 =
         "200\r\nresponseId: 59610eed-d9de-4692-96d4-bb95a36c41ea\r\nContent-Type: text/plain\r\n\r\nHola!";
     private static final String TEST_RESPONSE2 =
diff --git a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestinationTest.java b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestinationTest.java
index d0d8f8f..64f5ca3 100644
--- a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestinationTest.java
+++ b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestinationTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertEquals;
 /**
  *
  */
-public class AtmosphereWebSocketJettyDestinationTest extends Assert {
+public class AtmosphereWebSocketJettyDestinationTest {
     private static final String ENDPOINT_ADDRESS = "ws://localhost:8080/websocket/nada";
     private static final QName ENDPOINT_NAME = new QName("urn:websocket:probe", "nada");
 
diff --git a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestinationTest.java b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestinationTest.java
index 31429a4..febd007 100644
--- a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestinationTest.java
+++ b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestinationTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertNull;
 /**
  *
  */
-public class AtmosphereWebSocketServletDestinationTest extends Assert {
+public class AtmosphereWebSocketServletDestinationTest {
     private static final String ENDPOINT_ADDRESS = "/websocket/nada";
     private static final QName ENDPOINT_NAME = new QName("urn:websocket:probe", "nada");
 
diff --git a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptorTest.java b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptorTest.java
index ace036a..c2744f8 100644
--- a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptorTest.java
+++ b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptorTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertEquals;
 /**
  *
  */
-public class DefaultProtocolInterceptorTest extends Assert {
+public class DefaultProtocolInterceptorTest {
 
     @Test
     public void testCreateResponseWithHeadersFiltering() throws Exception {
diff --git a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
index be9c7d2..d0f4bfc 100644
--- a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
+++ b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.assertNull;
 /**
  *
  */
-public class JettyWebSocketDestinationTest extends Assert {
+public class JettyWebSocketDestinationTest {
     private static final String ENDPOINT_ADDRESS = "ws://localhost:9001/websocket/nada";
     private static final QName ENDPOINT_NAME = new QName("urn:websocket:probe", "nada");
 
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingConstantsImplTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingConstantsImplTest.java
index fd582be..bc3bb54 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingConstantsImplTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingConstantsImplTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 
 
-public class AddressingConstantsImplTest extends Assert {
+public class AddressingConstantsImplTest {
     private AddressingConstants constants;
 
     @Before
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandlerTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandlerTest.java
index ea66e01..202fb92 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandlerTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
 /**
  *
  */
-public class WsBPHandlerTest extends Assert {
+public class WsBPHandlerTest {
     @Test
     public void testGetSchemaLocation() {
         WsBPHandler handler = new WsBPHandler();
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java
index 27952e6..04eaa10 100755
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java
@@ -55,7 +55,7 @@ import static org.junit.Assert.assertNull;
 /**
  *
  */
-public class ContextUtilsTest extends Assert {
+public class ContextUtilsTest {
     private static final QName WSA_ACTION_QNAME =
         new QName(JAXWSAConstants.NS_WSA, Names.WSAW_ACTION_NAME);
     private static final QName OLD_WSDL_WSA_ACTION_QNAME =
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
index a38f4ad..52e3206 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
@@ -90,7 +90,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-public class MAPAggregatorTest extends Assert {
+public class MAPAggregatorTest {
 
     private MAPAggregatorImpl aggregator;
     private IMocksControl control;
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java
index 2066c7c..1806f24 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-public class DecoupledFaultHandlerTest extends Assert {
+public class DecoupledFaultHandlerTest {
 
     @Test
     public void testOnewayFault() {
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
index 48dde49..ef6191a 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
@@ -71,7 +71,7 @@ import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class MAPCodecTest extends Assert {
+public class MAPCodecTest {
 
     private MAPCodec codec;
     private IMocksControl control;
diff --git a/rt/ws/mex/src/test/java/org/apache/cxf/ws/mex/MEXTest.java b/rt/ws/mex/src/test/java/org/apache/cxf/ws/mex/MEXTest.java
index 12655db..2c11da1 100644
--- a/rt/ws/mex/src/test/java/org/apache/cxf/ws/mex/MEXTest.java
+++ b/rt/ws/mex/src/test/java/org/apache/cxf/ws/mex/MEXTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertNotNull;
 /**
  *
  */
-public class MEXTest extends Assert {
+public class MEXTest {
     static Server server;
     static Server mexServer;
 
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java
index d144d2c..a034637 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.fail;
 /**
  *
  */
-public class AssertionBuilderRegistryImplTest extends Assert {
+public class AssertionBuilderRegistryImplTest {
 
     private IMocksControl control;
 
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java
index 3b0fed5..bb16a1a 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java
@@ -48,7 +48,7 @@ import static org.junit.Assert.fail;
 /**
  *
  */
-public class AssertionInfoMapTest extends Assert {
+public class AssertionInfoMapTest {
 
     private IMocksControl control;
 
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
index 21cd6a6..9f05cc3 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
@@ -54,7 +54,7 @@ import static org.junit.Assert.fail;
 /**
  *
  */
-public class EffectivePolicyImplTest extends Assert {
+public class EffectivePolicyImplTest {
 
     private IMocksControl control;
     private Message msg = new MessageImpl();
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
index 4f005eb..c0d83df 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
@@ -58,7 +58,7 @@ import static org.junit.Assert.fail;
 /**
  *
  */
-public class EndpointPolicyImplTest extends Assert {
+public class EndpointPolicyImplTest {
 
     private IMocksControl control;
 
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/IgnorablePolicyInterceptorProviderTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/IgnorablePolicyInterceptorProviderTest.java
index 8557796..bbdb3da 100755
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/IgnorablePolicyInterceptorProviderTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/IgnorablePolicyInterceptorProviderTest.java
@@ -48,7 +48,7 @@ import static org.junit.Assert.fail;
 /**
  *
  */
-public class IgnorablePolicyInterceptorProviderTest extends Assert {
+public class IgnorablePolicyInterceptorProviderTest {
     private static final QName ONEWAY_QNAME = new QName("http://tempuri.org/policy", "OneWay");
     private static final QName DUPLEX_QNAME = new QName("http://tempuri.org/policy", "Duplex");
 
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java
index f96df7a..e49f8af 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class NormalizeTest extends Assert {
+public class NormalizeTest {
 
     private IMocksControl control;
 
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyBuilderTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyBuilderTest.java
index ee2a738..fc2bc1a 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyBuilderTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyBuilderTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class PolicyBuilderTest extends Assert {
+public class PolicyBuilderTest {
 
     private PolicyBuilderImpl builder;
 
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java
index 23d8e30..6940810 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
 
-public class PolicyDataEngineImplTest extends Assert {
+public class PolicyDataEngineImplTest {
     private static final QName TEST_POLICY_NAME = new QName("http://test", "TestPolicy");
 
     class TestPolicy {
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
index 6399d8a..9077e60 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
@@ -67,7 +67,7 @@ import static org.junit.Assert.assertTrue;
 /**
  *
  */
-public class PolicyEngineTest extends Assert {
+public class PolicyEngineTest {
 
     private IMocksControl control;
     private PolicyEngineImpl engine;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java
index 62384fb..ad47c3e 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java
@@ -53,7 +53,7 @@ import static org.junit.Assert.assertTrue;
 /**
  *
  */
-public class PolicyExtensionsTest extends Assert {
+public class PolicyExtensionsTest {
 
     private static final QName KNOWN = new QName("http://cxf.apache.org/test/policy", "known");
     private static final QName KNOWN_DOMAIN_EXPR_TYPE
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java
index 8ec5754..47e5eb6 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertTrue;
 /**
  *
  */
-public class PolicyInterceptorProviderRegistryImplTest extends Assert {
+public class PolicyInterceptorProviderRegistryImplTest {
 
     private static final QName ASSERTION = new QName("testns", "test");
     private static final QName WRONG_ASSERTION = new QName("testns", "wrong");
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
index a43bc65..f1d476d 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
@@ -54,7 +54,7 @@ import static org.junit.Assert.assertSame;
 /**
  *
  */
-public class PolicyInterceptorsTest extends Assert {
+public class PolicyInterceptorsTest {
     private static final QName ASSERTION_QNAME = new QName("http://apache.cxf", "test");
 
     private IMocksControl control;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyRegistryImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyRegistryImplTest.java
index 67b1b83..365fea6 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyRegistryImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyRegistryImplTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertSame;
 /**
  *
  */
-public class PolicyRegistryImplTest extends Assert {
+public class PolicyRegistryImplTest {
 
     @Test
     public void testAll() {
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java
index 8f497f8..089a259 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
 /**
  *
  */
-public class PolicyVerificationInFaultInterceptorTest extends Assert {
+public class PolicyVerificationInFaultInterceptorTest {
 
     private IMocksControl control;
     private Bus bus;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java
index 270f120..be87028 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java
@@ -38,7 +38,7 @@ import org.junit.Test;
 /**
  *
  */
-public class PolicyVerificationInInterceptorTest extends Assert {
+public class PolicyVerificationInInterceptorTest {
 
     private IMocksControl control;
     private Bus bus;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java
index 8348fa8..b6fa205 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
 /**
  *
  */
-public class PolicyVerificationOutInterceptorTest extends Assert {
+public class PolicyVerificationOutInterceptorTest {
 
     private IMocksControl control;
 
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistryTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistryTest.java
index 148e134..ad36e25 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistryTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistryTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.fail;
 /**
  *
  */
-public class DomainExpressionBuilderRegistryTest extends Assert {
+public class DomainExpressionBuilderRegistryTest {
 
     private IMocksControl control;
 
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java
index 3ae5203..469085b 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertTrue;
 /**
  *
  */
-public class EndpointReferenceDomainExpressionTest extends Assert {
+public class EndpointReferenceDomainExpressionTest {
 
     private IMocksControl control;
 
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java
index 531ad1c..efba9c8 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java
@@ -60,7 +60,7 @@ import static org.junit.Assert.fail;
 /**
  *
  */
-public class ExternalAttachmentProviderTest extends Assert {
+public class ExternalAttachmentProviderTest {
 
     private static final QName TEST_ASSERTION_TYPE = new QName("http://a.b.c", "x");
 
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachmentTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachmentTest.java
index f1e9b81..b71443f 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachmentTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachmentTest.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertTrue;
 /**
  *
  */
-public class PolicyAttachmentTest extends Assert {
+public class PolicyAttachmentTest {
 
     private IMocksControl control;
 
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java
index b04c187..402e8bb 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.assertSame;
 /**
  *
  */
-public class ReferenceResolverTest extends Assert {
+public class ReferenceResolverTest {
 
     private IMocksControl control;
 
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java
index 1c983c8..43749d7 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java
@@ -68,7 +68,7 @@ import static org.junit.Assert.fail;
 /**
  *
  */
-public class Wsdl11AttachmentPolicyProviderTest extends Assert {
+public class Wsdl11AttachmentPolicyProviderTest {
 
     private static final String NAMESPACE_URI = "http://apache.org/cxf/calculator";
     private static final QName OPERATION_NAME = new QName(NAMESPACE_URI, "add");
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java
index a8411f3..a04eff2 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
 /**
  *
  */
-public class PolicyBPHandlerTest extends Assert {
+public class PolicyBPHandlerTest {
     @Test
     public void testGetSchemaLocation() {
         PolicyBPHandler handler = new PolicyBPHandler();
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java
index 8643d7e..ab16660 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.fail;
 /**
  *
  */
-public class JaxbAssertionBuilderTest extends Assert {
+public class JaxbAssertionBuilderTest {
 
     @Test
     public void testConstructors() throws Exception {
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java
index 47284d1..e56b085 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.assertTrue;
 /**
  *
  */
-public class JaxbAssertionTest extends Assert {
+public class JaxbAssertionTest {
 
     @Test
     public void testBasic() {
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/FirstAlternativeSelectorTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/FirstAlternativeSelectorTest.java
index a5f52fe..e1d59da 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/FirstAlternativeSelectorTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/FirstAlternativeSelectorTest.java
@@ -47,7 +47,7 @@ import static org.junit.Assert.assertSame;
 /**
  *
  */
-public class FirstAlternativeSelectorTest extends Assert {
+public class FirstAlternativeSelectorTest {
 
     private IMocksControl control;
 
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/MinimalMaximalAlternativeSelectorTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/MinimalMaximalAlternativeSelectorTest.java
index 5931ee7..dcbae33 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/MinimalMaximalAlternativeSelectorTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/MinimalMaximalAlternativeSelectorTest.java
@@ -47,7 +47,7 @@ import static org.junit.Assert.assertSame;
 /**
  *
  */
-public class MinimalMaximalAlternativeSelectorTest extends Assert {
+public class MinimalMaximalAlternativeSelectorTest {
 
     private IMocksControl control;
 
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java
index 76ecafb..d4be0d4 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class PolicyBeansTest extends Assert {
+public class PolicyBeansTest {
 
 
     @Test
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractEndpointTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractEndpointTest.java
index f31f174..b6ffef0 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractEndpointTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractEndpointTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertSame;
 /**
  *
  */
-public class AbstractEndpointTest extends Assert {
+public class AbstractEndpointTest {
 
     private IMocksControl control;
     private RMEndpoint rme;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java
index 571b252..574a0de 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java
@@ -49,7 +49,7 @@ import static org.junit.Assert.fail;
 /**
  *
  */
-public class AbstractRMInterceptorTest extends Assert {
+public class AbstractRMInterceptorTest {
 
     private IMocksControl control;
 
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractSequenceTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractSequenceTest.java
index f7d654d..73feb17 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractSequenceTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractSequenceTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
 
-public class AbstractSequenceTest extends Assert {
+public class AbstractSequenceTest {
 
     @Test
     public void testIdentifierEquals() {
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
index 63be848..0158636 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
@@ -54,7 +54,7 @@ import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class DestinationSequenceTest extends Assert {
+public class DestinationSequenceTest {
 
     private IMocksControl control;
     private ObjectFactory factory;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java
index 1bc76ce..d6fbd97 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.fail;
 /**
  *
  */
-public class DestinationTest extends Assert {
+public class DestinationTest {
 
     private IMocksControl control;
     private RMEndpoint rme;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java
index f8f2c03..e3f61b9 100755
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java
@@ -65,7 +65,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class ManagedRMManagerTest extends Assert {
+public class ManagedRMManagerTest {
     private static final String TEST_URI = "http://nowhere.com/bar/foo";
     private IMocksControl control;
 
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProtocolVariationTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProtocolVariationTest.java
index a087ff5..dd3a73f 100755
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProtocolVariationTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProtocolVariationTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertNull;
 /**
  *
  */
-public class ProtocolVariationTest extends Assert {
+public class ProtocolVariationTest {
 
     @Test
     public void testFindVariant() {
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
index 5cdfafc..6ce0826 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
@@ -68,7 +68,7 @@ import static org.junit.Assert.assertSame;
 /**
  *
  */
-public class ProxyTest extends Assert {
+public class ProxyTest {
 
     private IMocksControl control;
     private RMEndpoint rme;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java
index 3fe86d2..840d5ff 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertTrue;
 /**
  *
  */
-public class RMContextUtilsTest extends Assert {
+public class RMContextUtilsTest {
 
     private IMocksControl control;
 
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java
index 3263e6e..085514d 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java
@@ -61,7 +61,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-public class RMEndpointTest extends Assert {
+public class RMEndpointTest {
 
     private IMocksControl control;
     private RMManager manager;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
index 0996765..ba86e35 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
@@ -58,7 +58,7 @@ import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class RMInInterceptorTest extends Assert {
+public class RMInInterceptorTest {
 
     private IMocksControl control;
     private RMInInterceptor interceptor;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerConfigurationTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerConfigurationTest.java
index 0af2b89..b50c814 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerConfigurationTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerConfigurationTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertTrue;
 /**
  *
  */
-public class RMManagerConfigurationTest extends Assert {
+public class RMManagerConfigurationTest {
 
     private Bus bus;
 
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
index b84b4e5..3cc3e6a 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
@@ -79,7 +79,7 @@ import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class RMManagerTest extends Assert {
+public class RMManagerTest {
 
     private static final String MULTIPART_TYPE = "multipart/related; type=\"text/xml\";"
         + " boundary=\"uuid:74b6a245-2e17-40eb-a86c-308664e18460\"; start=\"<root."
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
index 1a73834..23a97fc 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
@@ -42,7 +42,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class RMOutInterceptorTest extends Assert {
+public class RMOutInterceptorTest {
 
     private IMocksControl control;
 
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java
index 64d24ed..fa4bcb6 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertEquals;
 /**
  *
  */
-public class RMUtilsTest extends Assert {
+public class RMUtilsTest {
 
     private IMocksControl control;
 
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
index 646c2c4..46601a5 100755
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
@@ -61,7 +61,7 @@ import static org.junit.Assert.assertTrue;
 /**
  *
  */
-public class ServantTest extends Assert {
+public class ServantTest {
     private static final String SERVICE_URL = "http://localhost:9000/SoapContext/GreeterPort";
     private static final String DECOUPLED_URL = "http://localhost:9990/decoupled_endpoint";
 
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java
index f073fac..f9faf21 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-public class SourceSequenceTest extends Assert {
+public class SourceSequenceTest {
 
     private IMocksControl control;
     private ObjectFactory factory;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/blueprint/RMBPHandlerTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/blueprint/RMBPHandlerTest.java
index c20b724..d059e6a 100755
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/blueprint/RMBPHandlerTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/blueprint/RMBPHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
 /**
  *
  */
-public class RMBPHandlerTest extends Assert {
+public class RMBPHandlerTest {
     @Test
     public void testGetSchemaLocation() {
         RMBPHandler handler = new RMBPHandler();
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/PersistenceUtilsTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/PersistenceUtilsTest.java
index a359348..27d81bd 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/PersistenceUtilsTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/PersistenceUtilsTest.java
@@ -48,7 +48,7 @@ import static org.junit.Assert.assertTrue;
 /**
  *
  */
-public class PersistenceUtilsTest extends Assert {
+public class PersistenceUtilsTest {
 
     private static final String MULTIPART_TYPE = "multipart/related; type=\"text/xml\";"
         + " boundary=\"uuid:74b6a245-2e17-40eb-a86c-308664e18460\"; start=\"<root."
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/RMMessageTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/RMMessageTest.java
index def0ebe..13dffd7 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/RMMessageTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/RMMessageTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertEquals;
 /**
  *
  */
-public class RMMessageTest extends Assert {
+public class RMMessageTest {
     private static final byte[] DATA =
         ("<greetMe xmlns=\"http://cxf.apache.org/greeter_control/types\">"
         + "<requestType>one</requestType></greetMe>").getBytes();
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
index 9d7a92e..476c41e 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertTrue;
 /**
  *
  */
-public class RMTxStoreConfigurationTest extends Assert {
+public class RMTxStoreConfigurationTest {
 
     @Test
     public void testTxStoreBean() {
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java
index b488be2..98fde43 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java
@@ -58,7 +58,7 @@ import static org.junit.Assert.fail;
 /**
  *
  */
-public abstract class RMTxStoreTestBase extends Assert {
+public abstract class RMTxStoreTestBase {
     protected static RMTxStore store;
 
     protected static final String CLIENT_ENDPOINT_ID =
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTwoSchemasTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTwoSchemasTest.java
index fbcf7d7..aec24a5 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTwoSchemasTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTwoSchemasTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertNull;
 /**
  *
  */
-public class RMTxStoreTwoSchemasTest extends Assert {
+public class RMTxStoreTwoSchemasTest {
     private static final String TEST_DB_NAME = "rmdbts";
 
     private static final String CLIENT_ENDPOINT_ID =
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreUpgradeTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreUpgradeTest.java
index 6cc039d..16ee676 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreUpgradeTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreUpgradeTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertEquals;
  * Tests the automatic table updating of RMTxStore that allows compatible changes
  * in the database tables.
  */
-public class RMTxStoreUpgradeTest extends Assert {
+public class RMTxStoreUpgradeTest {
     private static final String CREATE_OLD_SRC_SEQ_TABLE_STMT =
         "CREATE TABLE CXF_RM_SRC_SEQUENCES "
         + "(SEQ_ID VARCHAR(256) NOT NULL, "
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java
index 8908280..e80d61f 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java
@@ -49,7 +49,7 @@ import static org.junit.Assert.assertTrue;
 /**
  *
  */
-public class PolicyUtilsTest extends Assert {
+public class PolicyUtilsTest {
 
     private IMocksControl control;
 
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInInterceptorTest.java
index 18afc00..30f7137 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInInterceptorTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInInterceptorTest.java
@@ -51,7 +51,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class RMSoapInInterceptorTest extends Assert {
+public class RMSoapInInterceptorTest {
 
     private static final String SEQ_IDENTIFIER = "http://Business456.com/RM/ABC";
     private static final Long ONE = Long.valueOf(1);
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java
index 71bce8f..0d27d81 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java
@@ -58,7 +58,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
 
-public class RMSoapOutInterceptorTest extends Assert {
+public class RMSoapOutInterceptorTest {
 
     private static final Long ONE = Long.valueOf(1);
     private static final Long TEN = Long.valueOf(10);
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
index 5f5e7aa..8cdb216 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
@@ -58,7 +58,7 @@ import static org.junit.Assert.assertTrue;
 /**
  * Test resend logic.
  */
-public class RetransmissionQueueImplTest extends Assert {
+public class RetransmissionQueueImplTest {
     private static final Long ONE = Long.valueOf(1);
     private static final Long TWO = Long.valueOf(2);
     private static final Long TEN = Long.valueOf(10);
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java
index 4a0103d..1f890f6 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java
@@ -51,7 +51,7 @@ import static org.junit.Assert.assertSame;
 /**
  *
  */
-public class SoapFaultFactoryTest extends Assert {
+public class SoapFaultFactoryTest {
 
     private IMocksControl control;
     private SequenceFault sf;
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java
index b09dbcb..31d3f31 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
-public class EHCacheUtilsTest extends Assert {
+public class EHCacheUtilsTest {
     @Test
     public void testUseGlobalManager() {
         Bus bus = BusFactory.getThreadDefaultBus();
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java
index 2de43fc..ec1d5e2 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java
@@ -57,7 +57,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class STSClientTest extends Assert {
+public class STSClientTest {
 
     @Test
     public void testConfigureViaEPR() throws Exception {
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/trust/AuthPolicyValidatingInterceptorTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/trust/AuthPolicyValidatingInterceptorTest.java
index da6d3e1..a9acfa5 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/trust/AuthPolicyValidatingInterceptorTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/trust/AuthPolicyValidatingInterceptorTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class AuthPolicyValidatingInterceptorTest extends Assert {
+public class AuthPolicyValidatingInterceptorTest {
 
     @Test
     public void testValidateAuthorizationPolicy() throws Exception {
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java
index 0ba2c11..e5a1370 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java
@@ -49,7 +49,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class JAXBExtensionHelperTest extends Assert {
+public class JAXBExtensionHelperTest {
 
     private WSDLFactory wsdlFactory;
 
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java
index 579d9d3..01bf05e 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java
@@ -64,7 +64,7 @@ import static org.junit.Assert.assertEquals;
  * Unit test for testing DocLiteralInInterceptor to use Source Data Binding
  *
  */
-public class DocLiteralInInterceptorTest extends Assert {
+public class DocLiteralInInterceptorTest {
 
     private static final String NS = "http://cxf.apache.org/wsdl-first/types";
     protected IMocksControl control;
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java
index 8e07191..06e718d 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.fail;
 /**
  *
  */
-public class ReflectionServiceFactorBeanTest extends Assert {
+public class ReflectionServiceFactorBeanTest {
     protected IMocksControl control;
 
     @Before
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/NSManagerTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/NSManagerTest.java
index e7f4fef..56f41ee 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/NSManagerTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/NSManagerTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class NSManagerTest extends Assert {
+public class NSManagerTest {
     @Test
     public void testGetPrefix() {
         NSManager nsMan = new NSManager();
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
index e0c3bac..c72bc21 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
@@ -73,7 +73,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class ServiceWSDLBuilderTest extends Assert {
+public class ServiceWSDLBuilderTest {
 
     private static final Logger LOG = LogUtils.getLogger(ServiceWSDLBuilderTest.class);
     private static final String WSDL_PATH = "hello_world.wsdl";
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java
index 8d900a2..9fc1ba1 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class WSDLManagerImplTest extends Assert {
+public class WSDLManagerImplTest {
 
     @Test
     public void testBuildSimpleWSDL() throws Exception {
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
index bad0072..49d4664 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
@@ -79,7 +79,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class WSDLServiceBuilderTest extends Assert {
+public class WSDLServiceBuilderTest {
     // TODO: reuse the wsdl in testutils and add the parameter order into one of the wsdl
     private static final Logger LOG = LogUtils.getLogger(WSDLServiceBuilderTest.class);
     private static final String WSDL_PATH = "hello_world.wsdl";
diff --git a/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointAPITest.java b/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointAPITest.java
index a681b37..f604512 100644
--- a/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointAPITest.java
+++ b/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointAPITest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 
-public class EndpointAPITest extends Assert {
+public class EndpointAPITest {
 
     private static int counter;
     private static int currentPort;
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java
index 0755354..f22de8a 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java
@@ -51,7 +51,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class OASISCatalogTest extends Assert {
+public class OASISCatalogTest {
     static final String PORT = TestUtil.getPortNumber(OASISCatalogTest.class);
 
     private final QName serviceName =
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/schemavalidation/JavaFirstSchemaValidationTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/schemavalidation/JavaFirstSchemaValidationTest.java
index 845fb2b..13a42e6 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/schemavalidation/JavaFirstSchemaValidationTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/schemavalidation/JavaFirstSchemaValidationTest.java
@@ -51,7 +51,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class JavaFirstSchemaValidationTest extends Assert {
+public class JavaFirstSchemaValidationTest {
     static final String PORT = TestUtil.getNewPortNumber(JavaFirstSchemaValidationTest.class);
     static final String PORT2 = TestUtil.getNewPortNumber(JavaFirstSchemaValidationTest.class);
     static final String PORT_UNUSED = TestUtil.getNewPortNumber(JavaFirstSchemaValidationTest.class);
diff --git a/systests/microprofile/client/async/src/test/java/org/apache/cxf/systest/microprofile/rest/client/AsyncMethodTest.java b/systests/microprofile/client/async/src/test/java/org/apache/cxf/systest/microprofile/rest/client/AsyncMethodTest.java
index 988472f..4ffd4a0 100644
--- a/systests/microprofile/client/async/src/test/java/org/apache/cxf/systest/microprofile/rest/client/AsyncMethodTest.java
+++ b/systests/microprofile/client/async/src/test/java/org/apache/cxf/systest/microprofile/rest/client/AsyncMethodTest.java
@@ -52,7 +52,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static org.junit.Assert.assertEquals;
 //CHECKSTYLE:ON
 
-public class AsyncMethodTest extends Assert {
+public class AsyncMethodTest {
 
     @Rule
     public WireMockRule wireMockRule = new WireMockRule(WireMockConfiguration.options().dynamicPort());
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java
index 8d3db8b..5ada08a 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 
-public class PublishedEndpointUrlTest extends Assert {
+public class PublishedEndpointUrlTest {
     public static final String PORT = TestUtil.getPortNumber(PublishedEndpointUrlTest.class);
 
 
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
index 0383a4b..e17b40f 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
@@ -59,7 +59,7 @@ import static org.junit.Assert.fail;
  * This class tests starting up and shutting down the embedded server when there
  * is extra jetty configuration.
  */
-public class EngineLifecycleTest extends Assert {
+public class EngineLifecycleTest {
     private static final String PORT1 = TestUtil.getPortNumber(EngineLifecycleTest.class, 1);
     private static final String PORT2 = TestUtil.getPortNumber(EngineLifecycleTest.class, 2);
     private GenericApplicationContext applicationContext;
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
index 2ad9de4..0982f01 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
@@ -40,7 +40,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertNotNull;
 
-public class BusExtensionLoadingTest extends Assert {
+public class BusExtensionLoadingTest {
 
     /**
      * Tests the ExtensionManagerBus can be built using a given classloader
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java
index 20c6c5e..8b16ff2 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java
@@ -44,7 +44,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertNotNull;
 
-public class BusShutdownTest extends Assert {
+public class BusShutdownTest {
     public static final String PORT = TestUtil.getPortNumber(BusShutdownTest.class);
 
     @Test
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java
index 6b20c8f..ec66ae0 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java
@@ -40,7 +40,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertNotNull;
 
 
-public class SpringBusFactoryTest extends Assert {
+public class SpringBusFactoryTest {
 
     @Test
     public void testKnownExtensions() throws BusException {
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/AbstractColocTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/AbstractColocTest.java
index cc8c84b..4822e6d 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/AbstractColocTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/AbstractColocTest.java
@@ -39,7 +39,7 @@ import org.junit.Before;
 
 import static org.junit.Assert.assertNotNull;
 
-public abstract class AbstractColocTest extends Assert {
+public abstract class AbstractColocTest {
     public static final String PORT = TestUtil.getPortNumber(AbstractColocTest.class);
 
     /**
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterImpl.java
index e326b91..f05d765 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterImpl.java
@@ -55,7 +55,7 @@ import static org.junit.Assert.assertEquals;
         wsdlLocation = "classpath:/wsdl_systest/hello_world_corba.wsdl",
         endpointInterface = "org.apache.cxf.hello_world_corba.Greeter")
 
-public class BaseGreeterImpl extends Assert implements Greeter {
+public class BaseGreeterImpl implements Greeter {
     public static final String GREETME_IN = "test in";
     public static final String GREETME_OUT = "test out";
     static final String EX_STRING = "CXF RUNTIME EXCEPTION";
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java
index 051d96d..7882c31 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java
@@ -55,7 +55,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-public class LifeCycleTest extends Assert {
+public class LifeCycleTest {
     public static final String PORT1 = TestUtil.getPortNumber(LifeCycleTest.class, 1);
     public static final String PORT2 = TestUtil.getPortNumber(LifeCycleTest.class, 2);
     public static final String PORT3 = TestUtil.getPortNumber(LifeCycleTest.class, 3);
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java
index ea7427a..6623871 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class ManagedBusTest extends Assert {
+public class ManagedBusTest {
     public static final String JMX_PORT1 = TestUtil.getPortNumber(ManagedBusTest.class, 1);
     public static final String JMX_PORT2 = TestUtil.getPortNumber(ManagedBusTest.class, 3);
     public static final String SERVICE_PORT = TestUtil.getPortNumber(ManagedBusTest.class, 4);
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/simple/SimpleFrontendTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/simple/SimpleFrontendTest.java
index 26a5095..e1c0b8b 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/simple/SimpleFrontendTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/simple/SimpleFrontendTest.java
@@ -37,7 +37,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertFalse;
 
-public class SimpleFrontendTest extends Assert {
+public class SimpleFrontendTest {
     static final String PORT1 = TestUtil.getPortNumber(SimpleFrontendTest.class);
 
 
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/SoapActionTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/SoapActionTest.java
index 9ac7cdc..f1642c7 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/SoapActionTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/SoapActionTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-public class SoapActionTest extends Assert {
+public class SoapActionTest {
     static final String PORT1 = TestUtil.getPortNumber(SoapActionTest.class, 1);
     static final String PORT2 = TestUtil.getPortNumber(SoapActionTest.class, 2);
     static final String PORT3 = TestUtil.getPortNumber(SoapActionTest.class, 3);
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
index 4a821d7..e42d57a 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class MessageFlow extends Assert {
+public class MessageFlow {
 
     private final String addressingNamespace;
     private final String rmNamespace;
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
index 4a821d7..e42d57a 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class MessageFlow extends Assert {
+public class MessageFlow {
 
     private final String addressingNamespace;
     private final String rmNamespace;
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java b/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
index a900493..7a260a6 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
@@ -50,13 +50,15 @@ import org.apache.cxf.tools.util.ToolsStaxUtils;
 import org.apache.ws.commons.schema.constants.Constants;
 
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.ComparisonFailure;
 import org.junit.Rule;
 import org.junit.rules.TemporaryFolder;
 
-public class ProcessorTestBase extends Assert {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class ProcessorTestBase {
 
     public static final List<String> DEFAULT_IGNORE_ATTR = Arrays.asList(new String[]{"attributeFormDefault",
                                                                                       "elementFormDefault",
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java
index b69e277..ae005b0 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java
@@ -29,7 +29,7 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 
-public abstract class ToolTestBase extends Assert {
+public abstract class ToolTestBase {
 
     protected PrintStream oldStdErr;
     protected PrintStream oldStdOut;
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/ProcessorEnvironmentTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/ProcessorEnvironmentTest.java
index f973577..9a0d2b0 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/ProcessorEnvironmentTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/ProcessorEnvironmentTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class ProcessorEnvironmentTest extends Assert {
+public class ProcessorEnvironmentTest {
     @Test
     public void testGet() {
         Map<String, Object> map = new HashMap<>();
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/ToolContextTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/ToolContextTest.java
index 64e5eef..648f3c7 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/ToolContextTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/ToolContextTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
 
-public class ToolContextTest extends Assert {
+public class ToolContextTest {
 
     ToolContext context = new ToolContext();
 
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java
index 3eaf5d8..bc66577 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class WSDLVersionTest extends Assert {
+public class WSDLVersionTest {
 
     @Test
     public void testWSDLVersion() {
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/dom/ExtendedDocumentBuilderTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/dom/ExtendedDocumentBuilderTest.java
index 6845186..29cc7b6 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/dom/ExtendedDocumentBuilderTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/dom/ExtendedDocumentBuilderTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-public class ExtendedDocumentBuilderTest extends Assert {
+public class ExtendedDocumentBuilderTest {
     @Test
     public void testMassMethod() throws Exception {
         ExtendedDocumentBuilder builder = new ExtendedDocumentBuilder();
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JAnnotationTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JAnnotationTest.java
index c461670..82c77ff 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JAnnotationTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JAnnotationTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class JAnnotationTest extends Assert {
+public class JAnnotationTest {
     @Test
     public void testList() throws Exception {
         JAnnotation annotation = new JAnnotation(XmlSeeAlso.class);
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaClassTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaClassTest.java
index 817010f..7e69323 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaClassTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaClassTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class JavaClassTest extends Assert {
+public class JavaClassTest {
     @Test
     public void testGetterSetter() throws Exception {
         JavaField field = new JavaField("arg0",
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaInterfaceTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaInterfaceTest.java
index 2441d06..9ef5509 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaInterfaceTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaInterfaceTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class JavaInterfaceTest extends Assert {
+public class JavaInterfaceTest {
     @Test
     public void testSetFullClassName() throws Exception {
         String fullName = "org.apache.cxf.tools.common.model.JavaInterface";
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaParameterTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaParameterTest.java
index 33bbe28..8d24dd4 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaParameterTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaParameterTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class JavaParameterTest extends Assert {
+public class JavaParameterTest {
 
     @Test
     public void testGetHolderDefaultTypeValue() throws Exception {
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaTypeTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaTypeTest.java
index 8fe3d2d..b972e79 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaTypeTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaTypeTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class JavaTypeTest extends Assert {
+public class JavaTypeTest {
     @Test
     public void testGetPredefinedDefaultTypeValue() throws Exception {
         assertEquals("0", new JavaType("i", int.class.getName(), null).getDefaultTypeValue());
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/AbstractToolContainerTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/AbstractToolContainerTest.java
index 27c39ac..c572dac 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/AbstractToolContainerTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/AbstractToolContainerTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class AbstractToolContainerTest extends Assert {
+public class AbstractToolContainerTest {
     private DummyToolContainer dummyTool;
 
     @Before
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolExceptionTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolExceptionTest.java
index 45f440c..62dfb71 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolExceptionTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolExceptionTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class ToolExceptionTest extends Assert {
+public class ToolExceptionTest {
     @Test
     public void testMassMethod() {
         ToolException e = new ToolException("e");
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSpecTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSpecTest.java
index c62c2e9..8dd971f 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSpecTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSpecTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class ToolSpecTest extends Assert {
+public class ToolSpecTest {
     ToolSpec toolSpec;
 
     @Test
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSupportTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSupportTest.java
index 0e60955..1b180fa 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSupportTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSupportTest.java
@@ -24,7 +24,7 @@ import org.apache.cxf.tools.common.ToolException;
 import org.junit.Assert;
 import org.junit.Test;
 
-public class ToolSupportTest extends Assert {
+public class ToolSupportTest {
 
     @Test
     public void testProtect() throws ToolException {
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
index 4d49fa3..515f208 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class CommandLineParserTest extends Assert {
+public class CommandLineParserTest {
     private CommandLineParser parser;
 
     @Before
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/util/BuiltInTypesJavaMappingUtilTest.java b/tools/common/src/test/java/org/apache/cxf/tools/util/BuiltInTypesJavaMappingUtilTest.java
index d98c165..dc8eb1a 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/util/BuiltInTypesJavaMappingUtilTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/util/BuiltInTypesJavaMappingUtilTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 
 
-public class BuiltInTypesJavaMappingUtilTest extends Assert {
+public class BuiltInTypesJavaMappingUtilTest {
     private final String xmlSchemaNS = "http://www.w3.org/2000/10/XMLSchema";
 
     @Test
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/util/FileWriterUtilTest.java b/tools/common/src/test/java/org/apache/cxf/tools/util/FileWriterUtilTest.java
index 99d5c8b..4623ace 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/util/FileWriterUtilTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/util/FileWriterUtilTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertNotNull;
 
-public class FileWriterUtilTest extends Assert {
+public class FileWriterUtilTest {
 
     private void cleanDir(File dir) {
         try {
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/util/NameUtilTest.java b/tools/common/src/test/java/org/apache/cxf/tools/util/NameUtilTest.java
index 20eb0ea..dfad463 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/util/NameUtilTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/util/NameUtilTest.java
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
 
-public class NameUtilTest extends Assert {
+public class NameUtilTest {
 
     @Test
     public void testMangleToClassName() {
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java b/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java
index f255787..4d3bc74 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 
-public class URIParserUtilTest extends Assert {
+public class URIParserUtilTest {
 
     @Test
     public void testGetPackageName() {
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/ToolTestBase.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/ToolTestBase.java
index cec434a..9e9ba94 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/ToolTestBase.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/ToolTestBase.java
@@ -27,7 +27,7 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 
-public abstract class ToolTestBase extends Assert {
+public abstract class ToolTestBase {
 
     protected PrintStream oldStdErr;
     protected PrintStream oldStdOut;
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java
index cdfda6b..82a501b 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class IdlPreprocessorReaderTest extends Assert {
+public class IdlPreprocessorReaderTest {
 
     private URL findTestResource(String spec) {
         String location = "/idlpreprocessor/" + spec;
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java
index 5d56fc9..0ad4cc0 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java
@@ -69,7 +69,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class WSDLToCorbaBindingTest extends Assert {
+public class WSDLToCorbaBindingTest {
     WSDLToCorbaBinding generator;
     WSDLWriter writer;
 
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
index 66cdfce..c1e7e8c 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
@@ -60,7 +60,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class WSDLToCorbaBindingTypeTest extends Assert {
+public class WSDLToCorbaBindingTypeTest {
     WSDLToCorbaBinding generator;
     WSDLWriter writer;
 
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
index e0273ed..d68a68a 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
@@ -38,7 +38,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class WSDLToIDLGenerationTest extends Assert {
+public class WSDLToIDLGenerationTest {
 
     protected static final String START_COMMENT = "/*";
     protected static final String END_COMMENT = "*/";
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java
index 212bc9f..c68375e 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class WSDLGeneratorFactoryTest extends Assert {
+public class WSDLGeneratorFactoryTest {
 
     @Test
     public void testNewWSDL11Generator() {
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotatorTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotatorTest.java
index 2832951..3752223 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotatorTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotatorTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class WrapperBeanAnnotatorTest extends Assert {
+public class WrapperBeanAnnotatorTest {
 
     @Test
     public void testAnnotate() {
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanFieldAnnotatorTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanFieldAnnotatorTest.java
index 3258c57..38c22f0 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanFieldAnnotatorTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanFieldAnnotatorTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class WrapperBeanFieldAnnotatorTest extends Assert {
+public class WrapperBeanFieldAnnotatorTest {
 
     @Test
     public void testAnnotate() {
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactoryTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactoryTest.java
index 9ce15f2..9f54879 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactoryTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactoryTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class FrontendFactoryTest extends Assert {
+public class FrontendFactoryTest {
 
     FrontendFactory factory = FrontendFactory.getInstance();
 
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactoryTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactoryTest.java
index b947271..0e296f0 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactoryTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactoryTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class ServiceBuilderFactoryTest extends Assert {
+public class ServiceBuilderFactoryTest {
     ServiceBuilderFactory factory = ServiceBuilderFactory.getInstance(new ArrayList<>(),
                                                                       "jaxb");
 
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java
index e4de89d..11f3107 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-public class FaultBeanTest extends Assert {
+public class FaultBeanTest {
 
     @Test
     public void testTransform() throws Exception {
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java
index 09002db..52bd6b5 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class RequestWrapperTest extends Assert {
+public class RequestWrapperTest {
     JaxwsServiceBuilder builder = new JaxwsServiceBuilder();
 
     private OperationInfo getOperation(Class<?> clz, String opName) {
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapperTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapperTest.java
index b00e082..b8acb26 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapperTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapperTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-public class ResponseWrapperTest extends Assert {
+public class ResponseWrapperTest {
     JaxwsServiceBuilder builder = new JaxwsServiceBuilder();
 
     private OperationInfo getOperation(Class<?> clz, String opName) {
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperTest.java
index 4a239da..8d415a9 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class WrapperTest extends Assert {
+public class WrapperTest {
     @Test
     public void testGetWrapperBeanClassFromQName() {
         QName qname = new QName("http://cxf.apache.org", "sayHi");
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperUtilTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperUtilTest.java
index 899b302..8d075cd 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperUtilTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperUtilTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class WrapperUtilTest extends Assert {
+public class WrapperUtilTest {
     String pkgName = "org.apache.cxf.tools.fortest.classnoanno.docwrapped";
     Class<?> stockClass;
     Method method;
diff --git a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java
index 5dba9bd..64d230c 100644
--- a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java
+++ b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
 
-public class Stax2DOMTest extends Assert {
+public class Stax2DOMTest {
 
     @Test
     public void testGetDocument() throws Exception {
diff --git a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDL11ValidatorTest.java b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDL11ValidatorTest.java
index da0ffc5..ded5296 100644
--- a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDL11ValidatorTest.java
+++ b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDL11ValidatorTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class WSDL11ValidatorTest extends Assert {
+public class WSDL11ValidatorTest {
     private ToolContext context = new ToolContext();
 
     @Test
diff --git a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java
index ff18d00..f1fe486 100644
--- a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java
+++ b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class WSDLRefValidatorTest extends Assert {
+public class WSDLRefValidatorTest {
 
     private Definition getWSDL(String wsdl) throws Exception {
         Bus b = BusFactory.getDefaultBus();
diff --git a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/model/XNodeTest.java b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/model/XNodeTest.java
index 6d776b6..8ec9bad 100644
--- a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/model/XNodeTest.java
+++ b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/model/XNodeTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class XNodeTest extends Assert {
+public class XNodeTest {
     @Test
     public void testWSDLDefinition() {
         XDef def = new XDef();
diff --git a/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java b/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java
index d6172c8..d27bedc 100644
--- a/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java
+++ b/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class WSDLToJavaContainerTest extends Assert {
+public class WSDLToJavaContainerTest {
 
     @Test
     public void testNoPlugin() throws Exception {
diff --git a/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilderTest.java b/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilderTest.java
index 4840196..00bcb82 100644
--- a/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilderTest.java
+++ b/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilderTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-public class WSDLDefinitionBuilderTest extends Assert {
+public class WSDLDefinitionBuilderTest {
     @BeforeClass
     public static void ensureNewBus() {
         BusFactory.setDefaultBus(null);
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java
index 98fc275..3a3847b 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class CatalogTest extends Assert {
+public class CatalogTest {
     @Test
     public void testCatalog() throws Exception {
         OASISCatalogManager catalogManager = new OASISCatalogManager();
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java
index 447ff27..21b3f4f 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class JAXWSProfileTest extends Assert {
+public class JAXWSProfileTest {
 
     @Test
     public void testLoadPlugins() {
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessorTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessorTest.java
index f867bfd..34ad03d 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessorTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessorTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class ParameterProcessorTest extends Assert {
+public class ParameterProcessorTest {
     @Test
     public void testAddParameter() throws Exception {
         ParameterProcessor processor = new ParameterProcessor(new ToolContext());
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessorTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessorTest.java
index 6d70edd..8c917db 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessorTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessorTest.java
@@ -23,7 +23,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 
-public class PortTypeProcessorTest extends Assert {
+public class PortTypeProcessorTest {
 
     @Test
     public void testProcess() throws Exception {
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtilTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtilTest.java
index 3a873a3..0f8f084 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtilTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtilTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 
 
-public class ProcessorUtilTest extends Assert {
+public class ProcessorUtilTest {
 
     private boolean isWindows() {
         return System.getProperty("os.name").contains("Windows");
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebMethodAnnotatorTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebMethodAnnotatorTest.java
index eced9c0..1f3969f 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebMethodAnnotatorTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebMethodAnnotatorTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-public class WebMethodAnnotatorTest extends Assert {
+public class WebMethodAnnotatorTest {
 
     @Test
     public void testAddWebMethodAnnotation() throws Exception {
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotatorTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotatorTest.java
index f4e83ec..e75a497 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotatorTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotatorTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class WebParamAnnotatorTest extends Assert {
+public class WebParamAnnotatorTest {
 
     JavaMethod method;
     JavaParameter parameter;
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlSeeAlsoAnnotatorTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlSeeAlsoAnnotatorTest.java
index 09dd2fd..2dbf5f5 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlSeeAlsoAnnotatorTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlSeeAlsoAnnotatorTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
-public class XmlSeeAlsoAnnotatorTest extends Assert {
+public class XmlSeeAlsoAnnotatorTest {
 
     @Test
     public void testAddXmlSeeAlsoAnnotation() throws Exception {
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/InterfaceMapperTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/InterfaceMapperTest.java
index ff563dc..fcbbfcb 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/InterfaceMapperTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/InterfaceMapperTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-public class InterfaceMapperTest extends Assert {
+public class InterfaceMapperTest {
 
     @Test
     public void testMap() throws Exception {
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/MethodMapperTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/MethodMapperTest.java
index f02c618..968f2df 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/MethodMapperTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/MethodMapperTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class MethodMapperTest extends Assert {
+public class MethodMapperTest {
 
     private OperationInfo getOperation() {
         OperationInfo operation = new OperationInfo();
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
index 2903081..1302103 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
@@ -41,7 +41,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class JAXWSDefinitionBuilderTest extends Assert {
+public class JAXWSDefinitionBuilderTest {
     private ToolContext env;
 
     @Before
diff --git a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaTest.java b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaTest.java
index 4b18237..7f52e4e 100644
--- a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaTest.java
+++ b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 
-public class WSDLToJavaTest extends Assert {
+public class WSDLToJavaTest {
 
     @Test
     public void testGetFrontEndName() throws Exception {
diff --git a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java
index 98bffd5..5119a76 100644
--- a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java
+++ b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-public class PluginLoaderTest extends Assert {
+public class PluginLoaderTest {
 
     @Test
     public void testLoadPlugins() throws Exception {
diff --git a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
index 2e5a417..5674405 100644
--- a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
+++ b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class JAXWSDefinitionBuilderTest extends Assert {
+public class JAXWSDefinitionBuilderTest {
     private ToolContext env;
 
     @Before