diff --git a/chameleon-server/build.gradle b/chameleon-server/build.gradle
index 51f230e24..03f0070f2 100644
--- a/chameleon-server/build.gradle
+++ b/chameleon-server/build.gradle
@@ -110,15 +110,13 @@ sourceSets {
 }
 
 test {
-    test {
-        systemProperty "java.awt.headless", System.getProperty("java.awt.headless")
-        useJUnitPlatform()
-    }
+    useJUnitPlatform()
 }
 
-task testHeadless(dependsOn: test) {
+task testHeadless(type: Test) {
     group = 'verification'
-    test.systemProperty("java.awt.headless", "true")
+    systemProperty("java.awt.headless", "true")
+    useJUnitPlatform()
 }
 
 spotless {