diff --git a/gating.yaml b/gating.yaml
index d96530f..ba3a77f 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -5,9 +5,12 @@ decision_contexts:
   - bodhi_update_push_testing
   - bodhi_update_push_stable
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke/jdk8.functional}
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke/jdk11.functional}
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke/jdk17.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke/jdk8/full.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke/jdk11/full.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke/jdk17/full.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke/jdk8/headless.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke/jdk11/headless.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke/jdk17/headless.functional}
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages/jdk8.functional}
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages/jdk11.functional}
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages/jdk17.functional}
diff --git a/plans/regression.fmf b/plans/regression.fmf
deleted file mode 100644
index f88007e..0000000
--- a/plans/regression.fmf
+++ /dev/null
@@ -1,19 +0,0 @@
-discover:
-  summary: Regression tests (default OpenJDK)
-  how: shell
-  tests:
-    - name: /regression/environment-java-home
-      environment:
-        JAVA_HOME: /tmp/java-home
-      test: |
-        mkdir -p "${JAVA_HOME}/bin"
-        echo -e '#!/bin/sh\nfalse' > "${JAVA_HOME}/bin/java"
-        chmod a+x "${JAVA_HOME}/bin/java"
-        ! mvn -v
-prepare:
-  how: install
-  exclude:
-    - maven-openjdk8
-    - maven-openjdk11
-execute:
-  how: tmt
diff --git a/plans/smoke.fmf b/plans/smoke.fmf
index 73c96c9..68cd3db 100644
--- a/plans/smoke.fmf
+++ b/plans/smoke.fmf
@@ -1,41 +1,71 @@
 discover:
-  how: shell
-  tests:
-    - name: /smoke/ensure-single-jdk
-      test: "! rpm -qa | grep ^java- | grep -v ^java-${JDK_VERSION}-openjdk-"
-    - name: /smoke/show-version
-      test: mvn -v
-    - name: /smoke/dependency-get
-      test: rm -rf $HOME/.m2 && mvn -V dependency:get -Dartifact=junit:junit:4.12 && stat $HOME/.m2/repository/junit/junit/4.12/junit-4.12.jar
-prepare:
-  how: install
-  exclude:
-    - maven-openjdk8
-    - maven-openjdk11
-    - maven-openjdk17
+  how: fmf
+  url: https://github.com/mizdebsk/maven-tests
+
 execute:
   how: tmt
 
 /jdk8:
-  summary: Basic smoke tests (OpenJDK 8)
   environment:
-    JDK_VERSION: 1.8.0
-  prepare+:
-    exclude-:
-      - maven-openjdk8
+    OPENJDK_VERSION: 1.8.0
+  prepare:
+    - how: install
+      exclude:
+        - maven-openjdk11
+        - maven-openjdk17
+
+  /full:
+    summary: Basic smoke tests (OpenJDK 8 full)
+
+  /headless:
+    summary: Basic smoke tests (OpenJDK 8 headless)
+    discover+:
+      filter: tag:-java-compiler
+    environment+:
+      OPENJDK_HEADLESS: true
+    prepare+:
+      - how: shell
+        script: |
+          dnf -y erase java-*-openjdk
 
 /jdk11:
-  summary: Basic smoke tests (OpenJDK 11)
   environment:
-    JDK_VERSION: 11
-  prepare+:
-    exclude-:
-      - maven-openjdk11
+    OPENJDK_VERSION: 11
+  prepare:
+    - how: install
+      exclude:
+        - maven-openjdk8
+        - maven-openjdk17
+
+  /full:
+    summary: Basic smoke tests (OpenJDK 11 full)
+
+  /headless:
+    summary: Basic smoke tests (OpenJDK 11 headless)
+    environment+:
+      OPENJDK_HEADLESS: true
+    prepare+:
+      - how: shell
+        script: |
+          dnf -y erase java-*-openjdk
 
 /jdk17:
-  summary: Basic smoke tests (OpenJDK 17)
   environment:
-    JDK_VERSION: 17
-  prepare+:
-    exclude-:
-      - maven-openjdk17
+    OPENJDK_VERSION: 17
+  prepare:
+    - how: install
+      exclude:
+        - maven-openjdk8
+        - maven-openjdk11
+
+  /full:
+    summary: Basic smoke tests (OpenJDK 17 full)
+
+  /headless:
+    summary: Basic smoke tests (OpenJDK 17 headless)
+    environment+:
+      OPENJDK_HEADLESS: true
+    prepare+:
+      - how: shell
+        script: |
+          dnf -y erase java-*-openjdk