diff --git a/lib/passwordstate/client.rb b/lib/passwordstate/client.rb
index ac4fe045f388adad04bd120d665b5d61b05c4f14..e43576d1aef3396a7bd5d21b4ddfd50076626909 100644
--- a/lib/passwordstate/client.rb
+++ b/lib/passwordstate/client.rb
@@ -142,7 +142,9 @@ module Passwordstate
     end
 
     def pretty_print(pp)
-      pp.pp(self)
+      return pp.pp self if respond_to? :mocha_inspect
+
+      pp.pp_object self
     end
 
     alias inspect pretty_print_inspect
diff --git a/lib/passwordstate/resource_list.rb b/lib/passwordstate/resource_list.rb
index e5c4650555c8af9c7d5ff4a8fd0780f7d95b977b..0a027222d4d2bb756e4eb794d96c6513057d6506 100644
--- a/lib/passwordstate/resource_list.rb
+++ b/lib/passwordstate/resource_list.rb
@@ -22,6 +22,8 @@ module Passwordstate
     end
 
     def pretty_print(pp)
+      return pp.pp self if respond_to? :mocha_inspect
+
       pp.pp_object(self)
     end