diff --git a/mysql-test/suite/s3/disabled.def b/mysql-test/suite/s3/disabled.def
new file mode 100644
index 00000000000..8eae300e21e
--- /dev/null
+++ b/mysql-test/suite/s3/disabled.def
@@ -0,0 +1,3 @@
+replication_partition : MDEV-23730: Server crashes in ha_maria::extra
+replication_mixed     : MDEV-23770: Replication failure
+replication_stmt      : MDEV-23770: Replication failure
diff --git a/mysql-test/suite/s3/partition.test b/mysql-test/suite/s3/partition.test
index 03bbc2f0da9..b60eb1bf2dd 100644
--- a/mysql-test/suite/s3/partition.test
+++ b/mysql-test/suite/s3/partition.test
@@ -1,3 +1,8 @@
+if (`SELECT @@s3_host_name <> "s3.amazonaws.com"`)
+{
+  skip The test is disabled for emulator environment due to MDEV-23648;
+}
+
 --source include/have_partition.inc
 --source include/have_s3.inc
 --source create_database.inc
diff --git a/mysql-test/suite/s3/partition_move.test b/mysql-test/suite/s3/partition_move.test
index 35edbd75b5a..1a5c45ca0b1 100644
--- a/mysql-test/suite/s3/partition_move.test
+++ b/mysql-test/suite/s3/partition_move.test
@@ -1,3 +1,8 @@
+if (`SELECT @@s3_host_name <> "s3.amazonaws.com"`)
+{
+  skip The test is disabled for emulator environment due to MDEV-23648;
+}
+
 --source include/have_partition.inc
 --source include/have_innodb.inc
 --source include/have_s3.inc