diff --git a/macros.qt5 b/macros.qt5
index ab4a483..26fe9e7 100644
--- a/macros.qt5
+++ b/macros.qt5
@@ -33,3 +33,24 @@
 %qmake_qt5 %{_qt5_qmake} %{?_qt5_qmake_flags}
 
 %qmake_qt5_wrapper @@QMAKE_QT5_WRAPPER@@
+
+%qt5_build_tests \
+  make sub-tests %{?_smp_mflags} -k ||:
+
+%qt5_install_tests \
+  mkdir -p %{buildroot}%{_qt5_libdir}/qt5                             \
+  find ./tests -not -path '*/\.*' -type d | while read LINE           \
+  do                                                                  \
+      mkdir -p "%{buildroot}%{_qt5_libdir}/qt5/$LINE"                 \
+  done                                                                \
+  find ./tests -not -path '*/\.*'                                     \\\
+               -not -name '*.h'                                       \\\
+               -not -name '*.cpp'                                     \\\
+               -not -name '*.pro'                                     \\\
+               -not -name 'uic_wrapper.sh'                            \\\
+               -not -name 'target_wrapper.sh'                         \\\
+               -not -name 'Makefile'                                  \\\
+               -type f | while read LINE                              \
+  do                                                                  \
+      cp -r --parents "$LINE" %{buildroot}%{_qt5_libdir}/qt5/         \
+  done                                                                \
diff --git a/qt5.spec b/qt5.spec
index 1a38285..b67804c 100644
--- a/qt5.spec
+++ b/qt5.spec
@@ -6,7 +6,7 @@
 
 Name: qt5
 Version: 5.15.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Qt5 meta package
 License: GPLv3
 URL: https://getfedora.org/
@@ -141,6 +141,10 @@ echo "- Qt5 devel meta package" > %{buildroot}%{_docdir}/qt5-devel/README
 
 
 %changelog
+* Tue Jun 08 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-4
+- Add support for building upstream tests for gating
+  Resolves: bz#1969433
+
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 5.15.2-3
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937