diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 759567f09..0be3286f4 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -12,7 +12,7 @@
   <artifactId>kotlin-querybean-generator</artifactId>
 
   <properties>
-    <kotlin.version>1.5.30-M1</kotlin.version>
+    <kotlin.version>1.6.0</kotlin.version>
   </properties>
 
   <dependencies>
diff --git a/pom.xml b/pom.xml
index 6cf80ad6e..740ee0b08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,8 +90,23 @@
     <module>ebean-querybean</module>
     <module>ebean-postgis</module>
     <module>ebean-redis</module>
-<!--    <module>tests</module>-->
+
   </modules>
 
+  <profiles>
+    <profile>
+      <id>release</id>
+    </profile>
+    <profile>
+      <id>default</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <modules>
+        <module>tests</module>
+      </modules>
+    </profile>
+  </profiles>
+
 </project>
 
diff --git a/tests/pom.xml b/tests/pom.xml
index 9edd759f2..c6f2cdcc5 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -19,11 +19,25 @@
     <maven.deploy.skip>true</maven.deploy.skip>
   </properties>
 
-  <modules>
-    <!-- test-java16 REQUIRES JDK 16 to run -->
-<!--    <module>test-java16</module>-->
-    <!-- test-kotlin does NOT run with JDK 16!! -->
-    <module>test-kotlin</module>
-  </modules>
+  <profiles>
+    <profile>
+      <id>jdk16plus</id>
+      <activation>
+        <jdk>[16,20]</jdk>
+      </activation>
+      <modules>
+        <module>test-java16</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>jdk15less</id>
+      <activation>
+        <jdk>[8,15]</jdk>
+      </activation>
+      <modules>
+        <module>test-kotlin</module>
+      </modules>
+    </profile>
+  </profiles>
 
 </project>
diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml
index 4a416d12e..0f4927da5 100644
--- a/tests/test-java16/pom.xml
+++ b/tests/test-java16/pom.xml
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>12.13.0-SNAPSHOT</version>
+      <version>12.13.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -32,7 +32,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.13.0-SNAPSHOT</version>
+      <version>12.13.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -58,7 +58,7 @@
             <path>
               <groupId>io.ebean</groupId>
               <artifactId>querybean-generator</artifactId>
-              <version>12.13.0-SNAPSHOT</version>
+              <version>12.13.2-SNAPSHOT</version>
             </path>
           </annotationProcessorPaths>
         </configuration>
diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml
index 1321332b8..64981379f 100644
--- a/tests/test-kotlin/pom.xml
+++ b/tests/test-kotlin/pom.xml
@@ -9,7 +9,7 @@
     <version>2.3</version>
   </parent>
 
-  <name>kotlin test</name>
+  <name>test-kotlin</name>
   <description>Kotlin specific tests</description>
   <artifactId>test-kotlin</artifactId>
   <version>1.0</version>
@@ -19,7 +19,7 @@
     <maven.compiler.target>11</maven.compiler.target>
 
     <ebean-maven-plugin.version>12.13.0</ebean-maven-plugin.version>
-    <kotlin.version>1.5.31</kotlin.version>
+    <kotlin.version>1.6.0</kotlin.version>
     <jackson.version>2.12.1</jackson.version>
     <maven.deploy.skip>true</maven.deploy.skip>
   </properties>
@@ -35,14 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.13.0-SNAPSHOT</version>
+      <version>12.13.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.13.0-SNAPSHOT</version>
+      <version>12.13.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>