diff --git a/gating.yaml b/gating.yaml
index 4c41a2f..b7fc28d 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -4,13 +4,13 @@ product_versions:
 decision_contexts:
   - osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/smoke/jdk8/full.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/smoke/jdk11/full.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/smoke/jdk17/full.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/smoke/jdk21/full.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/smoke/jdk8/headless.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/smoke/jdk11/headless.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/smoke/jdk17/headless.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/smoke/jdk21/headless.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk8/full.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk11/full.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk17/full.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk21/full.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk8/headless.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk11/headless.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk17/headless.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk21/headless.functional}
   # https://docs.engineering.redhat.com/display/RHELPLAN/Maven+Bootstrap+manual+gating+test
   - !PassingTestCaseRule {test_case_name: manual.sst_cs_apps.maven.bootstrap}
diff --git a/maven.spec b/maven.spec
index 896adfb..b1ed37e 100644
--- a/maven.spec
+++ b/maven.spec
@@ -7,7 +7,7 @@
 Name:           maven
 Epoch:          1
 Version:        3.6.3
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        Java project management and project comprehension tool
 # maven itself is ASL 2.0
 # bundled slf4j is MIT
@@ -312,6 +312,9 @@ if [[ $1 -eq 0 ]]; then update-alternatives --remove mvn %{homedir}/bin/mvn; fi
 %config %{_javaconfdir}/maven.conf-openjdk21
 
 %changelog
+* Sat Nov 23 2024 Marián Konček <mkoncek@redhat.com> - 1:3.6.3-19
+- Switch to Fedora tests
+
 * Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 1:3.6.3-18
 - Fix patch usage
 
diff --git a/plans/smoke.fmf b/plans/matrix.fmf
similarity index 75%
rename from plans/smoke.fmf
rename to plans/matrix.fmf
index 921663f..9210a45 100644
--- a/plans/smoke.fmf
+++ b/plans/matrix.fmf
@@ -1,14 +1,14 @@
 discover:
   how: fmf
-  # FIXME
-  # url: https://src.fedoraproject.org/tests/maven
-  url: https://src.fedoraproject.org/forks/mkoncek/tests/maven
-environment:
-  # The commit just before adding a test for [MNG-8106] which fails with Maven 3.6
-  MAVEN_IT_GIT_COMMIT: 680cd976359e2141762b09ca06b82869d30d0cbc
+  url: https://src.fedoraproject.org/tests/maven
+
 execute:
   how: tmt
 
+environment:
+  # The commit just before adding a test for [MNG-8106] which fails with Maven 3.6
+  MAVEN_IT_GIT_REF: 680cd976359e2141762b09ca06b82869d30d0cbc
+
 /jdk8:
   environment+:
     OPENJDK_VERSION: "1.8.0"
@@ -20,12 +20,12 @@ execute:
         - maven-openjdk21
 
   /full:
-    summary: Basic smoke tests (OpenJDK 8 full)
+    summary: Maven matrix tests (OpenJDK 8 full)
     discover+:
       filter: tag:jdk8
 
   /headless:
-    summary: Basic smoke tests (OpenJDK 8 headless)
+    summary: Maven matrix tests (OpenJDK 8 headless)
     discover+:
       filter: tag:jre8
     environment+:
@@ -46,12 +46,12 @@ execute:
         - maven-openjdk21
 
   /full:
-    summary: Basic smoke tests (OpenJDK 11 full)
+    summary: Maven matrix tests (OpenJDK 11 full)
     discover+:
       filter: tag:jdk11
 
   /headless:
-    summary: Basic smoke tests (OpenJDK 11 headless)
+    summary: Maven matrix tests (OpenJDK 11 headless)
     discover+:
       filter: tag:jre11
     environment+:
@@ -72,12 +72,12 @@ execute:
         - maven-openjdk21
 
   /full:
-    summary: Basic smoke tests (OpenJDK 17 full)
+    summary: Maven matrix tests (OpenJDK 17 full)
     discover+:
       filter: tag:jdk17
 
   /headless:
-    summary: Basic smoke tests (OpenJDK 17 headless)
+    summary: Maven matrix tests (OpenJDK 17 headless)
     discover+:
       filter: tag:jre17
     environment+:
@@ -98,12 +98,12 @@ execute:
         - maven-openjdk17
 
   /full:
-    summary: Basic smoke tests (OpenJDK 21 full)
+    summary: Maven matrix tests (OpenJDK 21 full)
     discover+:
       filter: tag:jdk21
 
   /headless:
-    summary: Basic smoke tests (OpenJDK 21 headless)
+    summary: Maven matrix tests (OpenJDK 21 headless)
     discover+:
       filter: tag:jre21
     environment+: