diff --git a/Jenkinsfile b/Jenkinsfile
index 7488063e76..d5b53c84b1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -41,7 +41,7 @@ stage('Configure') {
 //		new BuildEnvironment( dbName: 'sybase' ),
 // Don't build with HANA by default, but only do it nightly until we receive a 3rd instance
 // 		new BuildEnvironment( dbName: 'hana_cloud', dbLockableResource: 'hana-cloud', dbLockResourceAsHost: true ),
-		new BuildEnvironment( node: 's390x' ),
+		new BuildEnvironment( node: 's390x', additionalOptions: '-PexcludeTests=**/KotlinProjectTests*' ),
 		new BuildEnvironment( dbName: 'tidb', node: 'tidb',
 				notificationRecipients: 'tidb_hibernate@pingcap.com' ),
 		// We want to enable preview features when testing newer builds of OpenJDK:
diff --git a/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle b/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle
index 5518207697..0a4e4e5e05 100644
--- a/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle
+++ b/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle
@@ -79,6 +79,9 @@ pluginBundle {
 
 test {
 	useJUnitPlatform()
+	if ( project.hasProperty( 'excludeTests' ) ) {
+		exclude project.property( 'excludeTests' )
+	}
 }
 
 // Publish to the Gradle Plugin Portal