diff --git a/tests/supported-targets/fedora_40_x86_64_arch b/tests/supported-targets/fedora_40_x86_64_arch
new file mode 100644
index 0000000..4807977
--- /dev/null
+++ b/tests/supported-targets/fedora_40_x86_64_arch
@@ -0,0 +1,11 @@
+i386
+i386:x86-64
+i386:x64-32
+i8086
+i386:intel
+i386:x86-64:intel
+i386:x64-32:intel
+iamcu
+iamcu:intel
+bpf
+xbpf
diff --git a/tests/supported-targets/fedora_40_x86_64_tgt b/tests/supported-targets/fedora_40_x86_64_tgt
new file mode 100644
index 0000000..a3b589f
--- /dev/null
+++ b/tests/supported-targets/fedora_40_x86_64_tgt
@@ -0,0 +1,23 @@
+elf64-x86-64
+elf32-i386
+elf32-iamcu
+elf32-x86-64
+pei-i386
+pe-x86-64
+pei-x86-64
+elf64-little
+elf64-big
+elf32-little
+elf32-big
+pe-bigobj-x86-64
+pe-i386
+pdb
+elf64-bpfle
+elf64-bpfbe
+srec
+symbolsrec
+verilog
+tekhex
+binary
+ihex
+plugin
diff --git a/tests/supported-targets/test.sh b/tests/supported-targets/test.sh
index 75c4f9f..f3b0f55 100755
--- a/tests/supported-targets/test.sh
+++ b/tests/supported-targets/test.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 . "$TMT_TREE/tests/lib.sh" || exit 1
@@ -50,6 +49,8 @@ rlJournalStart
           release=8
         elif rlIsCentOS "=9"; then
           release=9
+        elif rlIsFedora ">= 40"; then
+          release=fedora_40
         else
           rlLog "$(cat /etc/redhat-release)"
           rlFail "No Baseline available for this major release; using RHEL-7 as baseline"