diff --git a/kernel.spec b/kernel.spec
index e63731f..c830bb3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -24,7 +24,7 @@
 %define sublevel	40
 
 # Release number. Increase this before a rebuild.
-%define rpmrel		9
+%define rpmrel		10
 %define fullrpmrel	%{rpmrel}
 
 %define rpmtag		%{disttag}
@@ -345,7 +345,12 @@ BuildRequires: kernel-source-virtualbox
 # because all guest modules have been upstreamized
 # https://www.phoronix.com/scan.php?page=news_item&px=VirtualBox-Shared-Folder-5.6
 BuildRequires: kernel-source-virtualbox-vboxadditions
+# rosa-test-suite is maintained in certified branches only
+# nlkm, memfreetest, pcietest
+%if %{with nickel}
+BuildRequires: kernel-source-rosa-test-suite
 %endif
+%endif #with binary_extra_modules
 
 %if %{with ccache}
 BuildRequires: ccache
@@ -947,6 +952,12 @@ Meta package to pull VirtualBox guest kernel modules for kernel-%{flavour}-%{ker
 # empty
 #------------------------------------------------
 
+%if %{with nickel}
+%ksob_mk_module_pkg -n nlkm -s misc
+%ksob_mk_module_pkg -n memfreetest -s misc
+%ksob_mk_module_pkg -n pcietest -s misc
+%endif
+
 %endif #binary_extra_modules
 
 ############################################################################
@@ -1338,7 +1349,25 @@ do
 done
 popd
 
-%endif
+%if %{with nickel}
+# rosa-test-suite uses /sr/src/xxx-version, not /usr/src/xxx-version-release
+cp -r "$(rpm -q --qf '/usr/src/rosa-test-suite-%%{VERSION}' kernel-source-rosa-test-suite)" kernel-source-rosa-test-suite
+pushd kernel-source-rosa-test-suite
+mkdir -p %{temp_modules}/%{kver_full}/kernel/misc/
+for i in nlkm memfreetest pcietest
+do
+cat << EOF > Makefile
+obj-m := ${i}.o
+all:
+	make -C %{src_dir} M=\$(PWD) modules
+EOF
+%kmake
+cp -fv ${i}.ko %{temp_modules}/%{kver_full}/kernel/misc/
+done
+popd
+%endif #with nickel <- with binary_extra_modules
+
+%endif #with binary_extra_modules
 
 %if %{with uml}
 cp -rv %{certs_dir_rnd} %{src_dir}.uml/
@@ -1524,7 +1553,12 @@ cat > $kernel_files <<EOF
 # vbox host: vboxnetflt vboxnetadp vboxdrv vboxpci
 # vbox guest: vboxvideo vboxguest vboxsf
 %exclude %{_modulesdir}/%{kver_full}/kernel/misc/vbox*.ko%{kmod_suffix}
+%if %{with nickel}
+%exclude %{_modulesdir}/%{kver_full}/kernel/misc/nlkm.ko%{kmod_suffix}
+%exclude %{_modulesdir}/%{kver_full}/kernel/misc/memfreetest.ko%{kmod_suffix}
+%exclude %{_modulesdir}/%{kver_full}/kernel/misc/pcietest.ko%{kmod_suffix}
 %endif
+%endif #with binary_extra_modules
 %{_modulesdir}/%{kver_full}/modules.*
 EOF
 
@@ -1652,4 +1686,4 @@ install -m755 %{SOURCE52} %{buildroot}%{_bindir}/cpupower-start.sh
 %endif
 
 # delete junk
-rm -fr %{buildroot}%{_usr}/src/*/kernel-source-virtualbox*
+rm -fr %{buildroot}%{_usr}/src/*/kernel-source-*