diff --git a/mysql8.4.spec b/mysql8.4.spec
index 32caf56..6f2a3f8 100644
--- a/mysql8.4.spec
+++ b/mysql8.4.spec
@@ -1014,14 +1014,14 @@ fi
 
 %if %{with test}
 %files -n %{pkgname}-test
+%{_bindir}/comp_err
 %{_bindir}/mysql_client_test
+%{_bindir}/mysqld_safe
 %{_bindir}/mysql_keyring_encryption_test
 %{_bindir}/mysqltest
+%{_bindir}/mysql_test_event_tracking
 %{_bindir}/mysqltest_safe_process
 %{_bindir}/mysqlxtest
-%{_bindir}/mysqld_safe
-%{_bindir}/comp_err
-%{_bindir}/mysql_test_event_tracking
 
 %dir %{_datadir}/mysql-test
 %{_datadir}/mysql-test/platform-specific-tests.list
@@ -1040,15 +1040,25 @@ fi
 %{_libdir}/mysql/plugin/component_test_audit_api_message.so
 %{_libdir}/mysql/plugin/component_test_backup_lock_service.so
 %{_libdir}/mysql/plugin/component_test_component_deinit.so
+%{_libdir}/mysql/plugin/component_test_event_tracking_consumer_a.so
+%{_libdir}/mysql/plugin/component_test_event_tracking_consumer_b.so
+%{_libdir}/mysql/plugin/component_test_event_tracking_consumer_c.so
+%{_libdir}/mysql/plugin/component_test_event_tracking_consumer.so
+%{_libdir}/mysql/plugin/component_test_event_tracking_producer_a.so
+%{_libdir}/mysql/plugin/component_test_event_tracking_producer_b.so
+%{_libdir}/mysql/plugin/component_test_execute_prepared_statement.so
+%{_libdir}/mysql/plugin/component_test_execute_regular_statement.so
 %{_libdir}/mysql/plugin/component_test_host_application_signal.so
 %{_libdir}/mysql/plugin/component_test_mysql_command_services.so
 %{_libdir}/mysql/plugin/component_test_mysql_current_thread_reader.so
 %{_libdir}/mysql/plugin/component_test_mysql_runtime_error.so
+%{_libdir}/mysql/plugin/component_test_mysql_signal_handler.so
 %{_libdir}/mysql/plugin/component_test_mysql_system_variable_set.so
 %{_libdir}/mysql/plugin/component_test_mysql_thd_store_service.so
 %{_libdir}/mysql/plugin/component_test_pfs_notification.so
 %{_libdir}/mysql/plugin/component_test_pfs_resource_group.so
 %{_libdir}/mysql/plugin/component_test_sensitive_system_variables.so
+%{_libdir}/mysql/plugin/component_test_server_telemetry_metrics.so
 %{_libdir}/mysql/plugin/component_test_server_telemetry_traces.so
 %{_libdir}/mysql/plugin/component_test_status_var_reader.so
 %{_libdir}/mysql/plugin/component_test_status_var_service_int.so
@@ -1114,17 +1124,6 @@ fi
 %{_libdir}/mysql/plugin/test_udf_services.so
 %{_libdir}/mysql/plugin/udf_example.so
 
-%{_libdir}/mysql/plugin/component_test_event_tracking_consumer.so
-%{_libdir}/mysql/plugin/component_test_event_tracking_consumer_a.so
-%{_libdir}/mysql/plugin/component_test_event_tracking_consumer_b.so
-%{_libdir}/mysql/plugin/component_test_event_tracking_consumer_c.so
-%{_libdir}/mysql/plugin/component_test_event_tracking_producer_a.so
-%{_libdir}/mysql/plugin/component_test_event_tracking_producer_b.so
-%{_libdir}/mysql/plugin/component_test_execute_prepared_statement.so
-%{_libdir}/mysql/plugin/component_test_execute_regular_statement.so
-%{_libdir}/mysql/plugin/component_test_mysql_signal_handler.so
-%{_libdir}/mysql/plugin/component_test_server_telemetry_metrics.so
-
 %files -n %{pkgname}-test-data
 %attr(-,mysql,mysql) %{_datadir}/mysql-test
 %exclude %{_datadir}/mysql-test/platform-specific-tests.list