diff --git a/db/system_keyspace.cc b/db/system_keyspace.cc
index ea37ac2c4e..5961681c8d 100644
--- a/db/system_keyspace.cc
+++ b/db/system_keyspace.cc
@@ -3526,6 +3526,10 @@ future<> system_keyspace::shutdown() {
     }
 }
 
+future<> system_keyspace::stop() {
+    co_await shutdown();
+}
+
 future<::shared_ptr<cql3::untyped_result_set>> system_keyspace::execute_cql(const sstring& query_string, const data_value_list& values) {
     return _qp.execute_internal(query_string, values, cql3::query_processor::cache_internal::yes);
 }
diff --git a/db/system_keyspace.hh b/db/system_keyspace.hh
index 29160946c5..03c7694fdf 100644
--- a/db/system_keyspace.hh
+++ b/db/system_keyspace.hh
@@ -673,6 +673,7 @@ public:
     system_keyspace(cql3::query_processor& qp, replica::database& db) noexcept;
     ~system_keyspace();
     future<> shutdown();
+    future<> stop();
 
     virtual_tables_registry& get_virtual_tables_registry() { return _virtual_tables_registry; }
 private:
diff --git a/test/lib/cql_test_env.cc b/test/lib/cql_test_env.cc
index 1608166638..ae7ac9a4fc 100644
--- a/test/lib/cql_test_env.cc
+++ b/test/lib/cql_test_env.cc
@@ -699,7 +699,6 @@ private:
 
             _sys_ks.start(std::ref(_qp), std::ref(_db)).get();
             auto stop_sys_kd = defer_verbose_shutdown("system keyspace", [this] {
-                _sys_ks.invoke_on_all(&db::system_keyspace::shutdown).get();
                 _sys_ks.stop().get();
             });