diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 39baf586a..0d5d73a75 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -100,37 +100,17 @@
               <goal>test-compile</goal>
             </goals>
           </execution>
-          <execution>
-            <id>test-kapt</id>
-            <goals>
-              <goal>test-kapt</goal>
-            </goals>
-            <configuration>
-              <sourceDirs>
-                <sourceDir>src/test/kotlin</sourceDir>
-              </sourceDirs>
-              <annotationProcessorPaths>
-                <annotationProcessorPath>
-                  <groupId>io.ebean</groupId>
-                  <artifactId>kotlin-querybean-generator</artifactId>
-                  <version>13.13.3-RC1</version>
-                </annotationProcessorPath>
-              </annotationProcessorPaths>
-            </configuration>
-          </execution>
           <execution>
             <id>compile</id>
             <phase>compile</phase>
             <goals>
               <goal>compile</goal>
             </goals>
-            <configuration>
-              <sourceDirs>
-                <source>src/main/java</source>
-                <source>target/generated-sources/kapt/test</source>
-                <source>target/generated-sources/kaptKotlin/test</source>
-              </sourceDirs>
-            </configuration>
+<!--            <configuration>-->
+<!--              <sourceDirs>-->
+<!--                <source>src/main/java</source>-->
+<!--              </sourceDirs>-->
+<!--            </configuration>-->
           </execution>
         </executions>
         <configuration>
diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml
index a2503bb1a..fd5019e81 100644
--- a/tests/test-java16/pom.xml
+++ b/tests/test-java16/pom.xml
@@ -52,7 +52,7 @@
             <path>
               <groupId>io.ebean</groupId>
               <artifactId>querybean-generator</artifactId>
-              <version>13.13.3-SNAPSHOT</version>
+              <version>13.14.1-SNAPSHOT</version>
             </path>
           </annotationProcessorPaths>
         </configuration>
@@ -65,7 +65,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:13.13.2</tile>
+            <tile>io.ebean.tile:enhancement:13.14.0</tile>
           </tiles>
         </configuration>
       </plugin>
diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml
index ac004e532..8a97419b2 100644
--- a/tests/test-kotlin/pom.xml
+++ b/tests/test-kotlin/pom.xml
@@ -16,11 +16,27 @@
     <maven.compiler.target>11</maven.compiler.target>
 
     <ebean-maven-plugin.version>13.13.0</ebean-maven-plugin.version>
-    <kotlin.version>1.6.0</kotlin.version>
+    <kotlin.version>1.7.22</kotlin.version>
     <jackson.version>2.12.1</jackson.version>
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk8</artifactId>
+      <version>${kotlin.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.2.10</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <version>2.0.1.Final</version>
+    </dependency>
+
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
@@ -41,36 +57,17 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>13.14.1-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <version>1.2.10</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-stdlib-jdk8</artifactId>
-      <version>${kotlin.version}</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-test</artifactId>
       <version>${kotlin.version}</version>
       <scope>test</scope>
     </dependency>
+
   </dependencies>
 
   <build>
+    <sourceDirectory>src/main/kotlin</sourceDirectory>
     <testSourceDirectory>src/test/kotlin</testSourceDirectory>
     <plugins>
       <plugin>
@@ -78,40 +75,91 @@
         <artifactId>kotlin-maven-plugin</artifactId>
         <version>${kotlin.version}</version>
         <configuration>
-          <jvmTarget>11</jvmTarget>
+          <jvmTarget>${maven.compiler.target}</jvmTarget>
         </configuration>
         <executions>
           <execution>
-            <id>test-compile</id>
+            <id>kapt</id>
             <goals>
-              <goal>test-compile</goal>
+              <goal>kapt</goal>
+            </goals>
+            <configuration>
+              <sourceDirs>
+                <sourceDir>src/main/kotlin</sourceDir>
+              </sourceDirs>
+              <annotationProcessorPaths>
+                <annotationProcessorPath>
+                  <groupId>io.ebean</groupId>
+                  <artifactId>kotlin-querybean-generator</artifactId>
+                  <version>13.14.0</version>
+                </annotationProcessorPath>
+              </annotationProcessorPaths>
+            </configuration>
+          </execution>
+          <execution>
+            <id>compile</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>compile</goal>
             </goals>
           </execution>
-<!--          <execution>-->
-<!--            <id>test-kapt</id>-->
-<!--            <goals>-->
-<!--              <goal>test-kapt</goal>-->
-<!--            </goals>-->
-<!--            <configuration>-->
-<!--              <sourceDirs>-->
-<!--                <sourceDir>src/test/kotlin</sourceDir>-->
-<!--              </sourceDirs>-->
-<!--              <annotationProcessorPaths>-->
-<!--                <annotationProcessorPath>-->
-<!--                  <groupId>io.ebean</groupId>-->
-<!--                  <artifactId>kotlin-querybean-generator</artifactId>-->
-<!--                  <version>13.13.2</version>-->
-<!--                </annotationProcessorPath>-->
-<!--              </annotationProcessorPaths>-->
-<!--            </configuration>-->
-<!--          </execution>-->
         </executions>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>${maven-compiler-plugin.version}</version>
+        <configuration>
+          <release>${java.release}</release>
+        </configuration>
+        <executions>
+          <!-- Replacing default-compile as it is treated specially by maven -->
+          <execution>
+            <id>default-compile</id>
+            <phase>none</phase>
+            <configuration/>
+          </execution>
+          <!-- Replacing default-testCompile as it is treated specially by maven -->
+          <execution>
+            <id>default-testCompile</id>
+            <phase>none</phase>
+            <configuration/>
+          </execution>
+          <execution>
+            <configuration/>
+            <id>java-compile</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+          <execution>
+            <configuration/>
+            <id>java-test-compile</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>testCompile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
         <version>${ebean-maven-plugin.version}</version>
         <executions>
+          <execution>
+            <id>main</id>
+            <phase>process-classes</phase>
+            <configuration>
+              <transformArgs>debug=1</transformArgs>
+            </configuration>
+            <goals>
+              <goal>enhance</goal>
+            </goals>
+          </execution>
           <execution>
             <id>test</id>
             <phase>process-test-classes</phase>
diff --git a/kotlin-querybean-generator/src/test/kotlin/org/example/domain/Address.kt b/tests/test-kotlin/src/main/kotlin/org/example/domain/Address.kt
similarity index 100%
rename from kotlin-querybean-generator/src/test/kotlin/org/example/domain/Address.kt
rename to tests/test-kotlin/src/main/kotlin/org/example/domain/Address.kt
diff --git a/kotlin-querybean-generator/src/test/kotlin/org/example/domain/BaseModel.kt b/tests/test-kotlin/src/main/kotlin/org/example/domain/BaseModel.kt
similarity index 100%
rename from kotlin-querybean-generator/src/test/kotlin/org/example/domain/BaseModel.kt
rename to tests/test-kotlin/src/main/kotlin/org/example/domain/BaseModel.kt
diff --git a/kotlin-querybean-generator/src/test/kotlin/org/example/domain/MyKotInner.kt b/tests/test-kotlin/src/main/kotlin/org/example/domain/MyKotInner.kt
similarity index 100%
rename from kotlin-querybean-generator/src/test/kotlin/org/example/domain/MyKotInner.kt
rename to tests/test-kotlin/src/main/kotlin/org/example/domain/MyKotInner.kt
diff --git a/kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/Email.kt b/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/Email.kt
similarity index 100%
rename from kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/Email.kt
rename to tests/test-kotlin/src/main/kotlin/org/example/otherpackage/Email.kt
diff --git a/kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/GenericType.kt b/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/GenericType.kt
similarity index 100%
rename from kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/GenericType.kt
rename to tests/test-kotlin/src/main/kotlin/org/example/otherpackage/GenericType.kt
diff --git a/kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/GenericTypeArgument.kt b/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/GenericTypeArgument.kt
similarity index 100%
rename from kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/GenericTypeArgument.kt
rename to tests/test-kotlin/src/main/kotlin/org/example/otherpackage/GenericTypeArgument.kt
diff --git a/kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/GenericTypeAttributeConverter.kt b/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/GenericTypeAttributeConverter.kt
similarity index 100%
rename from kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/GenericTypeAttributeConverter.kt
rename to tests/test-kotlin/src/main/kotlin/org/example/otherpackage/GenericTypeAttributeConverter.kt
diff --git a/kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/PhoneAttributeConverter.kt b/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/PhoneAttributeConverter.kt
similarity index 100%
rename from kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/PhoneAttributeConverter.kt
rename to tests/test-kotlin/src/main/kotlin/org/example/otherpackage/PhoneAttributeConverter.kt
diff --git a/kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/PhoneNumber.kt b/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/PhoneNumber.kt
similarity index 100%
rename from kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/PhoneNumber.kt
rename to tests/test-kotlin/src/main/kotlin/org/example/otherpackage/PhoneNumber.kt
diff --git a/kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/ValidEmail.kt b/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/ValidEmail.kt
similarity index 100%
rename from kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/ValidEmail.kt
rename to tests/test-kotlin/src/main/kotlin/org/example/otherpackage/ValidEmail.kt
diff --git a/kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/ValidEmailAttributeConverter.kt b/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/ValidEmailAttributeConverter.kt
similarity index 100%
rename from kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/ValidEmailAttributeConverter.kt
rename to tests/test-kotlin/src/main/kotlin/org/example/otherpackage/ValidEmailAttributeConverter.kt
diff --git a/kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/InnerTest.kt b/tests/test-kotlin/src/test/kotlin/org/example/InnerTest.kt
similarity index 93%
rename from kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/InnerTest.kt
rename to tests/test-kotlin/src/test/kotlin/org/example/InnerTest.kt
index caa3bb0a0..99b1be7ba 100644
--- a/kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/InnerTest.kt
+++ b/tests/test-kotlin/src/test/kotlin/org/example/InnerTest.kt
@@ -1,4 +1,4 @@
-package org.example.otherpackage
+package org.example
 
 import io.ebean.DB
 import org.assertj.core.api.AssertionsForInterfaceTypes.assertThat
diff --git a/kotlin-querybean-generator/src/test/kotlin/io/ebean/querybean/generator/AddressTest.kt b/tests/test-kotlin/src/test/kotlin/org/example/domain/AddressTest.kt
similarity index 87%
rename from kotlin-querybean-generator/src/test/kotlin/io/ebean/querybean/generator/AddressTest.kt
rename to tests/test-kotlin/src/test/kotlin/org/example/domain/AddressTest.kt
index 22865347c..6e2bba501 100644
--- a/kotlin-querybean-generator/src/test/kotlin/io/ebean/querybean/generator/AddressTest.kt
+++ b/tests/test-kotlin/src/test/kotlin/org/example/domain/AddressTest.kt
@@ -1,8 +1,6 @@
-package io.ebean.querybean.generator
+package org.example.domain
 
-import org.example.domain.Address
 import org.junit.jupiter.api.Assertions.assertTrue
-import org.junit.jupiter.api.Assertions.fail
 import org.junit.jupiter.api.Test
 
 class AddressTest {