You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ni...@apache.org on 2018/05/21 14:02:27 UTC

[6/6] ignite git commit: IGNITE-8266: stopAllGrids in afterAllTests removed. - Fixes #3844.

IGNITE-8266: stopAllGrids in afterAllTests removed. - Fixes #3844.

Signed-off-by: Nikolay Izhikov <ni...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/eb8038f6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/eb8038f6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/eb8038f6

Branch: refs/heads/master
Commit: eb8038f65285559c5424eba2882b0de0583ea7af
Parents: 4343b2f
Author: Maxim Muzafarov <ma...@gmail.com>
Authored: Mon May 21 16:55:08 2018 +0300
Committer: Nikolay Izhikov <ni...@apache.org>
Committed: Mon May 21 16:55:08 2018 +0300

----------------------------------------------------------------------
 .../optimized/OptimizedMarshallerAopTest.java      |  7 -------
 .../internal/TaskEventSubjectIdSelfTest.java       |  2 --
 .../ClientAbstractMultiThreadedSelfTest.java       |  5 -----
 .../client/ClientDefaultCacheSelfTest.java         |  2 --
 .../ClientAbstractMultiNodeSelfTest.java           |  7 -------
 .../client/integration/ClientAbstractSelfTest.java |  5 -----
 .../integration/ClientPreferDirectSelfTest.java    |  7 -------
 .../client/router/TcpRouterAbstractSelfTest.java   |  2 --
 .../client/router/TcpRouterMultiNodeSelfTest.java  |  2 --
 .../jdbc2/JdbcAbstractDmlStatementSelfTest.java    |  5 -----
 .../internal/jdbc2/JdbcBulkLoadSelfTest.java       |  5 -----
 .../internal/jdbc2/JdbcComplexQuerySelfTest.java   |  5 -----
 .../internal/jdbc2/JdbcConnectionSelfTest.java     |  5 -----
 .../jdbc2/JdbcDistributedJoinsQueryTest.java       |  5 -----
 .../internal/jdbc2/JdbcEmptyCacheSelfTest.java     |  5 -----
 .../internal/jdbc2/JdbcLocalCachesSelfTest.java    |  5 -----
 .../internal/jdbc2/JdbcMetadataSelfTest.java       |  5 -----
 .../jdbc2/JdbcNoCacheStreamingSelfTest.java        |  5 -----
 .../internal/jdbc2/JdbcNoDefaultCacheTest.java     |  5 -----
 .../jdbc2/JdbcPreparedStatementSelfTest.java       |  5 -----
 .../internal/jdbc2/JdbcResultSetSelfTest.java      |  5 -----
 .../internal/jdbc2/JdbcStatementSelfTest.java      |  5 -----
 .../internal/jdbc2/JdbcStreamingSelfTest.java      |  5 -----
 .../jdbc2/JdbcStreamingToPublicCacheTest.java      |  5 -----
 .../rest/AbstractRestProcessorSelfTest.java        |  5 -----
 .../rest/ChangeStateCommandHandlerTest.java        |  6 ------
 .../rest/JettyRestProcessorAbstractSelfTest.java   |  2 --
 .../rest/RestBinaryProtocolSelfTest.java           |  5 -----
 .../rest/RestMemcacheProtocolSelfTest.java         |  5 -----
 .../rest/TaskCommandHandlerSelfTest.java           |  2 --
 .../tcp/redis/RedisCommonAbstractTest.java         |  2 --
 .../ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java |  2 --
 .../ignite/jdbc/JdbcComplexQuerySelfTest.java      |  5 -----
 .../apache/ignite/jdbc/JdbcConnectionSelfTest.java |  5 -----
 .../apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java |  5 -----
 .../ignite/jdbc/JdbcErrorsAbstractSelfTest.java    |  7 -------
 .../ignite/jdbc/JdbcLocalCachesSelfTest.java       |  5 -----
 .../apache/ignite/jdbc/JdbcMetadataSelfTest.java   |  5 -----
 .../apache/ignite/jdbc/JdbcNoDefaultCacheTest.java |  5 -----
 .../ignite/jdbc/JdbcPreparedStatementSelfTest.java |  5 -----
 .../apache/ignite/jdbc/JdbcResultSetSelfTest.java  |  5 -----
 .../apache/ignite/jdbc/JdbcStatementSelfTest.java  |  5 -----
 .../thin/JdbcThinAbstractDmlStatementSelfTest.java |  5 -----
 .../thin/JdbcThinAutoCloseServerCursorTest.java    |  5 -----
 .../jdbc/thin/JdbcThinComplexDmlDdlSelfTest.java   |  5 -----
 .../jdbc/thin/JdbcThinComplexQuerySelfTest.java    |  5 -----
 .../jdbc/thin/JdbcThinConnectionSelfTest.java      |  5 -----
 .../jdbc/thin/JdbcThinEmptyCacheSelfTest.java      |  5 -----
 .../ignite/jdbc/thin/JdbcThinMetadataSelfTest.java |  5 -----
 .../thin/JdbcThinMissingLongArrayResultsTest.java  |  6 +-----
 .../jdbc/thin/JdbcThinNoDefaultSchemaTest.java     |  5 -----
 .../thin/JdbcThinPreparedStatementSelfTest.java    |  5 -----
 .../jdbc/thin/JdbcThinResultSetSelfTest.java       |  5 -----
 .../ignite/jdbc/thin/JdbcThinSchemaCaseTest.java   |  5 -----
 .../jdbc/thin/JdbcThinSelectAfterAlterTable.java   |  5 -----
 .../jdbc/thin/JdbcThinStatementSelfTest.java       |  5 -----
 .../ignite/cache/IgniteWarmupClosureSelfTest.java  |  5 -----
 .../cache/affinity/AffinityClientNodeSelfTest.java |  5 -----
 .../affinity/AffinityDistributionLoggingTest.java  |  2 --
 .../affinity/local/LocalAffinityFunctionTest.java  |  5 -----
 .../RendezvousAffinityFunctionSelfTest.java        |  5 -----
 .../RendezvousAffinityFunctionSimpleBenchmark.java |  5 -----
 .../CacheStoreSessionListenerAbstractSelfTest.java |  5 -----
 .../failure/StopNodeOrHaltFailureHandlerTest.java  |  5 -----
 .../ignite/igfs/IgfsEventsAbstractSelfTest.java    |  5 -----
 .../igfs/IgfsFragmentizerAbstractSelfTest.java     |  5 -----
 .../ignite/internal/ClusterGroupSelfTest.java      |  6 ------
 .../ignite/internal/ClusterMetricsSelfTest.java    |  5 -----
 .../ignite/internal/GridAffinityMappedTest.java    |  7 -------
 .../internal/GridAffinityNoCacheSelfTest.java      |  7 -------
 ...dCachePartitionExchangeManagerHistSizeTest.java |  2 --
 .../internal/GridJobServicesAddNodeTest.java       |  5 -----
 .../GridKernalConcurrentAccessStopSelfTest.java    |  6 ------
 .../ignite/internal/GridListenActorSelfTest.java   |  5 -----
 .../ignite/internal/GridMultipleJobsSelfTest.java  |  8 --------
 .../ignite/internal/GridNodeFilterSelfTest.java    | 10 ----------
 .../internal/GridProjectionForCachesSelfTest.java  |  5 -----
 .../internal/GridRuntimeExceptionSelfTest.java     |  5 -----
 .../org/apache/ignite/internal/GridSelfTest.java   |  5 -----
 .../internal/GridTaskExecutionContextSelfTest.java |  5 -----
 .../ignite/internal/GridTaskExecutionSelfTest.java |  5 -----
 .../ignite/internal/GridTaskJobRejectSelfTest.java |  6 ------
 .../IgniteClientReconnectAbstractTest.java         |  4 ----
 .../IgniteComputeEmptyClusterGroupTest.java        |  5 -----
 ...niteConcurrentEntryProcessorAccessStopTest.java |  7 -------
 .../IgniteSlowClientDetectionSelfTest.java         |  7 -------
 .../internal/MemoryLeaksOnRestartNodeTest.java     |  4 ----
 .../ignite/internal/TaskNodeRestartTest.java       |  7 -------
 .../BinaryArrayIdentityResolverSelfTest.java       |  7 -------
 .../BinaryObjectBuilderAdditionalSelfTest.java     |  5 -----
 .../BinaryObjectBuilderDefaultMappersSelfTest.java |  5 -----
 .../BinarySerialiedFieldComparatorSelfTest.java    |  7 -------
 .../ignite/internal/binary/BinaryTreeSelfTest.java |  2 --
 .../binary/GridBinaryAffinityKeySelfTest.java      |  5 -----
 .../managers/IgniteDiagnosticMessagesTest.java     |  3 ---
 .../communication/IgniteIoTestMessagesTest.java    |  7 -------
 .../IgniteVariousConnectionNumberTest.java         |  7 -------
 .../GridDeploymentMessageCountSelfTest.java        |  7 -------
 .../OptimizedMarshallerPooledSelfTest.java         |  2 --
 .../GridCacheTxLoadFromStoreOnLockSelfTest.java    |  5 -----
 .../GridAffinityProcessorAbstractSelfTest.java     |  5 -----
 .../cache/CacheAffinityCallSelfTest.java           |  5 -----
 .../cache/CacheConnectionLeakStoreTxTest.java      |  5 -----
 .../cache/CacheDeferredDeleteQueueTest.java        |  4 ----
 .../cache/CacheDeferredDeleteSanitySelfTest.java   |  5 -----
 .../CacheDhtLocalPartitionAfterRemoveSelfTest.java |  5 -----
 .../cache/CacheEnumOperationsAbstractTest.java     |  7 -------
 .../CacheExchangeMessageDuplicatedStateTest.java   |  7 -------
 .../cache/CacheGroupMetricsMBeanTest.java          |  5 -----
 ...InterceptorPartitionCounterLocalSanityTest.java |  7 -------
 ...ceptorPartitionCounterRandomOperationsTest.java |  7 -------
 .../cache/CacheKeepBinaryTransactionTest.java      |  7 -------
 .../cache/CacheMetricsEntitiesCountTest.java       |  5 -----
 .../cache/CacheMetricsForClusterGroupSelfTest.java |  5 -----
 .../cache/CacheOffheapMapEntrySelfTest.java        |  5 -----
 .../CacheOptimisticTransactionsWithFilterTest.java |  7 -------
 .../cache/CachePutEventListenerErrorSelfTest.java  |  5 -----
 .../processors/cache/CachePutIfAbsentTest.java     |  7 -------
 .../cache/CacheSerializableTransactionsTest.java   |  7 -------
 ...toreUsageMultinodeDynamicStartAbstractTest.java |  7 -------
 .../cache/CacheTxNotAllowReadFromBackupTest.java   |  7 -------
 .../cache/CacheValidatorMetricsTest.java           |  5 -----
 .../processors/cache/CrossCacheLockTest.java       |  7 -------
 .../cache/CrossCacheTxRandomOperationsTest.java    |  7 -------
 .../EntryVersionConsistencyReadThroughTest.java    |  7 -------
 .../GridCacheAbstractByteArrayValuesSelfTest.java  |  5 -----
 .../cache/GridCacheAbstractLocalStoreSelfTest.java |  5 -----
 .../cache/GridCacheAbstractRemoveFailureTest.java  |  4 ----
 .../cache/GridCacheAbstractSelfTest.java           |  2 --
 .../cache/GridCacheAffinityMapperSelfTest.java     |  5 -----
 .../cache/GridCacheAffinityRoutingSelfTest.java    | 10 ----------
 .../processors/cache/GridCacheClearSelfTest.java   |  5 -----
 .../GridCacheConfigurationValidationSelfTest.java  |  7 -------
 .../cache/GridCacheEntryMemorySizeSelfTest.java    |  5 -----
 .../GridCacheMarshallingNodeJoinSelfTest.java      |  5 -----
 .../cache/GridCacheNestedTxAbstractTest.java       |  5 -----
 .../cache/GridCachePartitionedGetSelfTest.java     |  5 -----
 .../cache/GridCachePutAllFailoverSelfTest.java     |  2 --
 ...ridProjectionForCachesOnDaemonNodeSelfTest.java |  5 -----
 .../processors/cache/IgniteCacheAbstractTest.java  |  2 --
 .../IgniteCacheBinaryEntryProcessorSelfTest.java   |  7 -------
 .../IgniteCacheBinaryObjectsScanSelfTest.java      |  2 --
 .../cache/IgniteCacheDynamicStopSelfTest.java      |  7 -------
 .../IgniteCacheEntryListenerExpiredEventsTest.java |  7 -------
 .../cache/IgniteCacheEntryProcessorCallTest.java   |  7 -------
 .../IgniteCacheExpireAndUpdateConsistencyTest.java |  7 -------
 .../cache/IgniteCacheIncrementTxTest.java          |  7 -------
 .../IgniteCacheInvokeReadThroughAbstractTest.java  |  7 -------
 .../cache/IgniteCacheNearLockValueSelfTest.java    |  7 -------
 .../cache/IgniteCacheNoSyncForGetTest.java         |  7 -------
 .../cache/IgniteCacheObjectPutSelfTest.java        |  5 -----
 .../cache/IgniteCachePutAllRestartTest.java        |  2 --
 .../cache/IgniteCachePutStackOverflowSelfTest.java |  5 -----
 .../cache/IgniteCacheSerializationSelfTest.java    |  7 -------
 .../cache/IgniteCacheStartStopLoadTest.java        |  5 -----
 .../cache/IgniteCacheStoreCollectionTest.java      |  7 -------
 .../IgniteClientCacheInitializationFailTest.java   |  5 -----
 .../cache/IgniteDynamicCacheMultinodeTest.java     |  7 -------
 .../cache/IgniteDynamicCacheStartSelfTest.java     |  7 -------
 .../IgniteDynamicCacheStartStopConcurrentTest.java |  7 -------
 .../cache/IgniteInternalCacheTypesTest.java        |  7 -------
 .../cache/IgniteOutOfMemoryPropagationTest.java    |  7 -------
 .../IgniteStartCacheInTransactionSelfTest.java     |  5 -----
 .../cache/IgniteSystemCacheOnClientTest.java       |  7 -------
 .../processors/cache/IgniteTxAbstractTest.java     |  7 -------
 .../cache/IgniteTxConfigCacheSelfTest.java         |  5 -----
 ...OffheapCacheMetricsForClusterGroupSelfTest.java |  5 -----
 .../cache/WalModeChangeAbstractSelfTest.java       |  7 -------
 .../binary/CacheKeepBinaryWithInterceptorTest.java |  7 -------
 ...eBinaryObjectsAbstractDataStreamerSelfTest.java |  5 -----
 ...BinaryObjectsAbstractMultiThreadedSelfTest.java |  5 -----
 .../GridCacheBinaryObjectsAbstractSelfTest.java    |  5 -----
 .../GridCacheBinaryStoreAbstractSelfTest.java      |  5 -----
 .../GridCacheSequenceApiSelfAbstractTest.java      | 17 ++++++-----------
 .../datastructures/IgniteAtomicsAbstractTest.java  |  4 ----
 .../IgniteClientDataStructuresAbstractTest.java    |  5 -----
 .../IgniteCollectionAbstractTest.java              |  5 -----
 .../IgniteDataStructureWithJobTest.java            |  7 -------
 .../distributed/CacheAsyncOperationsTest.java      |  7 -------
 .../cache/distributed/CacheExchangeMergeTest.java  |  2 --
 .../distributed/CacheGetFutureHangsSelfTest.java   |  7 -------
 .../CacheGetInsideLockChangingTopologyTest.java    |  4 ----
 .../CacheLateAffinityAssignmentTest.java           |  7 -------
 .../cache/distributed/CacheStartOnJoinTest.java    |  2 --
 .../distributed/CacheTryLockMultithreadedTest.java |  7 -------
 ...AbstractDistributedByteArrayValuesSelfTest.java |  2 --
 .../GridCacheAbstractJobExecutionTest.java         |  5 -----
 .../GridCacheAbstractNodeRestartSelfTest.java      |  2 --
 .../GridCacheAbstractPrimarySyncSelfTest.java      |  5 -----
 .../distributed/GridCacheBasicOpAbstractTest.java  |  2 --
 .../distributed/GridCacheLockAbstractTest.java     |  5 -----
 .../distributed/GridCacheMixedModeSelfTest.java    |  5 -----
 .../GridCacheMultiNodeAbstractTest.java            |  2 --
 .../GridCacheMultiNodeLockAbstractTest.java        |  2 --
 .../GridCacheNodeFailureAbstractTest.java          |  2 --
 ...dCachePartitionedReloadAllAbstractSelfTest.java |  4 ----
 .../GridCachePreloadRestartAbstractSelfTest.java   |  5 -----
 ...naryMetadataUpdateChangingTopologySelfTest.java |  5 -----
 .../IgniteBinaryMetadataUpdateNodeRestartTest.java |  4 ----
 .../IgniteCacheClientReconnectTest.java            |  7 -------
 .../IgniteCacheConnectionRecoveryTest.java         |  7 -------
 .../distributed/IgniteCacheGetRestartTest.java     |  4 ----
 .../distributed/IgniteCacheManyClientsTest.java    |  7 -------
 .../IgniteCacheMessageRecoveryAbstractTest.java    |  5 -----
 ...niteCacheMessageRecoveryIdleConnectionTest.java |  7 -------
 .../IgniteCacheNearRestartRollbackSelfTest.java    |  2 --
 .../distributed/IgniteCachePrimarySyncTest.java    |  7 -------
 .../distributed/IgniteCacheReadFromBackupTest.java |  7 -------
 .../IgniteCacheSingleGetMessageTest.java           |  7 -------
 .../IgniteCrossCacheTxStoreSelfTest.java           |  2 --
 .../IgniteOptimisticTxSuspendResumeTest.java       |  2 --
 .../distributed/IgniteTxCachePrimarySyncTest.java  |  7 -------
 ...WriteSynchronizationModesMultithreadedTest.java |  4 ----
 .../distributed/IgniteTxTimeoutAbstractTest.java   |  2 --
 ...CacheAbstractTransformWriteThroughSelfTest.java |  2 --
 .../distributed/dht/GridCacheDhtEntrySelfTest.java |  5 -----
 .../GridCacheDhtEvictionNearReadersSelfTest.java   |  7 -------
 .../dht/GridCacheDhtMappingSelfTest.java           |  7 -------
 .../dht/IgniteCacheCommitDelayTxRecoveryTest.java  |  7 -------
 .../dht/IgniteCacheCrossCacheTxFailoverTest.java   |  7 -------
 .../dht/IgniteCacheMultiTxLockSelfTest.java        |  7 -------
 .../dht/IgniteCachePutRetryAbstractSelfTest.java   |  4 ----
 .../dht/IgniteCrossCacheTxSelfTest.java            |  5 -----
 .../near/GridCacheNearMultiGetSelfTest.java        |  5 -----
 .../near/GridCacheNearMultiNodeSelfTest.java       |  7 -------
 .../near/GridCacheNearTxForceKeyTest.java          |  7 -------
 .../near/GridCachePartitionedAffinitySelfTest.java |  5 -----
 ...achePartitionedBasicStoreMultiNodeSelfTest.java |  2 --
 ...achePartitionedMultiThreadedPutGetSelfTest.java |  5 -----
 .../near/NearCacheMultithreadedUpdateTest.java     |  7 -------
 .../near/NoneRebalanceModeSelfTest.java            |  5 -----
 .../rebalancing/CacheManualRebalancingTest.java    |  5 -----
 .../GridCacheRebalancingOrderingTest.java          |  7 -------
 .../GridCacheRebalancingSyncCheckDataTest.java     |  8 --------
 .../cache/eviction/EvictionAbstractTest.java       |  2 --
 .../EvictionPolicyFactoryAbstractTest.java         |  2 --
 .../PageEvictionMultinodeMixedRegionsTest.java     |  2 --
 .../eviction/paged/PageEvictionMultinodeTest.java  |  5 -----
 .../SortedEvictionPolicyPerformanceTest.java       |  5 -----
 .../GridCacheLocalByteArrayValuesSelfTest.java     |  2 --
 .../IgnitePdsCorruptedCacheDataTest.java           |  2 --
 ...hangingBaselineDownCachePutAllFailoverTest.java |  2 --
 ...hangingBaselineDownCacheRemoveFailoverTest.java |  2 --
 ...eChangingBaselineUpCachePutAllFailoverTest.java |  2 --
 ...eChangingBaselineUpCacheRemoveFailoverTest.java |  2 --
 ...gniteStableBaselineCachePutAllFailoverTest.java |  2 --
 ...gniteStableBaselineCacheRemoveFailoverTest.java |  2 --
 .../IgnitePdsCacheDestroyDuringCheckpointTest.java |  4 ----
 .../db/file/IgnitePdsPageReplacementTest.java      |  4 ----
 .../db/file/IgnitePdsThreadInterruptionTest.java   |  2 --
 .../extended/GridActivateExtensionTest.java        |  2 --
 .../query/GridCacheQueryTransformerSelfTest.java   |  5 -----
 .../ScanQueryOffheapExpiryPolicySelfTest.java      |  7 -------
 .../continuous/CacheContinuousBatchAckTest.java    |  7 -------
 ...acheContinuousQueryAsyncFilterListenerTest.java |  7 -------
 .../CacheContinuousQueryCounterAbstractTest.java   |  5 -----
 .../CacheContinuousQueryExecuteInPrimaryTest.java  |  5 -----
 ...heContinuousQueryOperationFromCallbackTest.java |  7 -------
 .../CacheContinuousQueryOperationP2PTest.java      |  7 -------
 .../CacheContinuousQueryOrderingEventTest.java     |  7 -------
 .../CacheContinuousQueryRandomOperationsTest.java  |  7 -------
 ...ontinuousWithTransformerReplicatedSelfTest.java |  2 --
 ...acheEntryProcessorExternalizableFailedTest.java |  7 -------
 .../CacheEntryProcessorNonSerializableTest.java    |  7 -------
 .../continuous/CacheKeepBinaryIterationTest.java   |  7 -------
 .../GridCacheContinuousQueryAbstractSelfTest.java  |  5 -----
 .../GridCacheContinuousQueryConcurrentTest.java    |  7 -------
 .../GridCacheWriteBehindStoreAbstractSelfTest.java |  2 --
 ...iteBehindStorePartitionedMultiNodeSelfTest.java |  2 --
 .../IgniteCacheWriteBehindNoUpdateSelfTest.java    |  5 -----
 .../cache/transactions/TxDeadlockCauseTest.java    |  7 -------
 .../TxDeadlockDetectionNoHangsTest.java            |  2 --
 .../transactions/TxDeadlockDetectionTest.java      |  7 -------
 .../TxDeadlockDetectionUnmasrhalErrorsTest.java    |  7 -------
 .../transactions/TxMultiCacheAsyncOpsTest.java     |  7 -------
 .../TxOptimisticDeadlockDetectionTest.java         |  7 -------
 .../TxOptimisticOnPartitionExchangeTest.java       |  7 -------
 ...PessimisticDeadlockDetectionCrossCacheTest.java |  7 -------
 .../TxPessimisticDeadlockDetectionTest.java        |  7 -------
 .../TxRollbackAsyncWithPersistenceTest.java        |  2 --
 ...TxRollbackOnTimeoutNoDeadlockDetectionTest.java |  2 --
 .../closure/GridClosureProcessorRemoteTest.java    |  5 -----
 .../closure/GridClosureProcessorSelfTest.java      |  5 -----
 .../closure/GridClosureSerializationTest.java      |  7 -------
 .../cluster/GridUpdateNotifierSelfTest.java        |  2 --
 ...ridComputeJobExecutionErrorToLogManualTest.java |  5 -----
 .../DataStreamerUpdateAfterLoadTest.java           |  7 -------
 .../processors/igfs/IgfsCacheSelfTest.java         |  5 -----
 .../processors/igfs/IgfsDataManagerSelfTest.java   |  5 -----
 .../processors/igfs/IgfsMetaManagerSelfTest.java   |  5 -----
 .../processors/igfs/IgfsMetricsSelfTest.java       |  5 -----
 .../processors/igfs/IgfsProcessorSelfTest.java     |  5 -----
 .../processors/igfs/IgfsStreamsSelfTest.java       |  5 -----
 .../internal/processors/igfs/IgfsTaskSelfTest.java |  5 -----
 .../split/IgfsAbstractRecordResolverSelfTest.java  |  5 -----
 .../handlers/log/GridLogCommandHandlerTest.java    |  2 --
 .../query/GridQueryCommandHandlerTest.java         |  7 -------
 .../service/ClosureServiceClientsNodesTest.java    |  5 -----
 ...ridServiceDeploymentCompoundFutureSelfTest.java |  5 -----
 ...dServiceDeploymentExceptionPropagationTest.java |  7 -------
 .../GridServiceProcessorAbstractSelfTest.java      |  5 -----
 .../IgniteServiceDynamicCachesSelfTest.java        |  5 -----
 .../service/ServicePredicateAccessCacheTest.java   |  7 -------
 .../loadtests/GridCacheMultiNodeLoadTest.java      |  2 --
 .../communication/GridIoManagerBenchmark0.java     |  5 -----
 .../direct/stealing/GridStealingLoadTest.java      |  5 -----
 .../p2p/GridP2PContinuousDeploymentSelfTest.java   |  5 -----
 .../session/GridSessionWaitAttributeSelfTest.java  |  6 ------
 ...SharedFsCheckpointSpiMultiThreadedSelfTest.java |  2 --
 .../tcp/TcpCommunicationSpiDropNodesTest.java      |  2 --
 .../tcp/TcpCommunicationSpiFaultyClientTest.java   |  2 --
 .../spi/discovery/AuthenticationRestartTest.java   |  2 --
 .../tcp/TcpDiscoveryConcurrentStartTest.java       |  5 -----
 .../stream/socket/SocketStreamerSelfTest.java      |  5 -----
 .../common/GridRollingRestartAbstractTest.java     |  4 ----
 .../util/mbeans/GridMBeanDisableSelfTest.java      |  2 --
 .../apache/ignite/stream/flume/IgniteSinkTest.java |  5 -----
 .../TcpDiscoveryGoogleStorageIpFinderSelfTest.java |  2 --
 .../hadoop/impl/HadoopAbstractSelfTest.java        |  2 --
 .../hadoop/impl/HadoopCommandLineTest.java         |  2 --
 .../hadoop/impl/HadoopJobTrackerSelfTest.java      |  7 -------
 .../hadoop/impl/HadoopTaskExecutionSelfTest.java   |  7 -------
 .../impl/client/HadoopClientProtocolSelfTest.java  |  7 -------
 .../hadoop/impl/igfs/IgfsEventsTestSuite.java      |  2 --
 .../IgniteHadoopFileSystemClientBasedOpenTest.java |  7 -------
 .../HibernateL2CacheConfigurationSelfTest.java     |  5 -----
 .../hibernate/HibernateL2CacheMultiJvmTest.java    |  7 -------
 .../cache/hibernate/HibernateL2CacheSelfTest.java  |  5 -----
 .../HibernateL2CacheStrategySelfTest.java          |  5 -----
 .../HibernateL2CacheTransactionalSelfTest.java     |  2 --
 .../HibernateL2CacheConfigurationSelfTest.java     |  5 -----
 .../hibernate/HibernateL2CacheMultiJvmTest.java    |  7 -------
 .../cache/hibernate/HibernateL2CacheSelfTest.java  |  5 -----
 .../HibernateL2CacheStrategySelfTest.java          |  5 -----
 .../HibernateL2CacheTransactionalSelfTest.java     |  2 --
 .../cache/CacheBinaryKeyConcurrentQueryTest.java   |  7 -------
 .../cache/CacheIteratorScanQueryTest.java          |  5 -----
 .../cache/CacheOffheapBatchIndexingBaseTest.java   |  5 -----
 .../cache/CacheOperationsWithExpirationTest.java   |  7 -------
 .../processors/cache/CacheQueryBuildValueTest.java |  7 -------
 .../CacheRandomOperationsMultithreadedTest.java    |  7 -------
 .../cache/CacheSqlQueryValueCopySelfTest.java      |  7 -------
 .../cache/GridCacheFullTextQuerySelfTest.java      |  5 -----
 .../processors/cache/GridCacheOffHeapSelfTest.java |  2 --
 .../cache/GridCacheOffheapIndexEntryEvictTest.java |  5 -----
 .../cache/GridCacheOffheapIndexGetSelfTest.java    |  5 -----
 .../IgniteBinaryObjectFieldsQuerySelfTest.java     |  2 --
 .../IgniteBinaryObjectQueryArgumentsTest.java      |  7 -------
 .../IgniteCacheAbstractFieldsQuerySelfTest.java    |  2 --
 .../IgniteCacheAbstractInsertSqlQuerySelfTest.java |  5 -----
 .../cache/IgniteCacheAbstractQuerySelfTest.java    |  4 ----
 .../IgniteCacheAbstractSqlDmlQuerySelfTest.java    |  5 -----
 .../cache/IgniteCacheCollocatedQuerySelfTest.java  |  5 -----
 .../cache/IgniteCacheCrossCacheJoinRandomTest.java |  2 --
 ...teCacheDistributedJoinCollocatedAndNotTest.java |  7 -------
 ...teCacheDistributedJoinCustomAffinityMapper.java |  7 -------
 .../IgniteCacheDistributedJoinNoIndexTest.java     |  7 -------
 ...istributedJoinPartitionedAndReplicatedTest.java |  7 -------
 ...iteCacheDistributedJoinQueryConditionsTest.java |  7 -------
 .../cache/IgniteCacheDistributedJoinTest.java      |  1 -
 ...eCacheDuplicateEntityConfigurationSelfTest.java |  5 -----
 .../IgniteCacheFieldsQueryNoDataSelfTest.java      |  5 -----
 ...oinPartitionedAndReplicatedCollocationTest.java |  7 -------
 ...gniteCacheJoinPartitionedAndReplicatedTest.java |  7 -------
 .../IgniteCacheJoinQueryWithAffinityKeyTest.java   |  7 -------
 .../cache/IgniteCacheLargeResultSelfTest.java      |  5 -----
 .../IgniteCacheObjectKeyIndexingSelfTest.java      |  2 --
 .../cache/IgniteCacheOffheapIndexScanTest.java     |  5 -----
 ...CachePartitionedQueryMultiThreadedSelfTest.java |  5 -----
 .../IgniteCachePrimitiveFieldsQuerySelfTest.java   |  5 -----
 .../cache/IgniteCacheQueriesLoadTest1.java         |  7 -------
 .../cache/IgniteCacheQueryH2IndexingLeakTest.java  |  2 --
 .../IgniteCacheQueryMultiThreadedSelfTest.java     |  5 -----
 .../IgniteCacheSqlQueryMultiThreadedSelfTest.java  |  7 -------
 ...ingleNodeWithIndexingPutGetPersistenceTest.java |  2 --
 ...eDistributedPartitionQueryAbstractSelfTest.java |  7 -------
 ...tributedQueryStopOnCancelOrTimeoutSelfTest.java |  7 -------
 ...eCacheQueryAbstractDistributedJoinSelfTest.java |  5 -----
 .../near/IgniteCacheQueryNoRebalanceSelfTest.java  |  7 -------
 .../near/IgniteCacheQueryNodeFailTest.java         |  7 -------
 .../near/IgniteCacheQueryNodeRestartSelfTest2.java |  5 -----
 .../index/DuplicateKeyValueClassesSelfTest.java    |  5 -----
 .../cache/index/DynamicIndexAbstractSelfTest.java  |  7 -------
 .../cache/index/H2ConnectionLeaksSelfTest.java     |  5 -----
 .../H2DynamicColumnsAbstractBasicSelfTest.java     |  7 -------
 .../index/H2DynamicIndexAbstractSelfTest.java      |  7 -------
 .../cache/index/H2DynamicIndexingComplexTest.java  |  7 -------
 .../cache/index/H2DynamicTableSelfTest.java        |  7 -------
 .../index/OptimizedMarshallerIndexNameTest.java    |  7 -------
 .../cache/index/QueryEntityValidationSelfTest.java |  5 -----
 ...niteCacheLocalQueryCancelOrTimeoutSelfTest.java |  7 -------
 ...eLockPartitionOnAffinityRunAtomicCacheTest.java |  2 --
 ...elineLockPartitionOnAffinityRunTxCacheTest.java |  2 --
 ...ngingBaselineCacheQueryNodeRestartSelfTest.java |  2 --
 ...ableBaselineCacheQueryNodeRestartsSelfTest.java |  2 --
 .../query/IgniteSqlDefaultValueTest.java           |  7 -------
 .../query/IgniteSqlDistributedJoinSelfTest.java    |  5 -----
 .../query/IgniteSqlNotNullConstraintTest.java      |  7 -------
 .../processors/query/IgniteSqlRoutingTest.java     |  7 -------
 .../query/IgniteSqlSegmentedIndexSelfTest.java     |  5 -----
 ...gniteSqlSkipReducerOnUpdateDmlFlagSelfTest.java |  8 --------
 .../IgniteSqlSkipReducerOnUpdateDmlSelfTest.java   |  4 ----
 .../query/IgniteSqlSplitterSelfTest.java           |  5 -----
 .../query/h2/IgniteSqlBigIntegerKeyTest.java       |  5 -----
 .../query/h2/sql/AbstractH2CompareQueryTest.java   |  4 ----
 .../query/h2/sql/GridQueryParsingTest.java         |  4 ----
 .../cache/CacheJndiTmFactorySelfTest.java          |  2 --
 .../cache/GridJtaTransactionManagerSelfTest.java   |  4 ----
 .../kafka/connect/IgniteSinkConnectorTest.java     |  5 -----
 .../kafka/connect/IgniteSourceConnectorTest.java   |  5 -----
 .../processors/schedule/GridScheduleSelfTest.java  |  7 -------
 .../spark/JavaStandaloneIgniteRDDSelfTest.java     |  6 ------
 .../springdata/IgniteSpringDataCrudSelfTest.java   |  2 --
 .../IgniteSpringDataQueriesSelfTest.java           |  2 --
 .../springdata/IgniteSpringDataCrudSelfTest.java   |  2 --
 .../IgniteSpringDataQueriesSelfTest.java           |  3 +--
 .../GridSpringCacheManagerMultiJvmSelfTest.java    |  5 -----
 .../spring/GridSpringCacheManagerSelfTest.java     |  5 -----
 .../ignite/cache/spring/SpringCacheTest.java       |  2 --
 .../resource/GridLoggerInjectionSelfTest.java      |  7 -------
 .../resource/GridServiceInjectionSelfTest.java     |  7 -------
 .../GridSpringResourceInjectionSelfTest.java       |  5 -----
 .../GridSpringTransactionManagerSelfTest.java      |  5 -----
 .../stream/zeromq/IgniteZeroMqStreamerTest.java    |  5 -----
 .../zk/internal/ZookeeperDiscoverySpiTest.java     |  2 --
 425 files changed, 8 insertions(+), 2151 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/aop/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerAopTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerAopTest.java b/modules/aop/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerAopTest.java
index a1c52ab..8236f43 100644
--- a/modules/aop/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerAopTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerAopTest.java
@@ -66,13 +66,6 @@ public class OptimizedMarshallerAopTest extends GridCommonAbstractTest {
         assert G.allGrids().size() == 1;
     }
 
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-
-        assert G.allGrids().isEmpty();
-    }
-
     /**
      * JUnit.
      *

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java
index 102db57..93b720f 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java
@@ -107,8 +107,6 @@ public class TaskEventSubjectIdSelfTest extends GridCommonAbstractTest {
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
         GridClientFactory.stop(client.id());
-
-        stopGrid();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
index ecdbd4a..fb46bb2 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
@@ -232,11 +232,6 @@ public abstract class ClientAbstractMultiThreadedSelfTest extends GridCommonAbst
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         client = GridClientFactory.start(clientConfiguration());
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java
index 2fe6084..c62cf8a 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java
@@ -84,8 +84,6 @@ public class ClientDefaultCacheSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopGrid();
-
         System.clearProperty(IGNITE_JETTY_PORT);
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
index 6023ab0..3481f34 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
@@ -239,13 +239,6 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        info("Stopping grids.");
-
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         client = GridClientFactory.start(clientConfiguration());
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
index 89eebdf..5971218 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
@@ -136,11 +136,6 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopGrid();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         exec = Executors.newCachedThreadPool();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java
index f8bcd8a..b012d3b 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java
@@ -61,13 +61,6 @@ public class ClientPreferDirectSelfTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        info("Stopping grids.");
-
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java
index f0ce7fb..628006e 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java
@@ -86,8 +86,6 @@ public abstract class TcpRouterAbstractSelfTest extends ClientAbstractSelfTest {
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
         router.stop();
-
-        super.afterTestsStopped();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterMultiNodeSelfTest.java
index ea73819..070a43c 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterMultiNodeSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterMultiNodeSelfTest.java
@@ -64,8 +64,6 @@ public class TcpRouterMultiNodeSelfTest extends ClientAbstractMultiNodeSelfTest
         info("Routers stopped.");
 
         routers.clear();
-
-        super.afterTestsStopped();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java
index 0a055a9..1cc5740 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java
@@ -64,11 +64,6 @@ public abstract class JdbcAbstractDmlStatementSelfTest extends GridCommonAbstrac
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         ((IgniteEx)ignite(0)).context().cache().dynamicStartSqlCache(cacheConfig());
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBulkLoadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBulkLoadSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBulkLoadSelfTest.java
index d9506cf..e91585f 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBulkLoadSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBulkLoadSelfTest.java
@@ -98,11 +98,6 @@ public class JdbcBulkLoadSelfTest extends GridCommonAbstractTest {
         startGrids(2);
     }
 
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
     /**
      * Establishes the JDBC connection.
      *

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java
index 1163723..8b1390e 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java
@@ -111,11 +111,6 @@ public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         stmt = DriverManager.getConnection(BASE_URL).createStatement();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java
index 35d0fba..d560d74 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java
@@ -97,11 +97,6 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest {
         startGridsMultiThreaded(GRID_CNT);
     }
 
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
     /**
      * @throws Exception If failed.
      */

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java
index 63f5a5c..2a58e02 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java
@@ -96,11 +96,6 @@ public class JdbcDistributedJoinsQueryTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         stmt = DriverManager.getConnection(BASE_URL).createStatement();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java
index 615658a..25b97ea 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java
@@ -79,11 +79,6 @@ public class JdbcEmptyCacheSelfTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         stmt = DriverManager.getConnection(BASE_URL).createStatement();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java
index 09ccbc9..46379cb 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java
@@ -95,11 +95,6 @@ public class JdbcLocalCachesSelfTest extends GridCommonAbstractTest {
         cache2.put("key2", 4);
     }
 
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
     /**
      * @throws Exception If failed.
      */

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
index 1e5db0a..c3d0824 100755
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
@@ -134,11 +134,6 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest {
         personCache.put(new AffinityKey<>("p3", "o2"), new Person("Mike Green", 40, 2));
     }
 
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
     /**
      * @throws Exception If failed.
      */

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoCacheStreamingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoCacheStreamingSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoCacheStreamingSelfTest.java
index 74c2820..e32e070 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoCacheStreamingSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoCacheStreamingSelfTest.java
@@ -94,11 +94,6 @@ public class JdbcNoCacheStreamingSelfTest extends GridCommonAbstractTest {
         startGrids(2);
     }
 
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
     /**
      * @param allowOverwrite Allow overwriting of existing keys.
      * @return Connection to use for the test.

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java
index e851319..5c549a8 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java
@@ -99,11 +99,6 @@ public class JdbcNoDefaultCacheTest extends GridCommonAbstractTest {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
     /**
      * @throws Exception If failed.
      */

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java
index 7df0e02..0a48961 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java
@@ -129,11 +129,6 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         conn = DriverManager.getConnection(BASE_URL);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java
index 42134e7..9e60c25 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java
@@ -114,11 +114,6 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         stmt = DriverManager.getConnection(BASE_URL).createStatement();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java
index d3f77e0..f778fde 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java
@@ -97,11 +97,6 @@ public class JdbcStatementSelfTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         conn = DriverManager.getConnection(BASE_URL);
         stmt = conn.createStatement();

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingSelfTest.java
index e302529..9e11efc 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingSelfTest.java
@@ -111,11 +111,6 @@ public class JdbcStreamingSelfTest extends GridCommonAbstractTest {
         U.sleep(1000);
     }
 
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
     /**
      * @return Connection without streaming initially turned on.
      * @throws SQLException if failed.

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingToPublicCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingToPublicCacheTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingToPublicCacheTest.java
index b973f10..20fd0fb 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingToPublicCacheTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingToPublicCacheTest.java
@@ -78,11 +78,6 @@ public class JdbcStreamingToPublicCacheTest extends GridCommonAbstractTest {
         startGrids(2);
     }
 
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
     /**
      * @param cacheName Cache name.
      * @param streaming Streaming mode flag.

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
index 712b71a..c67d735 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
@@ -47,11 +47,6 @@ abstract class AbstractRestProcessorSelfTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         assert grid(0).cluster().nodes().size() == gridCount();
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ChangeStateCommandHandlerTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ChangeStateCommandHandlerTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ChangeStateCommandHandlerTest.java
index 8f794c4..cb882e7 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ChangeStateCommandHandlerTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ChangeStateCommandHandlerTest.java
@@ -78,12 +78,6 @@ public class ChangeStateCommandHandlerTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         GridClientConfiguration cfg = new GridClientConfiguration();
         cfg.setProtocol(TCP);

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
index 96391e9..f52bfcb 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
@@ -184,8 +184,6 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        super.afterTestsStopped();
-
         System.clearProperty(IGNITE_JETTY_PORT);
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
index 284cffc..fb56b77 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
@@ -76,11 +76,6 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         client = client();
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
index 02b7584..9ac6270 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
@@ -59,11 +59,6 @@ public class RestMemcacheProtocolSelfTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         client = client();
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java
index f6acd56..60e620b 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java
@@ -86,8 +86,6 @@ public class TaskCommandHandlerSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-
         System.clearProperty(IgniteSystemProperties.IGNITE_REST_MAX_TASK_RESULTS);
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisCommonAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisCommonAbstractTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisCommonAbstractTest.java
index 78bff43..3db7706 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisCommonAbstractTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisCommonAbstractTest.java
@@ -70,8 +70,6 @@ public class RedisCommonAbstractTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-
         pool.destroy();
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java
index 892812f..cc8d72e 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java
@@ -115,8 +115,6 @@ public abstract class AbstractJdbcPojoQuerySelfTest extends GridCommonAbstractTe
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-
         GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, marshallerBackup);
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
index 99bc361..3c00288 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
@@ -106,11 +106,6 @@ public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         stmt = DriverManager.getConnection(URL).createStatement();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java
index 466bf5d..14d2146 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java
@@ -93,11 +93,6 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest {
         startGridsMultiThreaded(2);
     }
 
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
     /**
      * @throws Exception If failed.
      */

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java
index c883aa0..897f71e 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java
@@ -80,11 +80,6 @@ public class JdbcEmptyCacheSelfTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         stmt = DriverManager.getConnection(URL).createStatement();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcErrorsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcErrorsAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcErrorsAbstractSelfTest.java
index 2059408..59535f8 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcErrorsAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcErrorsAbstractSelfTest.java
@@ -69,13 +69,6 @@ public abstract class JdbcErrorsAbstractSelfTest extends GridCommonAbstractTest
             .setInterceptor(new TestCacheInterceptor()));
     }
 
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-
-        super.afterTestsStopped();
-    }
-
     /**
      * Test that H2 specific error codes get propagated to Ignite SQL exceptions.
      * @throws SQLException if failed.

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java
index ad65434..9350e0d 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java
@@ -92,11 +92,6 @@ public class JdbcLocalCachesSelfTest extends GridCommonAbstractTest {
         cache2.put("key2", 4);
     }
 
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
     /**
      * @throws Exception If failed.
      */

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
index 2d1443b..f270910 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
@@ -105,11 +105,6 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest {
         personCache.put(new AffinityKey<>("p3", "o2"), new Person("Mike Green", 40, 2));
     }
 
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
     /**
      * @throws Exception If failed.
      */

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcNoDefaultCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcNoDefaultCacheTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcNoDefaultCacheTest.java
index a37c167..adb5c30 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcNoDefaultCacheTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcNoDefaultCacheTest.java
@@ -99,11 +99,6 @@ public class JdbcNoDefaultCacheTest extends GridCommonAbstractTest {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
     /**
      * @return Connection URL.
      */

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
index 384036a..9bdb7d8 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
@@ -126,11 +126,6 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         conn = DriverManager.getConnection(URL);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
index b407f3e..0fe55f2 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
@@ -109,11 +109,6 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         stmt = DriverManager.getConnection(URL).createStatement();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
index be685cc..4d72b8e 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
@@ -95,11 +95,6 @@ public class JdbcStatementSelfTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         conn = DriverManager.getConnection(URL);
         stmt = conn.createStatement();

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java
index 69435da..9363467 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java
@@ -57,11 +57,6 @@ public abstract class JdbcThinAbstractDmlStatementSelfTest extends JdbcThinAbstr
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         ignite(0).getOrCreateCache(cacheConfig());
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAutoCloseServerCursorTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAutoCloseServerCursorTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAutoCloseServerCursorTest.java
index 943ca0e..bb2696f 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAutoCloseServerCursorTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAutoCloseServerCursorTest.java
@@ -84,11 +84,6 @@ public class JdbcThinAutoCloseServerCursorTest extends JdbcThinAbstractSelfTest
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
         IgniteCache<Integer, Person> cache = grid(0).cache(CACHE_NAME);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinComplexDmlDdlSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinComplexDmlDdlSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinComplexDmlDdlSelfTest.java
index 7941abe..9c40948 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinComplexDmlDdlSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinComplexDmlDdlSelfTest.java
@@ -108,11 +108,6 @@ public class JdbcThinComplexDmlDdlSelfTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         super.beforeTest();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinComplexQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinComplexQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinComplexQuerySelfTest.java
index ad1e312..692de7c 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinComplexQuerySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinComplexQuerySelfTest.java
@@ -105,11 +105,6 @@ public class JdbcThinComplexQuerySelfTest extends JdbcThinAbstractSelfTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         Connection conn = DriverManager.getConnection(URL);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
index b462e46..d907c2b 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
@@ -116,11 +116,6 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
         startGridsMultiThreaded(2);
     }
 
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
     /**
      * @throws Exception If failed.
      */

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinEmptyCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinEmptyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinEmptyCacheSelfTest.java
index 41b4338..87c1428 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinEmptyCacheSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinEmptyCacheSelfTest.java
@@ -79,11 +79,6 @@ public class JdbcThinEmptyCacheSelfTest extends JdbcThinAbstractSelfTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         Connection conn = DriverManager.getConnection(URL);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
index cc6790a..8e35a86 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
@@ -148,11 +148,6 @@ public class JdbcThinMetadataSelfTest extends JdbcThinAbstractSelfTest {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
     /**
      * @throws Exception If failed.
      */

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMissingLongArrayResultsTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMissingLongArrayResultsTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMissingLongArrayResultsTest.java
index 1f6e2c0..633c74b 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMissingLongArrayResultsTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMissingLongArrayResultsTest.java
@@ -158,11 +158,7 @@ public class JdbcThinMissingLongArrayResultsTest extends JdbcThinAbstractSelfTes
             }
             streamer.flush();
         }
-        ignite.active(true);    }
-
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        ignite.active(true);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinNoDefaultSchemaTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinNoDefaultSchemaTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinNoDefaultSchemaTest.java
index 11aef9f..53425c8 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinNoDefaultSchemaTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinNoDefaultSchemaTest.java
@@ -100,11 +100,6 @@ public class JdbcThinNoDefaultSchemaTest extends JdbcThinAbstractSelfTest {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
     /**
      * @throws Exception If failed.
      */

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPreparedStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPreparedStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPreparedStatementSelfTest.java
index c577853..85efb4d 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPreparedStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPreparedStatementSelfTest.java
@@ -140,11 +140,6 @@ public class JdbcThinPreparedStatementSelfTest extends JdbcThinAbstractSelfTest
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         conn = DriverManager.getConnection(URL);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinResultSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinResultSetSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinResultSetSelfTest.java
index fd46cda..6b7cdf4 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinResultSetSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinResultSetSelfTest.java
@@ -112,11 +112,6 @@ public class JdbcThinResultSetSelfTest extends JdbcThinAbstractSelfTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         Connection conn = DriverManager.getConnection(URL);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinSchemaCaseTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinSchemaCaseTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinSchemaCaseTest.java
index 11416e5..8f11087 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinSchemaCaseTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinSchemaCaseTest.java
@@ -87,11 +87,6 @@ public class JdbcThinSchemaCaseTest extends JdbcThinAbstractSelfTest {
         startGridsMultiThreaded(GRID_CNT);
     }
 
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
     /**
      * @throws Exception If failed.
      */

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinSelectAfterAlterTable.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinSelectAfterAlterTable.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinSelectAfterAlterTable.java
index 13b8f3e..ef711dc 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinSelectAfterAlterTable.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinSelectAfterAlterTable.java
@@ -87,11 +87,6 @@ public class JdbcThinSelectAfterAlterTable extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         super.beforeTest();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementSelfTest.java
index 82c0512..6d6e72d 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementSelfTest.java
@@ -96,11 +96,6 @@ public class JdbcThinStatementSelfTest extends JdbcThinAbstractSelfTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         conn = DriverManager.getConnection(URL);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java
index 30e6072..1fccb90 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java
@@ -69,11 +69,6 @@ public class IgniteWarmupClosureSelfTest extends GridCommonAbstractTest {
         return cfg;
     }
 
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
     /**
      * @throws Exception If failed.
      */

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityClientNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityClientNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityClientNodeSelfTest.java
index 73302d9..6d1c020 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityClientNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityClientNodeSelfTest.java
@@ -106,11 +106,6 @@ public class AffinityClientNodeSelfTest extends GridCommonAbstractTest {
         startGrid(NODE_CNT - 1); // Start client after servers.
     }
 
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
     /**
      * @throws Exception If failed.
      */

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityDistributionLoggingTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityDistributionLoggingTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityDistributionLoggingTest.java
index 7ea1a1a..0168c7c 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityDistributionLoggingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityDistributionLoggingTest.java
@@ -71,8 +71,6 @@ public class AffinityDistributionLoggingTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        super.afterTestsStopped();
-
         if (tempProp != null)
             System.setProperty(IGNITE_PART_DISTRIBUTION_WARN_THRESHOLD, tempProp);
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/cache/affinity/local/LocalAffinityFunctionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/local/LocalAffinityFunctionTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/local/LocalAffinityFunctionTest.java
index b447b78..e08d212 100755
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/local/LocalAffinityFunctionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/local/LocalAffinityFunctionTest.java
@@ -61,11 +61,6 @@ public class LocalAffinityFunctionTest extends GridCommonAbstractTest {
         startGrids(NODE_CNT);
     }
 
-    @Override protected void afterTestsStopped() throws Exception {
-        super.afterTestsStopped();
-        stopAllGrids();
-    }
-
     public void testWronglySetAffinityFunctionForLocalCache() {
         Ignite node = ignite(NODE_CNT - 1);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSelfTest.java
index d895315..7fa2dc7 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSelfTest.java
@@ -35,11 +35,6 @@ public class RendezvousAffinityFunctionSelfTest extends AbstractAffinityFunction
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-    /** {@inheritDoc} */
     @Override protected AffinityFunction affinityFunction() {
         AffinityFunction aff = new RendezvousAffinityFunction();