diff --git a/jOOQ/src/test/java/org/jooq/test/BasicTest.java b/jOOQ/src/test/java/org/jooq/test/BasicTest.java
index d7be933199..b270fa0889 100644
--- a/jOOQ/src/test/java/org/jooq/test/BasicTest.java
+++ b/jOOQ/src/test/java/org/jooq/test/BasicTest.java
@@ -62,14 +62,14 @@ import static org.jooq.impl.Factory.sum;
 import static org.jooq.impl.Factory.tableByName;
 import static org.jooq.impl.Factory.trueCondition;
 import static org.jooq.impl.Factory.val;
-import static org.jooq.test.Table1.FIELD_DATE1;
-import static org.jooq.test.Table1.FIELD_ID1;
-import static org.jooq.test.Table1.FIELD_NAME1;
-import static org.jooq.test.Table1.TABLE1;
-import static org.jooq.test.Table2.FIELD_ID2;
-import static org.jooq.test.Table2.TABLE2;
-import static org.jooq.test.Table3.FIELD_ID3;
-import static org.jooq.test.Table3.TABLE3;
+import static org.jooq.test.data.Table1.FIELD_DATE1;
+import static org.jooq.test.data.Table1.FIELD_ID1;
+import static org.jooq.test.data.Table1.FIELD_NAME1;
+import static org.jooq.test.data.Table1.TABLE1;
+import static org.jooq.test.data.Table2.FIELD_ID2;
+import static org.jooq.test.data.Table2.TABLE2;
+import static org.jooq.test.data.Table3.FIELD_ID3;
+import static org.jooq.test.data.Table3.TABLE3;
 
 import java.math.BigDecimal;
 import java.sql.Date;
@@ -124,6 +124,8 @@ import org.jooq.impl.CustomCondition;
 import org.jooq.impl.CustomField;
 import org.jooq.impl.Executor;
 import org.jooq.impl.Factory;
+import org.jooq.test.data.Table1Record;
+import org.jooq.test.data.TestDataType;
 import org.jooq.types.DayToSecond;
 import org.jooq.types.Interval;
 import org.jooq.types.YearToMonth;
diff --git a/jOOQ/src/test/java/org/jooq/test/Table1.java b/jOOQ/src/test/java/org/jooq/test/data/Table1.java
similarity index 96%
rename from jOOQ/src/test/java/org/jooq/test/Table1.java
rename to jOOQ/src/test/java/org/jooq/test/data/Table1.java
index bb796bddcc..c76b5ff77f 100644
--- a/jOOQ/src/test/java/org/jooq/test/Table1.java
+++ b/jOOQ/src/test/java/org/jooq/test/data/Table1.java
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package org.jooq.test;
+package org.jooq.test.data;
 
 import java.sql.Date;
 
diff --git a/jOOQ/src/test/java/org/jooq/test/Table1Record.java b/jOOQ/src/test/java/org/jooq/test/data/Table1Record.java
similarity index 96%
rename from jOOQ/src/test/java/org/jooq/test/Table1Record.java
rename to jOOQ/src/test/java/org/jooq/test/data/Table1Record.java
index cdd7726da1..0c9b360795 100644
--- a/jOOQ/src/test/java/org/jooq/test/Table1Record.java
+++ b/jOOQ/src/test/java/org/jooq/test/data/Table1Record.java
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package org.jooq.test;
+package org.jooq.test.data;
 
 import org.jooq.impl.TableRecordImpl;
 
diff --git a/jOOQ/src/test/java/org/jooq/test/Table2.java b/jOOQ/src/test/java/org/jooq/test/data/Table2.java
similarity index 96%
rename from jOOQ/src/test/java/org/jooq/test/Table2.java
rename to jOOQ/src/test/java/org/jooq/test/data/Table2.java
index 9971ee015d..2698d972de 100644
--- a/jOOQ/src/test/java/org/jooq/test/Table2.java
+++ b/jOOQ/src/test/java/org/jooq/test/data/Table2.java
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package org.jooq.test;
+package org.jooq.test.data;
 
 import java.sql.Date;
 
diff --git a/jOOQ/src/test/java/org/jooq/test/Table2Record.java b/jOOQ/src/test/java/org/jooq/test/data/Table2Record.java
similarity index 96%
rename from jOOQ/src/test/java/org/jooq/test/Table2Record.java
rename to jOOQ/src/test/java/org/jooq/test/data/Table2Record.java
index 65552b6e37..188b76d40e 100644
--- a/jOOQ/src/test/java/org/jooq/test/Table2Record.java
+++ b/jOOQ/src/test/java/org/jooq/test/data/Table2Record.java
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package org.jooq.test;
+package org.jooq.test.data;
 
 import org.jooq.impl.TableRecordImpl;
 
diff --git a/jOOQ/src/test/java/org/jooq/test/Table3.java b/jOOQ/src/test/java/org/jooq/test/data/Table3.java
similarity index 96%
rename from jOOQ/src/test/java/org/jooq/test/Table3.java
rename to jOOQ/src/test/java/org/jooq/test/data/Table3.java
index 4693a8e4c4..2c5a0c4311 100644
--- a/jOOQ/src/test/java/org/jooq/test/Table3.java
+++ b/jOOQ/src/test/java/org/jooq/test/data/Table3.java
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package org.jooq.test;
+package org.jooq.test.data;
 
 import java.sql.Date;
 
diff --git a/jOOQ/src/test/java/org/jooq/test/Table3Record.java b/jOOQ/src/test/java/org/jooq/test/data/Table3Record.java
similarity index 96%
rename from jOOQ/src/test/java/org/jooq/test/Table3Record.java
rename to jOOQ/src/test/java/org/jooq/test/data/Table3Record.java
index 79e7a92636..1e2b7f801d 100644
--- a/jOOQ/src/test/java/org/jooq/test/Table3Record.java
+++ b/jOOQ/src/test/java/org/jooq/test/data/Table3Record.java
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package org.jooq.test;
+package org.jooq.test.data;
 
 import org.jooq.impl.TableRecordImpl;
 
diff --git a/jOOQ/src/test/java/org/jooq/test/TestDataType.java b/jOOQ/src/test/java/org/jooq/test/data/TestDataType.java
similarity index 96%
rename from jOOQ/src/test/java/org/jooq/test/TestDataType.java
rename to jOOQ/src/test/java/org/jooq/test/data/TestDataType.java
index a6dca156a2..b88dc980ef 100644
--- a/jOOQ/src/test/java/org/jooq/test/TestDataType.java
+++ b/jOOQ/src/test/java/org/jooq/test/data/TestDataType.java
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package org.jooq.test;
+package org.jooq.test.data;
 
 import java.sql.Date;