diff --git a/SPECS/sblim-cmpi-base.spec b/SPECS/sblim-cmpi-base.spec
index 05981ad..b74ea70 100644
--- a/SPECS/sblim-cmpi-base.spec
+++ b/SPECS/sblim-cmpi-base.spec
@@ -1,6 +1,8 @@
+%global with_test_subpackage 0
+
 Name:           sblim-cmpi-base
 Version:        1.6.4
-Release:        26%{?dist}
+Release:        29%{?dist}
 Summary:        SBLIM CMPI Base Providers
 
 License:        EPL-1.0
@@ -45,6 +47,7 @@ SBLIM (Standards Based Linux Instrumentation for Manageability)
 CMPI (Common Manageability Programming Interface) Base Provider
 development header files and link libraries.
 
+%if 0%{?with_test_subpackage}
 %package test
 Summary:        SBLIM CMPI Base Providers Test Cases
 Requires:       %{name} = %{version}-%{release}
@@ -54,6 +57,7 @@ Requires:       sblim-testsuite
 SBLIM (Standards Based Linux Instrumentation for Manageability)
 CMPI (Common Manageability Programming Interface) Base Provider
 Testcase Files for the SBLIM Testsuite.
+%endif
 
 %prep
 %setup -q
@@ -70,7 +74,11 @@ autoreconf --install --force
 %patch9 -p1 -b .fix-possible-null-dereference.patch
 
 %build
-%configure TESTSUITEDIR=%{_datadir}/sblim-testsuite --disable-static
+%configure --disable-static \
+%if 0%{?with_test_subpackage}
+        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
+%endif
+
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make
@@ -94,6 +102,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a
 %{_includedir}/*
 %{_libdir}/*.so
 
+%if 0%{?with_test_subpackage}
 %files test
 %dir %{_datadir}/sblim-testsuite/cim
 %dir %{_datadir}/sblim-testsuite/system
@@ -103,6 +112,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a
 %{_datadir}/sblim-testsuite/system/linux/*.system
 %{_datadir}/sblim-testsuite/system/linux/*.sh
 %{_datadir}/sblim-testsuite/system/linux/*.pl
+%endif
 
 %global SCHEMA %{_datadir}/%{name}/Linux_Base.mof %{_datadir}/%{name}/Linux_BaseIndication.mof
 
@@ -120,6 +130,16 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Nov 27 2024 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.6.4-29
+- Disable test subpackage
+
+* Wed Nov 27 2024 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.6.4-28
+- Bump release for rebuild
+
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.6.4-27
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
 * Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.6.4-26
 - Rebuilt for MSVSphere 10