diff --git a/mysql-test/include/long_test.inc b/mysql-test/include/long_test.inc
index 765f88b8037..7f3a3a61778 100644
--- a/mysql-test/include/long_test.inc
+++ b/mysql-test/include/long_test.inc
@@ -1,6 +1,6 @@
 # We use this --source include to mark a test as taking long to run.
 # We can use this to schedule such test early (to not be left with
-# only one or two long tests running, and rests of works idle), or to
+# only one or two long tests running, and rests of workers idle), or to
 # run a quick test skipping long-running test cases.
 
 --source include/no_valgrind_without_big.inc
diff --git a/mysql-test/main/backup_locks.test b/mysql-test/main/backup_locks.test
index 40f12bb7ef8..6a1fe9f6094 100644
--- a/mysql-test/main/backup_locks.test
+++ b/mysql-test/main/backup_locks.test
@@ -2,6 +2,7 @@
 # Tests BACKUP STAGE locking
 ########################################################################
 
+--source include/long_test.inc
 --source include/have_innodb.inc
 --source include/have_metadata_lock_info.inc
 --source include/not_embedded.inc
diff --git a/mysql-test/suite/binlog_encryption/encrypted_master.test b/mysql-test/suite/binlog_encryption/encrypted_master.test
index f6fc172c79e..1539ad29f00 100644
--- a/mysql-test/suite/binlog_encryption/encrypted_master.test
+++ b/mysql-test/suite/binlog_encryption/encrypted_master.test
@@ -18,6 +18,7 @@
 # - with annotated events, default checksums and minimal binlog row image
 #
 
+--source include/long_test.inc
 # The test can take very long time with valgrind
 --source include/not_valgrind.inc
 
diff --git a/mysql-test/suite/funcs_2/t/innodb_charset.test b/mysql-test/suite/funcs_2/t/innodb_charset.test
index 631c20352d4..c91a9c4d5d6 100644
--- a/mysql-test/suite/funcs_2/t/innodb_charset.test
+++ b/mysql-test/suite/funcs_2/t/innodb_charset.test
@@ -6,7 +6,7 @@
 # Checking of other prerequisites is in charset_master.test                    #
 ################################################################################
 
---source include/no_valgrind_without_big.inc
+--source include/long_test.inc
 --source include/have_innodb.inc
 
 # Starting with MariaDB 10.6, ensure that DDL recovery will have completed
diff --git a/mysql-test/suite/innodb/t/innodb_bug52663.test b/mysql-test/suite/innodb/t/innodb_bug52663.test
index fcf97531e00..dd246297d94 100644
--- a/mysql-test/suite/innodb/t/innodb_bug52663.test
+++ b/mysql-test/suite/innodb/t/innodb_bug52663.test
@@ -1,3 +1,4 @@
+--source include/long_test.inc
 --source include/have_innodb.inc
 
 set session transaction isolation level read committed;
diff --git a/mysql-test/suite/mariabackup/log_page_corruption.test b/mysql-test/suite/mariabackup/log_page_corruption.test
index 27f2d383b47..e556cba4661 100644
--- a/mysql-test/suite/mariabackup/log_page_corruption.test
+++ b/mysql-test/suite/mariabackup/log_page_corruption.test
@@ -1,5 +1,5 @@
+--source include/long_test.inc
 --source include/have_debug.inc
---source include/no_valgrind_without_big.inc
 --source include/innodb_undo_tablespaces.inc
 
 --echo ########
diff --git a/mysql-test/suite/parts/t/partition_exchange_innodb.test b/mysql-test/suite/parts/t/partition_exchange_innodb.test
index 31ea61bbb7b..73dd5500a43 100644
--- a/mysql-test/suite/parts/t/partition_exchange_innodb.test
+++ b/mysql-test/suite/parts/t/partition_exchange_innodb.test
@@ -1,3 +1,4 @@
+--source include/long_test.inc
 --source include/have_innodb.inc
 --source include/have_partition.inc
 --source include/have_debug_sync.inc
diff --git a/mysql-test/suite/parts/t/partition_exchange_memory.test b/mysql-test/suite/parts/t/partition_exchange_memory.test
index 7384a49f829..431a662f056 100644
--- a/mysql-test/suite/parts/t/partition_exchange_memory.test
+++ b/mysql-test/suite/parts/t/partition_exchange_memory.test
@@ -1,3 +1,4 @@
+--source include/long_test.inc
 --source include/have_partition.inc
 --source include/have_debug_sync.inc
 
diff --git a/mysql-test/suite/parts/t/partition_exchange_myisam.test b/mysql-test/suite/parts/t/partition_exchange_myisam.test
index 68e55090a9c..ab3fb388efd 100644
--- a/mysql-test/suite/parts/t/partition_exchange_myisam.test
+++ b/mysql-test/suite/parts/t/partition_exchange_myisam.test
@@ -1,3 +1,4 @@
+--source include/long_test.inc
 --source include/have_partition.inc
 --source include/have_debug_sync.inc
 
diff --git a/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test b/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
index a8857091ef6..0e1ac93882d 100644
--- a/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
+++ b/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
@@ -9,6 +9,7 @@
 # * Various states of master and heartbeat
 # * Circular replication
 #############################################################
+--source include/long_test.inc
 --source include/master-slave.inc
 #
 # The test runs long and does not have any specifics to 
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync.test b/mysql-test/suite/rpl/t/rpl_semi_sync.test
index c3cd918b5fc..0c8c797af56 100644
--- a/mysql-test/suite/rpl/t/rpl_semi_sync.test
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync.test
@@ -4,6 +4,7 @@
 # Please check all dependent tests after modifying it
 #
 
+source include/long_test.inc;
 source include/not_embedded.inc;
 source include/have_innodb.inc;
 source include/master-slave.inc;
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_after_sync.test b/mysql-test/suite/rpl/t/rpl_semi_sync_after_sync.test
index 2d91d2e4118..015dcceb043 100644
--- a/mysql-test/suite/rpl/t/rpl_semi_sync_after_sync.test
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync_after_sync.test
@@ -1,3 +1,4 @@
+--source include/long_test.inc
 --source include/have_binlog_format_statement.inc
 set global rpl_semi_sync_master_wait_point=AFTER_SYNC;
 source rpl_semi_sync.test;
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_after_sync_row.test b/mysql-test/suite/rpl/t/rpl_semi_sync_after_sync_row.test
index 47af6c34fcf..0ce94b82a67 100644
--- a/mysql-test/suite/rpl/t/rpl_semi_sync_after_sync_row.test
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync_after_sync_row.test
@@ -1,3 +1,4 @@
+--source include/long_test.inc
 --source include/have_binlog_format_row.inc
 set global rpl_semi_sync_master_wait_point=AFTER_SYNC;
 source rpl_semi_sync.test;
diff --git a/mysql-test/suite/rpl/t/rpl_typeconv.test b/mysql-test/suite/rpl/t/rpl_typeconv.test
index 9e566258882..5d8dc67c463 100644
--- a/mysql-test/suite/rpl/t/rpl_typeconv.test
+++ b/mysql-test/suite/rpl/t/rpl_typeconv.test
@@ -4,6 +4,7 @@
 # Please check all dependent tests after modifying it
 #
 
+--source include/long_test.inc
 --source include/have_binlog_format_row.inc
 --source include/master-slave.inc