diff --git a/macros.qt6 b/macros.qt6
index cce9fc7..d9dd037 100644
--- a/macros.qt6
+++ b/macros.qt6
@@ -64,18 +64,19 @@
         -DINSTALL_TRANSLATIONSDIR=%{_qt6_translationdir} \\\
         -DQT_DISABLE_RPATH=TRUE
 
-%qt6_fix_tests                                                                                             \
-  pushd tests/auto                                                                                         \
-  find . -type f -name 'CMakeLists.txt'                                                                    \\\
-         -exec sed -i 's|\\\(.*DIR="*\\\)${CMAKE_CURRENT_SOURCE_DIR}/\\\(.*\\\)|\\\1\\\2|' {} \\\;         \
-  find . -type f \\\( -name '*.sh' -o -name '*.py' \\\)                                                    \\\
-         -exec sed -i 's|/usr/bin/python$|/usr/bin/python3|' {} \\\;                                      \\\
-         -exec sed -i 's|/usr/bin/env\\\ python3*|/usr/bin/python3|' {} \\\;                              \\\
-         -exec sed -i 's|^/bin/sh$|!#/bin/sh|' {} \\\;                                                     \
-  popd                                                                                                     \
+%qt6_fix_tests                                                                                              \
+  pushd tests/auto                                                                                          \
+  find . -type f -name 'CMakeLists.txt'                                                                     \\\
+         -exec sed -i 's|\\\(.*DIR="*\\\)${CMAKE_CURRENT_SOURCE_DIR}/\\\(.*\\\)|\\\1\\\2|' {} \\\;          \\\
+         -exec sed -i 's|\\\(.*DIR="*\\\)${CMAKE_CURRENT_SOURCE_DIR}\\\(.*\\\)|\\\1.\\\2|' {} \\\;          \
+  find . -type f \\\( -name '*.sh' -o -name '*.py' \\\)                                                     \\\
+         -exec sed -i 's|/usr/bin/python$|/usr/bin/python3|' {} \\\;                                        \\\
+         -exec sed -i 's|/usr/bin/env\\\ python3*|/usr/bin/python3|' {} \\\;                                \\\
+         -exec sed -i 's|^/bin/sh$|!#/bin/sh|' {} \\\;                                                      \
+  popd                                                                                                      \
 
-%qt6_dont_autoinstall_tests                                                                                \
-  sed -i 's|include(".*tests/cmake_install.cmake")||' %_vpath_srcdir/%_vpath_builddir/cmake_install.cmake  \
+%qt6_dont_autoinstall_tests                                                                                 \
+  sed -i 's|include(".*tests/cmake_install.cmake")||' %_vpath_srcdir/%_vpath_builddir/cmake_install.cmake   \
 
 %qt6_install_tests                                                                                          \
   mkdir -p %{buildroot}%{_qt6_archdatadir}/tests                                                            \
diff --git a/qt6.spec b/qt6.spec
index f13fde8..399870a 100644
--- a/qt6.spec
+++ b/qt6.spec
@@ -1,7 +1,7 @@
 
 Name: qt6
 Version: 6.6.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Qt6 meta package
 License: GPL-3.0-only
 URL: https://getfedora.org/
@@ -149,6 +149,10 @@ echo "- Qt6 devel meta package" > %{buildroot}%{_docdir}/qt6-devel/README
 
 
 %changelog
+* Wed Apr 10 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.1-8
+- Adjust qt6_fix_tests macro to handle more cases
+  Resolves: RHEL-28239
+
 * Tue Apr 09 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.1-7
 - Replace patchelf with chrpath
   Resolves: RHEL-28239