diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8605be6..6d05d00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,10 @@
 # Karafka Test gem changelog
 
+## 2.1.1 (Unreleased)
+- [Enhancement] Support WaterDrop stubs with Mocha.
+
 ## 2.1.0 (2023-05-22)
-- Align Karafka expectations to match `2.1.0`.
+- [Maintenance] Align Karafka expectations to match `2.1.0`.
 
 ## 2.0.11 (2023-04-13)
 - Align metadata builder format with Karafka `2.0.40`.
diff --git a/Gemfile.lock b/Gemfile.lock
index 5015999..a2a2c07 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    karafka-testing (2.1.0)
+    karafka-testing (2.1.1)
       karafka (>= 2.1.0, < 3.0.0)
 
 GEM
diff --git a/lib/karafka/testing/rspec/helpers.rb b/lib/karafka/testing/rspec/helpers.rb
index 40f24e2..343bb1a 100644
--- a/lib/karafka/testing/rspec/helpers.rb
+++ b/lib/karafka/testing/rspec/helpers.rb
@@ -33,7 +33,11 @@ def included(base)
               _karafka_consumer_messages.clear
               _karafka_producer_client.reset
 
-              allow(Karafka.producer).to receive(:client).and_return(_karafka_producer_client)
+              if Object.const_defined?('Mocha', false)
+                Karafka.producer.stubs(:client).returns(_karafka_producer_client)
+              else
+                allow(Karafka.producer).to receive(:client).and_return(_karafka_producer_client)
+              end
             end
           end
         end
diff --git a/lib/karafka/testing/version.rb b/lib/karafka/testing/version.rb
index 1550904..c6ec1e0 100644
--- a/lib/karafka/testing/version.rb
+++ b/lib/karafka/testing/version.rb
@@ -4,6 +4,6 @@
 module Karafka
   module Testing
     # Current version of gem. It should match Karafka framework version
-    VERSION = '2.1.0'
+    VERSION = '2.1.1'
   end
 end