diff --git a/engine-core/src/test/java/io/nosqlbench/core/ActivityExecutorTest.java b/engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java
similarity index 98%
rename from engine-core/src/test/java/io/nosqlbench/core/ActivityExecutorTest.java
rename to engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java
index 79641fb66..daa6bed16 100644
--- a/engine-core/src/test/java/io/nosqlbench/core/ActivityExecutorTest.java
+++ b/engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.core;
+package io.nosqlbench.engine.core;
 
 import io.nosqlbench.engine.api.activityapi.core.*;
 import io.nosqlbench.engine.api.activityapi.output.OutputDispenser;
@@ -12,7 +12,6 @@ import io.nosqlbench.engine.api.activityimpl.input.CoreInputDispenser;
 import io.nosqlbench.engine.api.activityimpl.input.AtomicInput;
 import io.nosqlbench.engine.api.activityimpl.motor.CoreMotor;
 import io.nosqlbench.engine.api.activityimpl.motor.CoreMotorDispenser;
-import io.nosqlbench.engine.core.ActivityExecutor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.junit.Test;
diff --git a/engine-core/src/test/java/io/nosqlbench/core/CoreMotorTest.java b/engine-core/src/test/java/io/nosqlbench/engine/core/CoreMotorTest.java
similarity index 99%
rename from engine-core/src/test/java/io/nosqlbench/core/CoreMotorTest.java
rename to engine-core/src/test/java/io/nosqlbench/engine/core/CoreMotorTest.java
index 7c88006b1..451af81e2 100644
--- a/engine-core/src/test/java/io/nosqlbench/core/CoreMotorTest.java
+++ b/engine-core/src/test/java/io/nosqlbench/engine/core/CoreMotorTest.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.core;
+package io.nosqlbench.engine.core;
 
 import io.nosqlbench.engine.api.activityapi.core.*;
 import io.nosqlbench.engine.core.fortesting.BlockingSegmentInput;
diff --git a/engine-core/src/test/java/io/nosqlbench/core/ScenarioTest.java b/engine-core/src/test/java/io/nosqlbench/engine/core/ScenarioTest.java
similarity index 97%
rename from engine-core/src/test/java/io/nosqlbench/core/ScenarioTest.java
rename to engine-core/src/test/java/io/nosqlbench/engine/core/ScenarioTest.java
index 8fd07277c..7e3bb2484 100644
--- a/engine-core/src/test/java/io/nosqlbench/core/ScenarioTest.java
+++ b/engine-core/src/test/java/io/nosqlbench/engine/core/ScenarioTest.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.core;
+package io.nosqlbench.engine.core;
 
 import io.nosqlbench.engine.api.scripting.ScriptEnvBuffer;
 import io.nosqlbench.engine.core.script.Scenario;