diff --git a/pi4j-core/test/java/com/pi4j/boardinfo/definition/BoardModelTest.java b/pi4j-core/src/test/java/com/pi4j/boardinfo/definition/BoardModelTest.java
similarity index 100%
rename from pi4j-core/test/java/com/pi4j/boardinfo/definition/BoardModelTest.java
rename to pi4j-core/src/test/java/com/pi4j/boardinfo/definition/BoardModelTest.java
diff --git a/pi4j-core/test/java/com/pi4j/boardinfo/model/ModelTest.java b/pi4j-core/src/test/java/com/pi4j/boardinfo/model/ModelTest.java
similarity index 100%
rename from pi4j-core/test/java/com/pi4j/boardinfo/model/ModelTest.java
rename to pi4j-core/src/test/java/com/pi4j/boardinfo/model/ModelTest.java
diff --git a/pi4j-core/test/java/com/pi4j/boardinfo/util/BoardModelDetectionTest.java b/pi4j-core/src/test/java/com/pi4j/boardinfo/util/BoardModelDetectionTest.java
similarity index 100%
rename from pi4j-core/test/java/com/pi4j/boardinfo/util/BoardModelDetectionTest.java
rename to pi4j-core/src/test/java/com/pi4j/boardinfo/util/BoardModelDetectionTest.java