diff --git a/stresstests/src/test/java/org/neo4j/kernel/stresstests/CheckPointingLogRotationStressTesting.java b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/CheckPointingLogRotationStressTesting.java
similarity index 93%
rename from stresstests/src/test/java/org/neo4j/kernel/stresstests/CheckPointingLogRotationStressTesting.java
rename to stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/CheckPointingLogRotationStressTesting.java
index 9355e2298b99c..a8e8454425d89 100644
--- a/stresstests/src/test/java/org/neo4j/kernel/stresstests/CheckPointingLogRotationStressTesting.java
+++ b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/CheckPointingLogRotationStressTesting.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.kernel.stresstests;
+package org.neo4j.kernel.stresstests.transaction.checkpoint;
 
 import org.junit.Test;
 
@@ -30,8 +30,8 @@
 import org.neo4j.io.fs.FileUtils;
 import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory;
 import org.neo4j.kernel.impl.logging.NullLogService;
-import org.neo4j.kernel.stresstests.tracers.TimerTransactionTracer;
-import org.neo4j.kernel.stresstests.workload.Workload;
+import org.neo4j.kernel.stresstests.transaction.checkpoint.tracers.TimerTransactionTracer;
+import org.neo4j.kernel.stresstests.transaction.checkpoint.workload.Workload;
 import org.neo4j.unsafe.impl.batchimport.ParallelBatchImporter;
 import org.neo4j.unsafe.impl.batchimport.staging.ExecutionMonitors;
 
@@ -39,7 +39,7 @@
 import static java.lang.Long.parseLong;
 import static java.lang.System.getProperty;
 import static java.lang.System.getenv;
-import static org.neo4j.kernel.stresstests.mutation.RandomMutationFactory.defaultRandomMutation;
+import static org.neo4j.kernel.stresstests.transaction.checkpoint.mutation.RandomMutationFactory.defaultRandomMutation;
 import static org.neo4j.unsafe.impl.batchimport.Configuration.DEFAULT;
 
 /**
diff --git a/stresstests/src/test/java/org/neo4j/kernel/stresstests/NodeCountInputs.java b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/NodeCountInputs.java
similarity index 98%
rename from stresstests/src/test/java/org/neo4j/kernel/stresstests/NodeCountInputs.java
rename to stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/NodeCountInputs.java
index 36c46e8a9a492..b8e943ede0142 100644
--- a/stresstests/src/test/java/org/neo4j/kernel/stresstests/NodeCountInputs.java
+++ b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/NodeCountInputs.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.kernel.stresstests;
+package org.neo4j.kernel.stresstests.transaction.checkpoint;
 
 import org.neo4j.unsafe.impl.batchimport.InputIterable;
 import org.neo4j.unsafe.impl.batchimport.InputIterator;
diff --git a/stresstests/src/test/java/org/neo4j/kernel/stresstests/TransactionThroughputChecker.java b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/TransactionThroughputChecker.java
similarity index 96%
rename from stresstests/src/test/java/org/neo4j/kernel/stresstests/TransactionThroughputChecker.java
rename to stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/TransactionThroughputChecker.java
index 7d928da9afcc1..e2ca664425f15 100644
--- a/stresstests/src/test/java/org/neo4j/kernel/stresstests/TransactionThroughputChecker.java
+++ b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/TransactionThroughputChecker.java
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.kernel.stresstests;
+package org.neo4j.kernel.stresstests.transaction.checkpoint;
 
 import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.neo4j.kernel.stresstests.workload.Workload;
+import org.neo4j.kernel.stresstests.transaction.checkpoint.workload.Workload;
 
 import static org.junit.Assert.assertTrue;
 
diff --git a/stresstests/src/test/java/org/neo4j/kernel/stresstests/mutation/LabelMutation.java b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/mutation/LabelMutation.java
similarity index 95%
rename from stresstests/src/test/java/org/neo4j/kernel/stresstests/mutation/LabelMutation.java
rename to stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/mutation/LabelMutation.java
index ea7d2c3ebefe2..9faa47ba710d8 100644
--- a/stresstests/src/test/java/org/neo4j/kernel/stresstests/mutation/LabelMutation.java
+++ b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/mutation/LabelMutation.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.kernel.stresstests.mutation;
+package org.neo4j.kernel.stresstests.transaction.checkpoint.mutation;
 
 import org.neo4j.graphdb.DynamicLabel;
 import org.neo4j.graphdb.GraphDatabaseService;
diff --git a/stresstests/src/test/java/org/neo4j/kernel/stresstests/mutation/Mutation.java b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/mutation/Mutation.java
similarity index 92%
rename from stresstests/src/test/java/org/neo4j/kernel/stresstests/mutation/Mutation.java
rename to stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/mutation/Mutation.java
index d18db7405ab98..9e048be743c40 100644
--- a/stresstests/src/test/java/org/neo4j/kernel/stresstests/mutation/Mutation.java
+++ b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/mutation/Mutation.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.kernel.stresstests.mutation;
+package org.neo4j.kernel.stresstests.transaction.checkpoint.mutation;
 
 
 interface Mutation
diff --git a/stresstests/src/test/java/org/neo4j/kernel/stresstests/mutation/PropertyMutation.java b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/mutation/PropertyMutation.java
similarity index 95%
rename from stresstests/src/test/java/org/neo4j/kernel/stresstests/mutation/PropertyMutation.java
rename to stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/mutation/PropertyMutation.java
index 68a7b2ae52307..86dd0da3f2f59 100644
--- a/stresstests/src/test/java/org/neo4j/kernel/stresstests/mutation/PropertyMutation.java
+++ b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/mutation/PropertyMutation.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.kernel.stresstests.mutation;
+package org.neo4j.kernel.stresstests.transaction.checkpoint.mutation;
 
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Node;
diff --git a/stresstests/src/test/java/org/neo4j/kernel/stresstests/mutation/RandomMutation.java b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/mutation/RandomMutation.java
similarity index 92%
rename from stresstests/src/test/java/org/neo4j/kernel/stresstests/mutation/RandomMutation.java
rename to stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/mutation/RandomMutation.java
index 0f662948b4556..ca5e73bce931c 100644
--- a/stresstests/src/test/java/org/neo4j/kernel/stresstests/mutation/RandomMutation.java
+++ b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/mutation/RandomMutation.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.kernel.stresstests.mutation;
+package org.neo4j.kernel.stresstests.transaction.checkpoint.mutation;
 
 public interface RandomMutation
 {
diff --git a/stresstests/src/test/java/org/neo4j/kernel/stresstests/mutation/RandomMutationFactory.java b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/mutation/RandomMutationFactory.java
similarity index 94%
rename from stresstests/src/test/java/org/neo4j/kernel/stresstests/mutation/RandomMutationFactory.java
rename to stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/mutation/RandomMutationFactory.java
index 36dd676a37e1d..f6ce2f413d5a0 100644
--- a/stresstests/src/test/java/org/neo4j/kernel/stresstests/mutation/RandomMutationFactory.java
+++ b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/mutation/RandomMutationFactory.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.kernel.stresstests.mutation;
+package org.neo4j.kernel.stresstests.transaction.checkpoint.mutation;
 
 
 import org.neo4j.graphdb.GraphDatabaseService;
diff --git a/stresstests/src/test/java/org/neo4j/kernel/stresstests/mutation/SimpleRandomMutation.java b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/mutation/SimpleRandomMutation.java
similarity index 96%
rename from stresstests/src/test/java/org/neo4j/kernel/stresstests/mutation/SimpleRandomMutation.java
rename to stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/mutation/SimpleRandomMutation.java
index e40a9ee3c90ca..132030a7a5ea2 100644
--- a/stresstests/src/test/java/org/neo4j/kernel/stresstests/mutation/SimpleRandomMutation.java
+++ b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/mutation/SimpleRandomMutation.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.kernel.stresstests.mutation;
+package org.neo4j.kernel.stresstests.transaction.checkpoint.mutation;
 
 import java.util.concurrent.ThreadLocalRandom;
 
diff --git a/stresstests/src/test/java/org/neo4j/kernel/stresstests/tracers/TimerTracerFactory.java b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/tracers/TimerTracerFactory.java
similarity index 96%
rename from stresstests/src/test/java/org/neo4j/kernel/stresstests/tracers/TimerTracerFactory.java
rename to stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/tracers/TimerTracerFactory.java
index c1ac211e5bf7f..e528968c09d37 100644
--- a/stresstests/src/test/java/org/neo4j/kernel/stresstests/tracers/TimerTracerFactory.java
+++ b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/tracers/TimerTracerFactory.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.kernel.stresstests.tracers;
+package org.neo4j.kernel.stresstests.transaction.checkpoint.tracers;
 
 import org.neo4j.io.pagecache.tracing.PageCacheTracer;
 import org.neo4j.kernel.impl.transaction.tracing.CheckPointTracer;
diff --git a/stresstests/src/test/java/org/neo4j/kernel/stresstests/tracers/TimerTransactionTracer.java b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/tracers/TimerTransactionTracer.java
similarity index 98%
rename from stresstests/src/test/java/org/neo4j/kernel/stresstests/tracers/TimerTransactionTracer.java
rename to stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/tracers/TimerTransactionTracer.java
index 999c6aaf17e81..a787a3737f27f 100644
--- a/stresstests/src/test/java/org/neo4j/kernel/stresstests/tracers/TimerTransactionTracer.java
+++ b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/tracers/TimerTransactionTracer.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.kernel.stresstests.tracers;
+package org.neo4j.kernel.stresstests.transaction.checkpoint.tracers;
 
 import org.HdrHistogram.Histogram;
 
diff --git a/stresstests/src/test/java/org/neo4j/kernel/stresstests/workload/SyncMonitor.java b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/workload/SyncMonitor.java
similarity index 96%
rename from stresstests/src/test/java/org/neo4j/kernel/stresstests/workload/SyncMonitor.java
rename to stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/workload/SyncMonitor.java
index 4c163af0a532f..638819a33ae25 100644
--- a/stresstests/src/test/java/org/neo4j/kernel/stresstests/workload/SyncMonitor.java
+++ b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/workload/SyncMonitor.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.kernel.stresstests.workload;
+package org.neo4j.kernel.stresstests.transaction.checkpoint.workload;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/stresstests/src/test/java/org/neo4j/kernel/stresstests/workload/Worker.java b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/workload/Worker.java
similarity index 93%
rename from stresstests/src/test/java/org/neo4j/kernel/stresstests/workload/Worker.java
rename to stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/workload/Worker.java
index 09290a7ba1513..419dacb1115ee 100644
--- a/stresstests/src/test/java/org/neo4j/kernel/stresstests/workload/Worker.java
+++ b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/workload/Worker.java
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.kernel.stresstests.workload;
+package org.neo4j.kernel.stresstests.transaction.checkpoint.workload;
 
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Transaction;
 import org.neo4j.kernel.DeadlockDetectedException;
-import org.neo4j.kernel.stresstests.mutation.RandomMutation;
+import org.neo4j.kernel.stresstests.transaction.checkpoint.mutation.RandomMutation;
 
 class Worker implements Runnable
 {
diff --git a/stresstests/src/test/java/org/neo4j/kernel/stresstests/workload/Workload.java b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/workload/Workload.java
similarity index 96%
rename from stresstests/src/test/java/org/neo4j/kernel/stresstests/workload/Workload.java
rename to stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/workload/Workload.java
index c66020dcded5e..8ae99b233c669 100644
--- a/stresstests/src/test/java/org/neo4j/kernel/stresstests/workload/Workload.java
+++ b/stresstests/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/workload/Workload.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.kernel.stresstests.workload;
+package org.neo4j.kernel.stresstests.transaction.checkpoint.workload;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -25,7 +25,7 @@
 
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Resource;
-import org.neo4j.kernel.stresstests.mutation.RandomMutation;
+import org.neo4j.kernel.stresstests.transaction.checkpoint.mutation.RandomMutation;
 
 public class Workload implements Resource
 {
diff --git a/stresstests/src/test/resources/META-INF/services/org.neo4j.kernel.monitoring.tracing.TracerFactory b/stresstests/src/test/resources/META-INF/services/org.neo4j.kernel.monitoring.tracing.TracerFactory
index ac355dccf53b6..36f3947842f0d 100644
--- a/stresstests/src/test/resources/META-INF/services/org.neo4j.kernel.monitoring.tracing.TracerFactory
+++ b/stresstests/src/test/resources/META-INF/services/org.neo4j.kernel.monitoring.tracing.TracerFactory
@@ -1 +1 @@
-org.neo4j.kernel.stresstests.tracers.TimerTracerFactory
+org.neo4j.kernel.stresstests.transaction.checkpoint.tracers.TimerTracerFactory