diff --git a/community/io/src/test/java/org/neo4j/test/ByteArrayMatcher.java b/community/common/src/test/java/org/neo4j/test/matchers/ByteArrayMatcher.java
similarity index 97%
rename from community/io/src/test/java/org/neo4j/test/ByteArrayMatcher.java
rename to community/common/src/test/java/org/neo4j/test/matchers/ByteArrayMatcher.java
index c420e0169264..262cd2fa2a03 100644
--- a/community/io/src/test/java/org/neo4j/test/ByteArrayMatcher.java
+++ b/community/common/src/test/java/org/neo4j/test/matchers/ByteArrayMatcher.java
@@ -17,12 +17,11 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package org.neo4j.test;
+package org.neo4j.test.matchers;
import org.hamcrest.Description;
import org.hamcrest.TypeSafeDiagnosingMatcher;
-// TODO: move to common test module
public class ByteArrayMatcher extends TypeSafeDiagnosingMatcher
{
public static ByteArrayMatcher byteArray( byte... expected )
diff --git a/community/io/src/test/java/org/neo4j/test/NestedThrowableMatcher.java b/community/common/src/test/java/org/neo4j/test/matchers/NestedThrowableMatcher.java
similarity index 98%
rename from community/io/src/test/java/org/neo4j/test/NestedThrowableMatcher.java
rename to community/common/src/test/java/org/neo4j/test/matchers/NestedThrowableMatcher.java
index f288ef9395d9..13feba6e7c8e 100644
--- a/community/io/src/test/java/org/neo4j/test/NestedThrowableMatcher.java
+++ b/community/common/src/test/java/org/neo4j/test/matchers/NestedThrowableMatcher.java
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package org.neo4j.test;
+package org.neo4j.test.matchers;
import org.hamcrest.Description;
import org.hamcrest.TypeSafeMatcher;
diff --git a/community/io/src/test/java/org/neo4j/test/ByteArrayMatcherTest.java b/community/common/src/test/java/org/neo4j/test/matchers/matchertests/ByteArrayMatcherTest.java
similarity index 92%
rename from community/io/src/test/java/org/neo4j/test/ByteArrayMatcherTest.java
rename to community/common/src/test/java/org/neo4j/test/matchers/matchertests/ByteArrayMatcherTest.java
index 5400135ef069..e38d74932628 100644
--- a/community/io/src/test/java/org/neo4j/test/ByteArrayMatcherTest.java
+++ b/community/common/src/test/java/org/neo4j/test/matchers/matchertests/ByteArrayMatcherTest.java
@@ -17,14 +17,13 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package org.neo4j.test;
+package org.neo4j.test.matchers.matchertests;
import org.junit.Test;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
-
-import static org.neo4j.test.ByteArrayMatcher.byteArray;
+import static org.neo4j.test.matchers.ByteArrayMatcher.byteArray;
public class ByteArrayMatcherTest
{
diff --git a/community/io/src/test/java/org/neo4j/test/Digests.java b/community/common/src/test/java/org/neo4j/test/matchers/matchertests/package-info.java
similarity index 55%
rename from community/io/src/test/java/org/neo4j/test/Digests.java
rename to community/common/src/test/java/org/neo4j/test/matchers/matchertests/package-info.java
index 3b457213efd7..ab1f92cd66f7 100644
--- a/community/io/src/test/java/org/neo4j/test/Digests.java
+++ b/community/common/src/test/java/org/neo4j/test/matchers/matchertests/package-info.java
@@ -17,26 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package org.neo4j.test;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-import org.neo4j.string.HexString;
-
-public class Digests
-{
- public static String md5Hex( String message )
- {
- try
- {
- MessageDigest m = MessageDigest.getInstance( "MD5" );
- m.update( message.getBytes(), 0, message.getBytes().length);
- return HexString.encodeHexString( m.digest() );
- }
- catch ( NoSuchAlgorithmException e )
- {
- throw new RuntimeException( "MD5 hash algorithm is not available on this platform: " + e.getMessage(),e );
- }
- }
-}
+/**
+ * This separate package introduced to separate actual matchers from tests for those matchers.
+ * That will simplify understanding package content and will make it simpler future refactorings of helper test utils
+ */
+package org.neo4j.test.matchers.matchertests;
diff --git a/community/io/src/test/java/org/neo4j/test/RepeatRule.java b/community/common/src/test/java/org/neo4j/test/rule/RepeatRule.java
similarity index 99%
rename from community/io/src/test/java/org/neo4j/test/RepeatRule.java
rename to community/common/src/test/java/org/neo4j/test/rule/RepeatRule.java
index 7f2a0abd1023..71a1b58bac43 100644
--- a/community/io/src/test/java/org/neo4j/test/RepeatRule.java
+++ b/community/common/src/test/java/org/neo4j/test/rule/RepeatRule.java
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package org.neo4j.test;
+package org.neo4j.test.rule;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
diff --git a/community/io/pom.xml b/community/io/pom.xml
index 7e9d67f58b03..abee5b294f70 100644
--- a/community/io/pom.xml
+++ b/community/io/pom.xml
@@ -93,6 +93,10 @@ the relevant Commercial Agreement.
test-jar
test
+
+ commons-codec
+ commons-codec
+
org.neo4j
neo4j-common
diff --git a/community/io/src/test/java/org/neo4j/io/IOUtilsTest.java b/community/io/src/test/java/org/neo4j/io/IOUtilsTest.java
index 5e886fe0ea49..6d1b26af5912 100644
--- a/community/io/src/test/java/org/neo4j/io/IOUtilsTest.java
+++ b/community/io/src/test/java/org/neo4j/io/IOUtilsTest.java
@@ -28,7 +28,7 @@
import java.io.IOException;
-import org.neo4j.test.NestedThrowableMatcher;
+import org.neo4j.test.matchers.NestedThrowableMatcher;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.verify;
diff --git a/community/io/src/test/java/org/neo4j/io/pagecache/PageCacheSlowTest.java b/community/io/src/test/java/org/neo4j/io/pagecache/PageCacheSlowTest.java
index c9c72901cbfc..15160dea17f3 100644
--- a/community/io/src/test/java/org/neo4j/io/pagecache/PageCacheSlowTest.java
+++ b/community/io/src/test/java/org/neo4j/io/pagecache/PageCacheSlowTest.java
@@ -40,7 +40,7 @@
import org.neo4j.io.fs.FileSystemAbstraction;
import org.neo4j.io.pagecache.tracing.PageCacheTracer;
import org.neo4j.test.LinearHistoryPageCacheTracer;
-import org.neo4j.test.RepeatRule;
+import org.neo4j.test.rule.RepeatRule;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
@@ -52,7 +52,7 @@
import static org.junit.Assert.fail;
import static org.neo4j.io.pagecache.PagedFile.PF_SHARED_READ_LOCK;
import static org.neo4j.io.pagecache.PagedFile.PF_SHARED_WRITE_LOCK;
-import static org.neo4j.test.ByteArrayMatcher.byteArray;
+import static org.neo4j.test.matchers.ByteArrayMatcher.byteArray;
public abstract class PageCacheSlowTest extends PageCacheTestSupport
{
diff --git a/community/io/src/test/java/org/neo4j/io/pagecache/PageCacheTest.java b/community/io/src/test/java/org/neo4j/io/pagecache/PageCacheTest.java
index 719effb22bb5..43b7493dea28 100644
--- a/community/io/src/test/java/org/neo4j/io/pagecache/PageCacheTest.java
+++ b/community/io/src/test/java/org/neo4j/io/pagecache/PageCacheTest.java
@@ -72,7 +72,7 @@
import org.neo4j.io.pagecache.tracing.DefaultPageCacheTracer;
import org.neo4j.io.pagecache.tracing.PageCacheTracer;
import org.neo4j.io.pagecache.tracing.PinEvent;
-import org.neo4j.test.RepeatRule;
+import org.neo4j.test.rule.RepeatRule;
import static java.lang.Long.toHexString;
import static java.lang.System.currentTimeMillis;
@@ -101,8 +101,8 @@
import static org.neo4j.io.pagecache.PagedFile.PF_NO_GROW;
import static org.neo4j.io.pagecache.PagedFile.PF_SHARED_READ_LOCK;
import static org.neo4j.io.pagecache.PagedFile.PF_SHARED_WRITE_LOCK;
-import static org.neo4j.test.ByteArrayMatcher.byteArray;
import static org.neo4j.test.ThreadTestUtils.fork;
+import static org.neo4j.test.matchers.ByteArrayMatcher.byteArray;
@SuppressWarnings( "OptionalGetWithoutIsPresent" )
public abstract class PageCacheTest extends PageCacheTestSupport
diff --git a/community/io/src/test/java/org/neo4j/io/pagecache/PageCacheTestSupport.java b/community/io/src/test/java/org/neo4j/io/pagecache/PageCacheTestSupport.java
index 0fa8c2a605b2..12a2a1d493ba 100644
--- a/community/io/src/test/java/org/neo4j/io/pagecache/PageCacheTestSupport.java
+++ b/community/io/src/test/java/org/neo4j/io/pagecache/PageCacheTestSupport.java
@@ -42,10 +42,10 @@
import org.neo4j.io.fs.StoreChannel;
import org.neo4j.io.pagecache.impl.SingleFilePageSwapperFactory;
import org.neo4j.io.pagecache.tracing.PageCacheTracer;
-import org.neo4j.test.RepeatRule;
+import org.neo4j.test.rule.RepeatRule;
import static org.junit.Assert.assertThat;
-import static org.neo4j.test.ByteArrayMatcher.byteArray;
+import static org.neo4j.test.matchers.ByteArrayMatcher.byteArray;
public abstract class PageCacheTestSupport
{
diff --git a/community/io/src/test/java/org/neo4j/io/pagecache/harness/PageCacheHarnessTest.java b/community/io/src/test/java/org/neo4j/io/pagecache/harness/PageCacheHarnessTest.java
index e72407f49ee5..8d1fdd254473 100644
--- a/community/io/src/test/java/org/neo4j/io/pagecache/harness/PageCacheHarnessTest.java
+++ b/community/io/src/test/java/org/neo4j/io/pagecache/harness/PageCacheHarnessTest.java
@@ -34,7 +34,7 @@
import org.neo4j.io.pagecache.randomharness.RandomPageCacheTestHarness;
import org.neo4j.io.pagecache.randomharness.RecordFormat;
import org.neo4j.io.pagecache.randomharness.StandardRecordFormat;
-import org.neo4j.test.RepeatRule;
+import org.neo4j.test.rule.RepeatRule;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.neo4j.io.pagecache.PagedFile.PF_SHARED_READ_LOCK;
diff --git a/community/io/src/test/java/org/neo4j/io/pagecache/impl/CompositePageCursorTest.java b/community/io/src/test/java/org/neo4j/io/pagecache/impl/CompositePageCursorTest.java
index d6b54e12167b..e99b0555a0fd 100644
--- a/community/io/src/test/java/org/neo4j/io/pagecache/impl/CompositePageCursorTest.java
+++ b/community/io/src/test/java/org/neo4j/io/pagecache/impl/CompositePageCursorTest.java
@@ -35,7 +35,7 @@
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.neo4j.test.ByteArrayMatcher.byteArray;
+import static org.neo4j.test.matchers.ByteArrayMatcher.byteArray;
public class CompositePageCursorTest
{
diff --git a/community/io/src/test/java/org/neo4j/io/pagecache/impl/SingleFilePageSwapperTest.java b/community/io/src/test/java/org/neo4j/io/pagecache/impl/SingleFilePageSwapperTest.java
index de6e88a4ac3b..f2dab0990f21 100644
--- a/community/io/src/test/java/org/neo4j/io/pagecache/impl/SingleFilePageSwapperTest.java
+++ b/community/io/src/test/java/org/neo4j/io/pagecache/impl/SingleFilePageSwapperTest.java
@@ -21,9 +21,9 @@
import org.apache.commons.lang3.SystemUtils;
import org.junit.After;
+import org.junit.AssumptionViolatedException;
import org.junit.Before;
import org.junit.Test;
-import org.junit.AssumptionViolatedException;
import java.io.BufferedReader;
import java.io.File;
@@ -56,7 +56,7 @@
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
-import static org.neo4j.test.ByteArrayMatcher.byteArray;
+import static org.neo4j.test.matchers.ByteArrayMatcher.byteArray;
public class SingleFilePageSwapperTest extends PageSwapperTest
{
diff --git a/community/io/src/test/java/org/neo4j/io/pagecache/impl/muninn/SequenceLockStressIT.java b/community/io/src/test/java/org/neo4j/io/pagecache/impl/muninn/SequenceLockStressIT.java
index 2e0eb4c4c49c..ca0f46ee473e 100644
--- a/community/io/src/test/java/org/neo4j/io/pagecache/impl/muninn/SequenceLockStressIT.java
+++ b/community/io/src/test/java/org/neo4j/io/pagecache/impl/muninn/SequenceLockStressIT.java
@@ -33,7 +33,7 @@
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-import org.neo4j.test.RepeatRule;
+import org.neo4j.test.rule.RepeatRule;
public class SequenceLockStressIT
{
diff --git a/community/io/src/test/java/org/neo4j/test/rule/TestDirectory.java b/community/io/src/test/java/org/neo4j/test/rule/TestDirectory.java
index e3cbf7fa4767..d284e38a21af 100644
--- a/community/io/src/test/java/org/neo4j/test/rule/TestDirectory.java
+++ b/community/io/src/test/java/org/neo4j/test/rule/TestDirectory.java
@@ -19,6 +19,7 @@
*/
package org.neo4j.test.rule;
+import org.apache.commons.codec.digest.DigestUtils;
import org.junit.Rule;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
@@ -32,7 +33,6 @@
import org.neo4j.io.fs.DefaultFileSystemAbstraction;
import org.neo4j.io.fs.FileSystemAbstraction;
import org.neo4j.io.fs.FileUtils.MaybeWindowsMemoryMappedFileReleaseProblem;
-import org.neo4j.test.Digests;
import static java.lang.String.format;
@@ -236,7 +236,7 @@ private File directoryForDescription( Description description ) throws IOExcepti
{
test = "static";
}
- String dir = Digests.md5Hex( test );
+ String dir = DigestUtils.md5Hex( test );
register( test, dir );
return cleanDirectory( dir );
}
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/TokenCreationIT.java b/community/kernel/src/test/java/org/neo4j/kernel/TokenCreationIT.java
index ecf34131e19e..bc257aa48f0f 100644
--- a/community/kernel/src/test/java/org/neo4j/kernel/TokenCreationIT.java
+++ b/community/kernel/src/test/java/org/neo4j/kernel/TokenCreationIT.java
@@ -34,8 +34,8 @@
import org.neo4j.graphdb.Label;
import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.Transaction;
-import org.neo4j.test.RepeatRule;
import org.neo4j.test.rule.EmbeddedDatabaseRule;
+import org.neo4j.test.rule.RepeatRule;
/**
* Token creation should be able to handle cases of concurrent token creation
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TxStateTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TxStateTest.java
index 90d0fd1ea5fc..95f97a20a85b 100644
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TxStateTest.java
+++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TxStateTest.java
@@ -56,8 +56,8 @@
import org.neo4j.storageengine.api.RelationshipItem;
import org.neo4j.storageengine.api.txstate.ReadableDiffSets;
import org.neo4j.storageengine.api.txstate.TxStateVisitor;
-import org.neo4j.test.RepeatRule;
import org.neo4j.test.rule.RandomRule;
+import org.neo4j.test.rule.RepeatRule;
import static java.util.Arrays.asList;
import static java.util.Collections.emptySet;
diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/string/EncodingIdMapperTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/string/EncodingIdMapperTest.java
index 76f42551cc39..bf20b99e49cf 100644
--- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/string/EncodingIdMapperTest.java
+++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/string/EncodingIdMapperTest.java
@@ -40,8 +40,8 @@
import org.neo4j.graphdb.ResourceIterator;
import org.neo4j.helpers.collection.PrefetchingIterator;
import org.neo4j.helpers.progress.ProgressListener;
-import org.neo4j.test.RepeatRule;
import org.neo4j.test.rule.RandomRule;
+import org.neo4j.test.rule.RepeatRule;
import org.neo4j.unsafe.impl.batchimport.InputIterable;
import org.neo4j.unsafe.impl.batchimport.InputIterator;
import org.neo4j.unsafe.impl.batchimport.cache.NumberArrayFactory;
diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/executor/DynamicTaskExecutorTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/executor/DynamicTaskExecutorTest.java
index dc5212a17a07..95a24a5bd845 100644
--- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/executor/DynamicTaskExecutorTest.java
+++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/executor/DynamicTaskExecutorTest.java
@@ -31,8 +31,8 @@
import org.neo4j.test.OtherThreadExecutor;
import org.neo4j.test.OtherThreadExecutor.WorkerCommand;
import org.neo4j.test.Race;
-import org.neo4j.test.RepeatRule;
-import org.neo4j.test.RepeatRule.Repeat;
+import org.neo4j.test.rule.RepeatRule;
+import org.neo4j.test.rule.RepeatRule.Repeat;
import org.neo4j.unsafe.impl.batchimport.executor.ParkStrategy.Park;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/DatabaseIndexIntegrationTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/DatabaseIndexIntegrationTest.java
index 055fe258741c..fe8a9fd5094b 100644
--- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/DatabaseIndexIntegrationTest.java
+++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/DatabaseIndexIntegrationTest.java
@@ -56,7 +56,7 @@
import org.neo4j.kernel.api.impl.index.partition.WritableIndexPartitionFactory;
import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory;
import org.neo4j.kernel.api.impl.index.storage.PartitionedIndexStorage;
-import org.neo4j.test.RepeatRule;
+import org.neo4j.test.rule.RepeatRule;
import org.neo4j.test.rule.TestDirectory;
import org.neo4j.test.rule.fs.DefaultFileSystemRule;
diff --git a/community/neo4j-harness/LICENSES.txt b/community/neo4j-harness/LICENSES.txt
index 592b289f50f3..12e845892579 100644
--- a/community/neo4j-harness/LICENSES.txt
+++ b/community/neo4j-harness/LICENSES.txt
@@ -3,6 +3,7 @@ libraries. For an overview of the licenses see the NOTICE.txt file.
------------------------------------------------------------------------------
Apache Software License, Version 2.0
+ Apache Commons Codec
Apache Commons Compress
Apache Commons Configuration
Apache Commons Lang
diff --git a/community/neo4j-harness/NOTICE.txt b/community/neo4j-harness/NOTICE.txt
index 7cca726725f5..093db30f71a5 100644
--- a/community/neo4j-harness/NOTICE.txt
+++ b/community/neo4j-harness/NOTICE.txt
@@ -26,6 +26,7 @@ Third-party licenses
--------------------
Apache Software License, Version 2.0
+ Apache Commons Codec
Apache Commons Compress
Apache Commons Configuration
Apache Commons Lang
diff --git a/community/neo4j-harness/pom.xml b/community/neo4j-harness/pom.xml
index 25da75a2e011..99a5e89ae7dc 100644
--- a/community/neo4j-harness/pom.xml
+++ b/community/neo4j-harness/pom.xml
@@ -103,16 +103,20 @@
+
+ commons-codec
+ commons-codec
+ compile
+
+
org.apache.httpcomponents
httpclient
- test
org.apache.httpcomponents
httpcore
- test
diff --git a/community/neo4j-harness/src/main/java/org/neo4j/harness/internal/AbstractInProcessServerBuilder.java b/community/neo4j-harness/src/main/java/org/neo4j/harness/internal/AbstractInProcessServerBuilder.java
index 517a9d293f5c..d09425d85a0b 100644
--- a/community/neo4j-harness/src/main/java/org/neo4j/harness/internal/AbstractInProcessServerBuilder.java
+++ b/community/neo4j-harness/src/main/java/org/neo4j/harness/internal/AbstractInProcessServerBuilder.java
@@ -19,6 +19,7 @@
*/
package org.neo4j.harness.internal;
+import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.io.FileUtils;
import java.io.File;
@@ -40,6 +41,7 @@
import org.neo4j.kernel.GraphDatabaseDependencies;
import org.neo4j.kernel.configuration.BoltConnector;
import org.neo4j.kernel.configuration.HttpConnector;
+import org.neo4j.kernel.configuration.HttpConnector.Encryption;
import org.neo4j.kernel.configuration.Settings;
import org.neo4j.kernel.extension.KernelExtensionFactory;
import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory;
@@ -49,7 +51,6 @@
import org.neo4j.kernel.lifecycle.LifecycleAdapter;
import org.neo4j.logging.FormattedLogProvider;
import org.neo4j.server.AbstractNeoServer;
-import org.neo4j.kernel.configuration.HttpConnector.Encryption;
import org.neo4j.server.configuration.ServerSettings;
import org.neo4j.server.configuration.ThirdPartyJaxRsPackage;
@@ -58,7 +59,6 @@
import static org.neo4j.graphdb.factory.GraphDatabaseSettings.pagecache_memory;
import static org.neo4j.helpers.collection.Iterables.append;
import static org.neo4j.io.file.Files.createOrOpenAsOuputStream;
-import static org.neo4j.test.Digests.md5Hex;
public abstract class AbstractInProcessServerBuilder implements TestServerBuilder
{
@@ -241,7 +241,7 @@ private TestServerBuilder setDirectory( File dir )
private String randomFolderName()
{
- return md5Hex( Long.toString( ThreadLocalRandom.current().nextLong() ) );
+ return DigestUtils.md5Hex( Long.toString( ThreadLocalRandom.current().nextLong() ) );
}
private int freePort(int startRange, int endRange)
diff --git a/community/neo4j/src/test/java/schema/MultipleIndexPopulationStressIT.java b/community/neo4j/src/test/java/schema/MultipleIndexPopulationStressIT.java
index cd7d13eab1b6..caaa456919eb 100644
--- a/community/neo4j/src/test/java/schema/MultipleIndexPopulationStressIT.java
+++ b/community/neo4j/src/test/java/schema/MultipleIndexPopulationStressIT.java
@@ -44,7 +44,6 @@
import org.neo4j.helpers.TimeUtil;
import org.neo4j.helpers.collection.Iterables;
import org.neo4j.helpers.collection.PrefetchingIterator;
-import org.neo4j.io.fs.watcher.FileWatcher;
import org.neo4j.kernel.configuration.Config;
import org.neo4j.kernel.configuration.Settings;
import org.neo4j.kernel.impl.api.index.BatchingMultipleIndexPopulator;
@@ -54,10 +53,10 @@
import org.neo4j.kernel.impl.store.format.RecordFormats;
import org.neo4j.logging.NullLogProvider;
import org.neo4j.test.Randoms;
-import org.neo4j.test.RepeatRule;
import org.neo4j.test.TestGraphDatabaseFactory;
import org.neo4j.test.rule.CleanupRule;
import org.neo4j.test.rule.RandomRule;
+import org.neo4j.test.rule.RepeatRule;
import org.neo4j.test.rule.TestDirectory;
import org.neo4j.test.rule.fs.DefaultFileSystemRule;
import org.neo4j.unsafe.impl.batchimport.BatchImporter;
@@ -76,12 +75,10 @@
import org.neo4j.unsafe.impl.batchimport.staging.ExecutionMonitors;
import org.neo4j.unsafe.impl.internal.dragons.FeatureToggles;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
import static java.lang.System.currentTimeMillis;
import static java.util.concurrent.TimeUnit.SECONDS;
-
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.neo4j.helpers.collection.MapUtil.stringMap;
import static org.neo4j.helpers.progress.ProgressMonitorFactory.NONE;
import static org.neo4j.unsafe.impl.batchimport.AdditionalInitialIds.EMPTY;
diff --git a/community/neo4j/src/test/java/visibility/TestPropertyReadOnNewEntityBeforeLockRelease.java b/community/neo4j/src/test/java/visibility/TestPropertyReadOnNewEntityBeforeLockRelease.java
index d0f0e1feff64..9f99a00a05d9 100644
--- a/community/neo4j/src/test/java/visibility/TestPropertyReadOnNewEntityBeforeLockRelease.java
+++ b/community/neo4j/src/test/java/visibility/TestPropertyReadOnNewEntityBeforeLockRelease.java
@@ -35,10 +35,10 @@
import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.Transaction;
-import org.neo4j.test.RepeatRule;
-import org.neo4j.test.RepeatRule.Repeat;
import org.neo4j.test.rule.DatabaseRule;
import org.neo4j.test.rule.ImpermanentDatabaseRule;
+import org.neo4j.test.rule.RepeatRule;
+import org.neo4j.test.rule.RepeatRule.Repeat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ClusterTopologyChangesIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ClusterTopologyChangesIT.java
index 50f11c5d5842..650708530366 100644
--- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ClusterTopologyChangesIT.java
+++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ClusterTopologyChangesIT.java
@@ -50,9 +50,9 @@
import org.neo4j.kernel.lifecycle.LifeSupport;
import org.neo4j.kernel.monitoring.Monitors;
import org.neo4j.logging.FormattedLogProvider;
-import org.neo4j.test.RepeatRule;
import org.neo4j.test.ha.ClusterRule;
import org.neo4j.test.rule.CleanupRule;
+import org.neo4j.test.rule.RepeatRule;
import org.neo4j.test.rule.SuppressOutput;
import static java.util.concurrent.TimeUnit.SECONDS;
diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/PropertyConstraintsStressIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/PropertyConstraintsStressIT.java
index 89c48dc37a6d..48f7071a1b41 100644
--- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/PropertyConstraintsStressIT.java
+++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/PropertyConstraintsStressIT.java
@@ -48,8 +48,8 @@
import org.neo4j.kernel.impl.ha.ClusterManager;
import org.neo4j.test.GraphDatabaseServiceCleaner;
import org.neo4j.test.OtherThreadExecutor.WorkerCommand;
-import org.neo4j.test.RepeatRule;
import org.neo4j.test.ha.ClusterRule;
+import org.neo4j.test.rule.RepeatRule;
import org.neo4j.test.rule.SuppressOutput;
import org.neo4j.test.rule.concurrent.OtherThreadRule;
diff --git a/integrationtests/pom.xml b/integrationtests/pom.xml
index 17c0b14ca6c6..f81f748d07ad 100644
--- a/integrationtests/pom.xml
+++ b/integrationtests/pom.xml
@@ -82,6 +82,13 @@
test-jar
test
+
+ org.neo4j
+ neo4j-common
+ ${project.version}
+ test-jar
+ test
+
org.neo4j
neo4j-io
diff --git a/integrationtests/src/test/java/org/neo4j/storeupgrade/LegacyIndexesUpgradeTest.java b/integrationtests/src/test/java/org/neo4j/storeupgrade/LegacyIndexesUpgradeTest.java
index f691538336ec..528fd5440601 100644
--- a/integrationtests/src/test/java/org/neo4j/storeupgrade/LegacyIndexesUpgradeTest.java
+++ b/integrationtests/src/test/java/org/neo4j/storeupgrade/LegacyIndexesUpgradeTest.java
@@ -42,9 +42,9 @@
import org.neo4j.index.lucene.ValueContext;
import org.neo4j.io.fs.FileUtils;
import org.neo4j.kernel.impl.storemigration.UpgradeNotAllowedByConfigurationException;
-import org.neo4j.test.NestedThrowableMatcher;
import org.neo4j.test.TestGraphDatabaseFactory;
import org.neo4j.test.Unzip;
+import org.neo4j.test.matchers.NestedThrowableMatcher;
import org.neo4j.test.rule.SuppressOutput;
import org.neo4j.test.rule.TestDirectory;