diff --git a/Makefile b/Makefile
index 8d9b4175..afc21299 100644
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,7 @@ SCYLLA_TEST_FILTER := $(subst ${SPACE},${EMPTY},ClusterTests.*\
 :LoggingTests.*\
 :PreparedMetadataTests.*\
 :UseKeyspaceCaseSensitiveTests.*\
+:ServerSideFailureTests.*\
 :MetricsTests.Integration_Cassandra_ErrorsRequestTimeouts\
 :MetricsTests.Integration_Cassandra_Requests\
 :MetricsTests.Integration_Cassandra_StatsShardConnections\
@@ -40,6 +41,8 @@ SCYLLA_TEST_FILTER := $(subst ${SPACE},${EMPTY},ClusterTests.*\
 :ControlConnectionTests.Integration_Cassandra_TopologyChange\
 :ControlConnectionTests.Integration_Cassandra_FullOutage\
 :ControlConnectionTests.Integration_Cassandra_TerminatedUsingMultipleIoThreadsWithError\
+:ServerSideFailureTests.Integration_Cassandra_ErrorFunctionFailure\
+:ServerSideFailureTests.Integration_Cassandra_ErrorFunctionAlreadyExists\
 :*NoCompactEnabledConnection\
 :PreparedMetadataTests.Integration_Cassandra_AlterProperlyUpdatesColumnCount\
 :UseKeyspaceCaseSensitiveTests.Integration_Cassandra_ConnectWithKeyspace)
@@ -73,6 +76,7 @@ CASSANDRA_TEST_FILTER := $(subst ${SPACE},${EMPTY},ClusterTests.*\
 :LoggingTests.*\
 :PreparedMetadataTests.*\
 :UseKeyspaceCaseSensitiveTests.*\
+:ServerSideFailureTests.*\
 :MetricsTests.Integration_Cassandra_ErrorsRequestTimeouts\
 :MetricsTests.Integration_Cassandra_Requests\
 :MetricsTests.Integration_Cassandra_StatsShardConnections\
@@ -89,6 +93,8 @@ CASSANDRA_TEST_FILTER := $(subst ${SPACE},${EMPTY},ClusterTests.*\
 :ControlConnectionTests.Integration_Cassandra_TopologyChange\
 :ControlConnectionTests.Integration_Cassandra_FullOutage\
 :ControlConnectionTests.Integration_Cassandra_TerminatedUsingMultipleIoThreadsWithError\
+:ServerSideFailureTests.Integration_Cassandra_ErrorFunctionFailure\
+:ServerSideFailureTests.Integration_Cassandra_ErrorFunctionAlreadyExists\
 :SslTests.Integration_Cassandra_ReconnectAfterClusterCrashAndRestart\
 :*NoCompactEnabledConnection\
 :PreparedMetadataTests.Integration_Cassandra_AlterProperlyUpdatesColumnCount\
diff --git a/tests/src/integration/tests/test_server_side_failure.cpp b/tests/src/integration/tests/test_server_side_failure.cpp
index 895fcffe..d4ce8192 100644
--- a/tests/src/integration/tests/test_server_side_failure.cpp
+++ b/tests/src/integration/tests/test_server_side_failure.cpp
@@ -79,9 +79,13 @@ class ServerSideFailureThreeNodeTests : public Integration {
 CASSANDRA_INTEGRATION_TEST_F(ServerSideFailureTests, Warning) {
   CHECK_FAILURE;
   SKIP_IF_CASSANDRA_VERSION_LT(2.2);
+  if (Options::is_scylla()) {
+    SKIP_TEST("Scylla does not emit 'Aggregation query used without partition key' warning");
+  }
 
-  logger_.add_critera("Server-side warning: Aggregation query used without partition key");
-  session_.execute("SELECT sum(gossip_generation) FROM system.local WHERE key='local'");
+  logger_.add_critera("Response from the database contains a warning, "
+                      "warning: \"Aggregation query used without partition key\"");
+  session_.execute("SELECT sum(gossip_generation) FROM system.local");
   EXPECT_EQ(logger_.count(), 1u);
 }